From 39e1e5f07870d27db7cd7a94ac725b3ee26e62d1 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Thu, 12 Oct 2017 02:50:14 +0200 Subject: [PATCH 01/14] Removing repetable fields from site view, custom admin view, and admin view. Also updated the compiler, removed permissions on fields to speedup page load in admin and joomla component views --- README.md | 4 +- admin/README.txt | 4 +- admin/access.xml | 318 --- admin/assets/css/admin.css | 2 +- admin/assets/css/admin_view.css | 4 +- admin/assets/css/admin_views.css | 4 +- admin/assets/css/custom_admin_view.css | 2 +- admin/assets/css/custom_admin_views.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/dynamic_get.css | 4 +- admin/assets/css/dynamic_gets.css | 4 +- admin/assets/css/joomla_component.css | 4 +- admin/assets/css/joomla_components.css | 4 +- admin/assets/css/site_view.css | 4 +- admin/assets/css/site_views.css | 4 +- admin/assets/js/admin.js | 2 +- admin/componentbuilder.php | 2 +- admin/controller.php | 2 +- admin/controllers/admin_view.php | 11 +- admin/controllers/admin_views.php | 4 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/componentbuilder.php | 2 +- admin/controllers/custom_admin_view.php | 2 +- admin/controllers/custom_admin_views.php | 2 +- admin/controllers/dynamic_get.php | 4 +- admin/controllers/dynamic_gets.php | 4 +- admin/controllers/help.php | 2 +- admin/controllers/import.php | 2 +- .../controllers/import_joomla_components.php | 2 +- admin/controllers/joomla_component.php | 4 +- admin/controllers/joomla_components.php | 4 +- admin/controllers/site_view.php | 4 +- admin/controllers/site_views.php | 4 +- admin/helpers/compiler/a_Get.php | 549 ++-- admin/helpers/compiler/b_Structure.php | 2 +- admin/helpers/compiler/c_Fields.php | 8 +- admin/helpers/componentbuilder.php | 2 +- admin/helpers/componentbuilderemail.php | 2 +- admin/helpers/headercheck.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/indenter.php | 2 +- admin/helpers/js.php | 2 +- admin/helpers/minify.php | 2 +- .../en-GB/en-GB.com_componentbuilder.ini | 337 +-- .../en-GB/en-GB.com_componentbuilder.sys.ini | 322 --- admin/layouts/admin_view/css_fullwidth.php | 2 +- .../admin_view/custom_buttons_fullwidth.php | 2 +- .../admin_view/custom_buttons_left.php | 2 +- .../admin_view/custom_import_fullwidth.php | 2 +- admin/layouts/admin_view/fields_fullwidth.php | 145 +- .../admin_view/javascript_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 4 +- admin/layouts/admin_view/mysql_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_left.php | 2 +- admin/layouts/admin_view/php_fullwidth.php | 2 +- admin/layouts/admin_view/publishing.php | 2 +- admin/layouts/admin_view/publlshing.php | 2 +- admin/layouts/admin_view/settings_above.php | 2 +- admin/layouts/admin_view/settings_left.php | 2 +- admin/layouts/admin_view/settings_right.php | 6 +- admin/layouts/admin_view/settings_under.php | 2 +- admin/layouts/batchselection.php | 2 +- .../custom_buttons_fullwidth.php | 2 +- .../custom_admin_view/custom_buttons_left.php | 2 +- .../custom_script_fullwidth.php | 2 +- .../custom_admin_view/details_above.php | 2 +- .../custom_admin_view/details_fullwidth.php | 2 +- .../custom_admin_view/details_left.php | 2 +- .../custom_admin_view/details_right.php | 2 +- .../custom_admin_view/details_rightside.php | 2 +- .../custom_admin_view/details_under.php | 2 +- .../linked_components_fullwidth.php | 4 +- .../layouts/custom_admin_view/publishing.php | 2 +- .../layouts/custom_admin_view/publlshing.php | 2 +- admin/layouts/custom_code/details_above.php | 2 +- .../layouts/custom_code/details_fullwidth.php | 2 +- admin/layouts/custom_code/details_left.php | 2 +- admin/layouts/custom_code/details_right.php | 2 +- admin/layouts/custom_code/details_under.php | 2 +- admin/layouts/custom_code/publishing.php | 2 +- admin/layouts/custom_code/publlshing.php | 2 +- .../layouts/dynamic_get/abacus_fullwidth.php | 2 +- admin/layouts/dynamic_get/abacus_left.php | 2 +- .../dynamic_get/custom_script_fullwidth.php | 2 +- admin/layouts/dynamic_get/joint_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_above.php | 2 +- admin/layouts/dynamic_get/main_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_left.php | 2 +- admin/layouts/dynamic_get/main_right.php | 2 +- admin/layouts/dynamic_get/main_under.php | 2 +- admin/layouts/dynamic_get/publishing.php | 2 +- admin/layouts/dynamic_get/publlshing.php | 2 +- admin/layouts/field/details_fullwidth.php | 2 +- admin/layouts/field/details_left.php | 2 +- admin/layouts/field/details_right.php | 2 +- admin/layouts/field/details_under.php | 2 +- .../field/linked_admin_views_fullwidth.php | 4 +- admin/layouts/field/publishing.php | 2 +- admin/layouts/field/publlshing.php | 2 +- admin/layouts/field/scripts_left.php | 2 +- admin/layouts/field/scripts_right.php | 2 +- admin/layouts/fieldtype/details_fullwidth.php | 2 +- admin/layouts/fieldtype/details_left.php | 2 +- admin/layouts/fieldtype/details_right.php | 2 +- admin/layouts/fieldtype/fields_fullwidth.php | 4 +- admin/layouts/fieldtype/publishing.php | 2 +- admin/layouts/fieldtype/publlshing.php | 2 +- admin/layouts/ftp/details_above.php | 2 +- admin/layouts/ftp/details_fullwidth.php | 2 +- .../ftp/linked_components_fullwidth.php | 4 +- admin/layouts/ftp/publishing.php | 2 +- admin/layouts/ftp/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- .../admin_views_fullwidth.php | 2 +- .../custom_admin_views_fullwidth.php | 2 +- .../joomla_component/details_above.php | 2 +- .../layouts/joomla_component/details_left.php | 2 +- .../joomla_component/details_right.php | 2 +- .../joomla_component/details_under.php | 2 +- .../dynamic_build_beta_fullwidth.php | 2 +- .../dynamic_integration_fullwidth.php | 2 +- .../libs_helpers_fullwidth.php | 2 +- .../joomla_component/mysql_fullwidth.php | 2 +- .../joomla_component/php_fullwidth.php | 2 +- admin/layouts/joomla_component/publishing.php | 2 +- admin/layouts/joomla_component/publlshing.php | 2 +- .../layouts/joomla_component/readme_left.php | 2 +- .../layouts/joomla_component/readme_right.php | 2 +- .../joomla_component/settings_left.php | 2 +- .../joomla_component/settings_right.php | 2 +- .../joomla_component/site_views_fullwidth.php | 2 +- .../translation_fullwidth.php | 2 +- admin/layouts/language/details_left.php | 2 +- admin/layouts/language/details_right.php | 2 +- admin/layouts/language/publishing.php | 2 +- admin/layouts/language/publlshing.php | 2 +- .../language_translation/details_above.php | 2 +- .../details_fullwidth.php | 2 +- .../language_translation/publishing.php | 2 +- .../language_translation/publlshing.php | 2 +- .../layout/custom_script_fullwidth.php | 2 +- admin/layouts/layout/details_fullwidth.php | 2 +- admin/layouts/layout/details_left.php | 2 +- admin/layouts/layout/details_right.php | 2 +- admin/layouts/layout/details_rightside.php | 2 +- admin/layouts/layout/details_under.php | 2 +- admin/layouts/layout/publishing.php | 2 +- admin/layouts/layout/publlshing.php | 2 +- .../site_view/custom_buttons_fullwidth.php | 4 +- .../layouts/site_view/custom_buttons_left.php | 3 +- .../site_view/custom_buttons_right.php | 5 +- admin/layouts/site_view/details_above.php | 2 +- admin/layouts/site_view/details_fullwidth.php | 2 +- admin/layouts/site_view/details_left.php | 2 +- admin/layouts/site_view/details_right.php | 2 +- admin/layouts/site_view/details_rightside.php | 2 +- admin/layouts/site_view/details_under.php | 2 +- .../site_view/javascript_css_fullwidth.php | 2 +- .../site_view/linked_components_fullwidth.php | 4 +- admin/layouts/site_view/php_fullwidth.php | 2 +- admin/layouts/site_view/publishing.php | 2 +- admin/layouts/site_view/publlshing.php | 2 +- admin/layouts/snippet/details_above.php | 2 +- admin/layouts/snippet/details_left.php | 2 +- admin/layouts/snippet/details_right.php | 2 +- admin/layouts/snippet/publishing.php | 2 +- admin/layouts/snippet/publlshing.php | 2 +- .../template/custom_script_fullwidth.php | 2 +- admin/layouts/template/details_fullwidth.php | 2 +- admin/layouts/template/details_left.php | 2 +- admin/layouts/template/details_right.php | 2 +- admin/layouts/template/details_rightside.php | 2 +- admin/layouts/template/details_under.php | 2 +- admin/layouts/template/publishing.php | 2 +- admin/layouts/template/publlshing.php | 2 +- admin/models/admin_view.php | 1779 ++---------- admin/models/admin_views.php | 40 +- admin/models/ajax.php | 36 +- admin/models/componentbuilder.php | 2 +- admin/models/custom_admin_view.php | 33 +- admin/models/custom_admin_views.php | 2 +- admin/models/dynamic_get.php | 4 +- admin/models/dynamic_gets.php | 4 +- admin/models/field.php | 27 +- admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/adminviews.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/component.php | 2 +- admin/models/fields/components.php | 2 +- admin/models/fields/customadminviews.php | 2 +- admin/models/fields/customfilelist.php | 2 +- admin/models/fields/customfolderlist.php | 2 +- admin/models/fields/customgets.php | 2 +- admin/models/fields/dbtables.php | 2 +- admin/models/fields/dynamicget.php | 2 +- admin/models/fields/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldsmulti.php | 2 +- admin/models/fields/fieldtypes.php | 2 +- admin/models/fields/ftps.php | 2 +- admin/models/fields/lang.php | 2 +- admin/models/fields/maingets.php | 2 +- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/fields/siteviews.php | 2 +- admin/models/fields/snippets.php | 2 +- admin/models/fieldtype.php | 26 +- admin/models/forms/admin_view.js | 65 +- admin/models/forms/admin_view.xml | 2376 ++++++++--------- admin/models/forms/custom_admin_view.js | 94 +- admin/models/forms/custom_admin_view.xml | 1009 ++++--- admin/models/forms/custom_code.js | 78 +- admin/models/forms/dynamic_get.js | 1164 ++++---- admin/models/forms/field.js | 388 +-- admin/models/forms/help_document.js | 236 +- admin/models/forms/joomla_component.js | 4 +- admin/models/forms/layout.js | 20 +- admin/models/forms/site_view.js | 151 +- admin/models/forms/site_view.xml | 1307 +++++---- admin/models/forms/template.js | 20 +- admin/models/ftp.php | 16 +- admin/models/import.php | 2 +- admin/models/import_joomla_components.php | 2 +- admin/models/joomla_component.php | 1399 +--------- admin/models/joomla_components.php | 4 +- admin/models/site_view.php | 56 +- admin/models/site_views.php | 4 +- admin/sql/install.mysql.utf8.sql | 30 +- admin/tables/admin_view.php | 4 +- admin/tables/custom_admin_view.php | 2 +- admin/tables/dynamic_get.php | 4 +- admin/tables/joomla_component.php | 4 +- admin/tables/site_view.php | 4 +- admin/views/admin_view/submitbutton.js | 4 +- admin/views/admin_view/tmpl/edit.php | 53 +- admin/views/admin_view/view.html.php | 9 +- admin/views/admin_views/tmpl/default.php | 4 +- .../admin_views/tmpl/default_batch_body.php | 4 +- .../admin_views/tmpl/default_batch_footer.php | 4 +- admin/views/admin_views/tmpl/default_body.php | 4 +- admin/views/admin_views/tmpl/default_foot.php | 4 +- admin/views/admin_views/tmpl/default_head.php | 4 +- .../admin_views/tmpl/default_toolbar.php | 4 +- admin/views/admin_views/view.html.php | 4 +- admin/views/componentbuilder/tmpl/default.php | 2 +- ...ult_issues_the_closed_issues_on_github.php | 2 +- ...fault_issues_the_open_issues_on_github.php | 2 +- .../componentbuilder/tmpl/default_main.php | 2 +- .../tmpl/default_readme_information.php | 2 +- .../tmpl/default_releases_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../componentbuilder/tmpl/default_vdm.php | 2 +- .../tmpl/default_wiki_tutorials.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/custom_admin_view/submitbutton.js | 2 +- admin/views/custom_admin_view/tmpl/edit.php | 2 +- admin/views/custom_admin_view/view.html.php | 4 +- .../views/custom_admin_views/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../custom_admin_views/tmpl/default_body.php | 2 +- .../custom_admin_views/tmpl/default_foot.php | 2 +- .../custom_admin_views/tmpl/default_head.php | 2 +- .../tmpl/default_toolbar.php | 2 +- admin/views/custom_admin_views/view.html.php | 2 +- admin/views/custom_code/tmpl/edit.php | 114 +- admin/views/dynamic_get/submitbutton.js | 4 +- admin/views/dynamic_get/tmpl/edit.php | 308 +-- admin/views/dynamic_get/view.html.php | 4 +- admin/views/dynamic_gets/tmpl/default.php | 4 +- .../dynamic_gets/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/dynamic_gets/tmpl/default_body.php | 4 +- .../views/dynamic_gets/tmpl/default_foot.php | 4 +- .../views/dynamic_gets/tmpl/default_head.php | 4 +- .../dynamic_gets/tmpl/default_toolbar.php | 4 +- admin/views/dynamic_gets/view.html.php | 4 +- admin/views/field/tmpl/edit.php | 132 +- admin/views/field/view.html.php | 2 +- admin/views/fieldtype/view.html.php | 2 +- admin/views/ftp/view.html.php | 2 +- admin/views/help_document/tmpl/edit.php | 54 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- .../import_joomla_components/tmpl/default.php | 2 +- .../import_joomla_components/view.html.php | 2 +- admin/views/joomla_component/submitbutton.js | 4 +- admin/views/joomla_component/tmpl/edit.php | 4 +- admin/views/joomla_component/view.html.php | 4 +- .../views/joomla_components/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../joomla_components/tmpl/default_body.php | 4 +- .../joomla_components/tmpl/default_foot.php | 4 +- .../joomla_components/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/joomla_components/view.html.php | 4 +- admin/views/layout/tmpl/edit.php | 10 +- admin/views/site_view/submitbutton.js | 4 +- admin/views/site_view/tmpl/edit.php | 19 +- admin/views/site_view/view.html.php | 6 +- admin/views/site_views/tmpl/default.php | 4 +- .../site_views/tmpl/default_batch_body.php | 4 +- .../site_views/tmpl/default_batch_footer.php | 4 +- admin/views/site_views/tmpl/default_body.php | 4 +- admin/views/site_views/tmpl/default_foot.php | 4 +- admin/views/site_views/tmpl/default_head.php | 4 +- .../views/site_views/tmpl/default_toolbar.php | 4 +- admin/views/site_views/view.html.php | 4 +- admin/views/template/tmpl/edit.php | 10 +- componentbuilder.xml | 2 +- script.php | 46 +- site/assets/css/site.css | 2 +- site/assets/js/site.js | 2 +- site/componentbuilder.php | 2 +- site/controller.php | 2 +- site/controllers/api.php | 2 +- site/controllers/help.php | 2 +- site/helpers/category.php | 2 +- site/helpers/categoryfields.php | 2 +- site/helpers/categoryfieldtypes.php | 2 +- site/helpers/componentbuilder.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- site/router.php | 2 +- site/views/api/submitbutton.js | 2 +- 331 files changed, 4920 insertions(+), 8617 deletions(-) diff --git a/README.md b/README.md index eebc011f2..9a0b2ca43 100644 --- a/README.md +++ b/README.md @@ -110,11 +110,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 6th October, 2017 ++ *Last Build*: 12th October, 2017 + *Version*: 2.5.6 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **120884** ++ *Line count*: **117008** + *File count*: **702** + *Folder count*: **121** diff --git a/admin/README.txt b/admin/README.txt index eebc011f2..9a0b2ca43 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -110,11 +110,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 6th October, 2017 ++ *Last Build*: 12th October, 2017 + *Version*: 2.5.6 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **120884** ++ *Line count*: **117008** + *File count*: **702** + *Folder count*: **121** diff --git a/admin/access.xml b/admin/access.xml index cc6bd0863..0412b8e14 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -19,83 +19,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -205,86 +128,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -345,171 +189,9 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index f2fba667c..65bfa876d 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index 1c20b341e..a85ed845d 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 114 of this MVC - @build 28th August, 2017 + @version @update number 126 of this MVC + @build 11th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.css diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index e23ed7a2b..093b45cff 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 114 of this MVC - @build 28th August, 2017 + @version @update number 126 of this MVC + @build 11th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index 28bf6fdb1..dea59af2c 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 27 of this MVC - @build 27th September, 2017 + @build 9th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.css diff --git a/admin/assets/css/custom_admin_views.css b/admin/assets/css/custom_admin_views.css index c1fcdbc4d..a54b973d6 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 27 of this MVC - @build 27th September, 2017 + @build 9th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 3017e9999..c1d382955 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/dynamic_get.css b/admin/assets/css/dynamic_get.css index f7eba633c..2260ffd14 100644 --- a/admin/assets/css/dynamic_get.css +++ b/admin/assets/css/dynamic_get.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 94 of this MVC - @build 27th September, 2017 + @version @update number 95 of this MVC + @build 10th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.css diff --git a/admin/assets/css/dynamic_gets.css b/admin/assets/css/dynamic_gets.css index 2be1ec746..0381d4f66 100644 --- a/admin/assets/css/dynamic_gets.css +++ b/admin/assets/css/dynamic_gets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 94 of this MVC - @build 27th September, 2017 + @version @update number 95 of this MVC + @build 10th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.css diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index 71c18b527..2027652f6 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 385 of this MVC - @build 6th October, 2017 + @version @update number 387 of this MVC + @build 11th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.css diff --git a/admin/assets/css/joomla_components.css b/admin/assets/css/joomla_components.css index df288513e..536d7eb85 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 385 of this MVC - @build 6th October, 2017 + @version @update number 387 of this MVC + @build 11th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.css diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index 181e85452..43b9c1262 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 54 of this MVC - @build 27th September, 2017 + @version @update number 58 of this MVC + @build 9th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.css diff --git a/admin/assets/css/site_views.css b/admin/assets/css/site_views.css index 4ec2c50c7..bf0995061 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 54 of this MVC - @build 27th September, 2017 + @version @update number 58 of this MVC + @build 9th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index 5c409af9b..17bae336f 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.js diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 3e9373f28..674cbb969 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index d15dd6dbd..42dffc282 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 4ecc91914..405e47d74 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 114 of this MVC - @build 28th August, 2017 + @version @update number 126 of this MVC + @build 11th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -88,13 +88,6 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - // Access check. - $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $recordId) && $user->authorise('admin_view.access', 'com_componentbuilder')); - if (!$access) - { - return false; - } - if ($recordId) { // The record has been set. Check the record permissions. diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 39672aac5..91d7a1885 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 114 of this MVC - @build 28th August, 2017 + @version @update number 126 of this MVC + @build 11th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index d9650fdcc..6838d1cbb 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 7c8da43c1..a19441327 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index 69febd3ea..6895119cc 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 27 of this MVC - @build 27th September, 2017 + @build 9th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index df2120fde..bca5e2b58 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 27 of this MVC - @build 27th September, 2017 + @build 9th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index b38450731..2a87602d1 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 94 of this MVC - @build 27th September, 2017 + @version @update number 95 of this MVC + @build 10th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index 7a396212e..96a4bc7ff 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 94 of this MVC - @build 27th September, 2017 + @version @update number 95 of this MVC + @build 10th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 271856a08..2608d7145 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index ea2dff640..4ff8ff0f1 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index 71c3df898..8a562e2c1 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index f95a37f18..0404fc540 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 385 of this MVC - @build 6th October, 2017 + @version @update number 387 of this MVC + @build 11th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index 04e3792ba..58070de39 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 385 of this MVC - @build 6th October, 2017 + @version @update number 387 of this MVC + @build 11th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index d85d70d0c..7ecec7054 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 54 of this MVC - @build 27th September, 2017 + @version @update number 58 of this MVC + @build 9th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index 2677a9cb4..d45ad3412 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 54 of this MVC - @build 27th September, 2017 + @version @update number 58 of this MVC + @build 9th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index d74c9c519..06537e21a 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -1184,11 +1184,12 @@ class Get // Load the results as a list of stdClass objects (see later for more options on retrieving data). $view = $this->db->loadObject(); - // reset fields - $view->fields = array(); // setup view name to use in storing the data $name_single = ComponentbuilderHelper::safeString($view->name_single); $name_list = ComponentbuilderHelper::safeString($view->name_list); + // be sure to update the value in the db + $objectUpdate = new stdClass(); + $objectUpdate->id = (int) $id; // setup token check if (!isset($this->customScriptBuilder['token'])) { @@ -1208,27 +1209,104 @@ class Get $this->placeholders['[[[View]]]'] = $this->placeholders['###View###']; $this->placeholders['[[[Views]]]'] = $this->placeholders['###Views###']; $this->placeholders['[[[VIEW]]]'] = $this->placeholders['###VIEW###']; - $this->placeholders['[[[VIEWS]]]'] = $this->placeholders['###VIEWS###']; - // load the values form params - $permissions = json_decode($view->addpermissions,true); - unset($view->addpermissions); - $tabs = json_decode($view->addtabs,true); - unset($view->addtabs); - $fields = json_decode($view->addfields,true); - unset($view->addfields); - $conditions = json_decode($view->addconditions,true); - unset($view->addconditions); - $linked_views = json_decode($view->addlinked_views,true); - unset($view->addlinked_views); - $tables = json_decode($view->addtables,true); + $this->placeholders['[[[VIEWS]]]'] = $this->placeholders['###VIEWS###']; + // add the tables + $view->addtables = json_decode($view->addtables,true); + // check what type of table array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($view->addtables['table'])) + { + $bucket = array(); + foreach($view->addtables as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addtables'.$nr][$option] = $value; + } + } + $view->addtables = $bucket; + $objectUpdate->addtables = json_encode($bucket); + } + if (ComponentbuilderHelper::checkArray($view->addtables)) + { + $view->tables = array_values($view->addtables); + } unset($view->addtables); + // add the tabs + $view->addtabs = json_decode($view->addtabs,true); + // check what type of tabs array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($view->addtabs['name'])) + { + $bucket = array(); + foreach($view->addtabs as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addtabs'.$nr][$option] = $value; + } + } + $view->addtabs = $bucket; + $objectUpdate->addtabs = json_encode($bucket); + } + if (ComponentbuilderHelper::checkArray($view->addtabs)) + { + $nr = 1; + foreach ($view->addtabs as $tab) + { + $view->tabs[$nr] = $tab['name']; + $nr++; + } + } + unset($view->addtabs); + // add permissions + $view->addpermissions = json_decode($view->addpermissions,true); + // check what type of permissions array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($view->addpermissions['action'])) + { + $bucket = array(); + foreach($view->addpermissions as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addpermissions'.$nr][$option] = $value; + } + } + $view->addpermissions = $bucket; + $objectUpdate->addpermissions = json_encode($bucket); + } + if (ComponentbuilderHelper::checkArray($view->addpermissions)) + { + $view->permissions = array_values($view->addpermissions); + } + unset($view->addpermissions); + // reset fields + $view->fields = array(); + // set fields + $view->addfields = json_decode($view->addfields,true); + // check what type of field array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($view->addfields['field'])) + { + $bucket = array(); + foreach($view->addfields as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addfields'.$nr][$option] = $value; + } + } + $view->addfields = $bucket; + $objectUpdate->addfields = json_encode($bucket); + } // build update SQL if ($old_view = $this->getHistoryWatch('admin_view', $id)) { // add new fields were added if (isset($old_view->addfields) && ComponentbuilderHelper::checkJson($old_view->addfields)) { - $this->setUpdateSQL(json_decode($old_view->addfields, true), $fields, 'field', $name_single); + $this->setUpdateSQL(json_decode($old_view->addfields, true), $view->addfields, 'field', $name_single); } // check if the view name changed if (ComponentbuilderHelper::checkString($old_view->name_single)) @@ -1238,161 +1316,152 @@ class Get // clear this data unset($old_view); } - // sort the values - if (ComponentbuilderHelper::checkArray($tables)) + if (ComponentbuilderHelper::checkArray($view->addfields)) { - foreach ($tables as $option => $values) - { - foreach ($values as $nr => $value) - { - $view->tables[$nr][$option] = $value; - } - } - } - if (ComponentbuilderHelper::checkArray($tabs)) - { - foreach ($tabs as $option => $values) - { - foreach ($values as $nr => $value) - { - $fix = $nr+1; - $view->tabs[$fix] = $value; - } - } - } - if (ComponentbuilderHelper::checkArray($permissions)) - { - foreach ($permissions as $option => $values) - { - foreach ($values as $nr => $value) - { - $view->permissions[$nr][$option] = $value; - } - } - } - if (ComponentbuilderHelper::checkArray($fields)) - { - foreach ($fields as $option => $values) - { - foreach ($values as $nr => $value) - { - $view->fields[$nr][$option] = (int) $value; - } - } + $view->fields = array_values($view->addfields); // sort the fields acording to order usort($view->fields, function($a, $b) { - if ($a['order_list'] != 0 && $b['order_list'] != 0) - { - return $a['order_list'] - $b['order_list']; - } - elseif ($b['order_list'] != 0 && $a['order_list'] == 0) + if (isset($a['order_list']) && isset($b['order_list'])) { + if ($a['order_list'] != 0 && $b['order_list'] != 0) + { + return $a['order_list'] - $b['order_list']; + } + elseif ($b['order_list'] != 0 && $a['order_list'] == 0) + { + return 1; + } + elseif ($a['order_list'] != 0 && $b['order_list'] == 0) + { + return 0; + } return 1; } - elseif ($a['order_list'] != 0 && $b['order_list'] == 0) - { - return 0; - } - return 1; + return 0; }); // load the field data foreach ($view->fields as $key => &$field) { - $field['settings'] = $this->getFieldData($field['field'],$name_single,$name_list); + $field['settings'] = $this->getFieldData($field['field'], $name_single, $name_list); } } - if (ComponentbuilderHelper::checkArray($conditions)) + unset($view->addfields); + // set the conditions + $view->addconditions = json_decode($view->addconditions,true); + // check what type of conditions array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($view->addconditions['target_field'])) { - foreach ($conditions as $condition => $conditionValues) + $bucket = array(); + foreach($view->addconditions as $option => $values) { - foreach ($conditionValues as $nr => $conditionValue) + foreach($values as $nr => $value) { - if ($condition === 'target_field') + $bucket['addconditions'.$nr][$option] = $value; + } + } + $view->addconditions = $bucket; + $objectUpdate->addconditions = json_encode($bucket); + } + if (ComponentbuilderHelper::checkArray($view->addconditions)) + { + $view->conditions = array(); + $ne = 0; + foreach ($view->addconditions as $nr => $conditionValue) + { + if (ComponentbuilderHelper::checkArray($conditionValue['target_field']) && ComponentbuilderHelper::checkArray($view->fields)) + { + foreach ($conditionValue['target_field'] as $fieldKey => $fieldId) { - if (ComponentbuilderHelper::checkArray($conditionValue) && ComponentbuilderHelper::checkArray($view->fields)) + foreach ($view->fields as $fieldValues) { - foreach ($conditionValue as $fieldKey => $fieldId) - { - foreach ($view->fields as $fieldValues) - { - if ((int) $fieldValues['field'] == (int) $fieldId) - { - // load the field details - $required = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'required="','"'); - $required = ($required == true) ? 'yes' : 'no'; - $filter = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'filter="','"'); - $filter = ComponentbuilderHelper::checkString($filter) ? $filter : 'none'; - // get name - $name = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'name="','"'); - $name = ComponentbuilderHelper::checkString($name) ? $name : $fieldValues['settings']->name; - // get type - $type = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'type="','"'); - $type = ComponentbuilderHelper::checkString($type) ? $type : $fieldValues['settings']->type_name; - // set the field name - $conditionValue[$fieldKey] = array( - 'name' => ComponentbuilderHelper::safeString($name), - 'type' => ComponentbuilderHelper::safeString($type), - 'required' => $required, - 'filter' => $filter - ); - break; - } - } - } - } - } - if ($condition === 'match_field') - { - foreach ($view->fields as $fieldValue) - { - if ((int) $fieldValue['field'] == (int) $conditionValue) + if ((int) $fieldValues['field'] == (int) $fieldId) { + // load the field details + $required = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'required="','"'); + $required = ($required == true) ? 'yes' : 'no'; + $filter = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'filter="','"'); + $filter = ComponentbuilderHelper::checkString($filter) ? $filter : 'none'; // get name - $name = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'name="','"'); - $name = ComponentbuilderHelper::checkString($name) ? $name : $fieldValue['settings']->name; + $name = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'name="','"'); + $name = ComponentbuilderHelper::checkString($name) ? $name : $fieldValues['settings']->name; // get type - $type = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'type="','"'); - $type = ComponentbuilderHelper::checkString($type) ? $type : $fieldValue['settings']->type_name; - // set the field details - $view->conditions[$nr]['match_name'] = ComponentbuilderHelper::safeString($name); - $view->conditions[$nr]['match_type'] = ComponentbuilderHelper::safeString($type); - $view->conditions[$nr]['match_xml'] = $fieldValue['settings']->xml; - // if custom field load field being extended - if (!ComponentbuilderHelper::typeField($type)) - { - $view->conditions[$nr]['match_extends'] = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'extends="','"'); - } - else - { - $view->conditions[$nr]['match_extends'] = ''; - } + $type = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml,'type="','"'); + $type = ComponentbuilderHelper::checkString($type) ? $type : $fieldValues['settings']->type_name; + // set the field name + $conditionValue['target_field'][$fieldKey] = array( + 'name' => ComponentbuilderHelper::safeString($name), + 'type' => ComponentbuilderHelper::safeString($type), + 'required' => $required, + 'filter' => $filter + ); break; } } } - // set condition values - $view->conditions[$nr][$condition] = $conditionValue; } - } - } - // set linked views - $linked_views_sorted = null; - if (ComponentbuilderHelper::checkArray($linked_views)) - { - $linked_views_sorted = array(); - foreach ($linked_views as $option => $values) - { - foreach ($values as $nr => $value) + + // load match field + if (ComponentbuilderHelper::checkArray($view->fields) && isset($conditionValue['match_field'])) { - $linked_views_sorted[$nr][$option] = $value; + foreach ($view->fields as $fieldValue) + { + if ((int) $fieldValue['field'] == (int) $conditionValue['match_field']) + { + // get name + $name = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'name="','"'); + $name = ComponentbuilderHelper::checkString($name) ? $name : $fieldValue['settings']->name; + // get type + $type = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'type="','"'); + $type = ComponentbuilderHelper::checkString($type) ? $type : $fieldValue['settings']->type_name; + // set the field details + $conditionValue['match_name'] = ComponentbuilderHelper::safeString($name); + $conditionValue['match_type'] = ComponentbuilderHelper::safeString($type); + $conditionValue['match_xml'] = $fieldValue['settings']->xml; + // if custom field load field being extended + if (!ComponentbuilderHelper::typeField($type)) + { + $conditionValue['match_extends'] = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'extends="','"'); + } + else + { + $conditionValue['match_extends'] = ''; + } + break; + } + } } + // set condition values + $view->conditions[$ne] = $conditionValue; + $ne++; } } - unset($linked_views); - // setup linked views to global data sets - $this->linkedAdminViews[$name_single] = $linked_views_sorted; - unset($linked_views_sorted); + unset($view->addconditions); + // set linked views + $this->linkedAdminViews[$name_single] = null; + $view->addlinked_views = json_decode($view->addlinked_views,true); + // check what type of linked_views array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($view->addlinked_views['adminview'])) + { + $bucket = array(); + foreach($view->addlinked_views as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addlinked_views'.$nr][$option] = $value; + } + } + $view->addlinked_views = $bucket; + $objectUpdate->addlinked_views = json_encode($bucket); + } + if (ComponentbuilderHelper::checkArray($view->addlinked_views)) + { + // setup linked views to global data sets + $this->linkedAdminViews[$name_single] = array_values($view->addlinked_views); + } + unset($view->addlinked_views); // set the lang target $this->lang = 'admin'; // add_javascript @@ -1468,19 +1537,28 @@ class Get $view->php_controller_list = $this->setDynamicValues(base64_decode($view->php_controller_list)); } // set the button array - $buttons = json_decode($view->custom_button,true); - unset($view->custom_button); + $view->custom_button = json_decode($view->custom_button,true); + // check what type of custom_button array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($view->custom_button['name'])) + { + $bucket = array(); + foreach($view->custom_button as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['custom_button'.$nr][$option] = $value; + } + } + $view->custom_button = $bucket; + $objectUpdate->custom_button = json_encode($bucket); + } // sort the values - if (ComponentbuilderHelper::checkArray($buttons)) + if (ComponentbuilderHelper::checkArray($view->custom_button)) { - foreach ($buttons as $option => $values) - { - foreach ($values as $nr => $value) - { - $view->custom_buttons[$nr][$option] = $value; - } - } + $view->custom_buttons = array_values($view->custom_button); } + unset($view->custom_button); } // set custom import scripts if (isset($view->add_custom_import) && $view->add_custom_import == 1) @@ -1517,20 +1595,29 @@ class Get } } // check if controller input as been set - $ajax_input = json_decode($view->ajax_input,true); - if (ComponentbuilderHelper::checkArray($ajax_input)) + $view->ajax_input = json_decode($view->ajax_input,true); + // check what type of ajax_input array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($view->ajax_input['value_name'])) { - foreach ($ajax_input as $option => $values) + $bucket = array(); + foreach($view->ajax_input as $option => $values) { - foreach ($values as $nr => $value) + foreach($values as $nr => $value) { - if ($addAjaxSite) - { - $this->customScriptBuilder['site']['ajax_controller'][$name_single][$nr][$option] = $value; - } - $this->customScriptBuilder['admin']['ajax_controller'][$name_single][$nr][$option] = $value; + $bucket['ajax_input'.$nr][$option] = $value; } } + $view->ajax_input = $bucket; + $objectUpdate->ajax_input = json_encode($bucket); + } + if (ComponentbuilderHelper::checkArray($view->ajax_input)) + { + if ($addAjaxSite) + { + $this->customScriptBuilder['site']['ajax_controller'][$name_single] = array_values($view->ajax_input); + } + $this->customScriptBuilder['admin']['ajax_controller'][$name_single] = array_values($view->ajax_input); $this->addAjax = true; unset($view->ajax_input); } @@ -1552,7 +1639,7 @@ class Get if ($view->source == 1 && isset($view->tables)) { // build and add the SQL dump - $this->customScriptBuilder['sql'][$name_single] = $this->buildSqlDump($view->tables,$name_single, $id); + $this->customScriptBuilder['sql'][$name_single] = $this->buildSqlDump($view->tables, $name_single, $id); unset($view->tables); } elseif ($view->source == 2 && isset($view->sql)) @@ -1577,6 +1664,11 @@ class Get unset($this->placeholders['[[[VIEWS]]]']); // store this view to class object $this->_adminViewData[$id] = $view; + // be sure to update the table if we found repeatable fields that are still not converted + if (count((array) $objectUpdate) > 1) + { + $this->db->updateObject('#__componentbuilder_admin_view', $objectUpdate, 'id'); + } } // return the found view data return $this->_adminViewData[$id]; @@ -1613,6 +1705,9 @@ class Get { $this->lang = 'admin'; } + // be sure to update the value in the db + $objectUpdate = new stdClass(); + $objectUpdate->id = (int) $id; // set the default data $view->default = $this->setDynamicValues(base64_decode($view->default)); // fix alias to use in code @@ -1721,16 +1816,25 @@ class Get if (isset($view->add_php_ajax) && $view->add_php_ajax == 1) { // check if controller input as been set - $ajax_input = json_decode($view->ajax_input,true); - if (ComponentbuilderHelper::checkArray($ajax_input)) + $view->ajax_input = json_decode($view->ajax_input,true); + // check what type of ajax_input array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($view->ajax_input['value_name'])) { - foreach ($ajax_input as $option => $values) + $bucket = array(); + foreach($view->ajax_input as $option => $values) { - foreach ($values as $nr => $value) + foreach($values as $nr => $value) { - $this->customScriptBuilder[$this->target]['ajax_controller'][$view->code][$nr][$option] = $value; + $bucket['ajax_input'.$nr][$option] = $value; } } + $view->ajax_input = $bucket; + $objectUpdate->ajax_input = json_encode($bucket); + } + if (ComponentbuilderHelper::checkArray($view->ajax_input)) + { + $this->customScriptBuilder[$this->target]['ajax_controller'][$view->code] = array_values($view->ajax_input); $this->addSiteAjax = true; unset($view->ajax_input); } @@ -1754,19 +1858,33 @@ class Get $view->php_controller = base64_decode($view->php_controller); $view->php_controller = $this->setDynamicValues($view->php_controller); // set the button array - $buttons = json_decode($view->custom_button,true); - unset($view->custom_button); - // sort the values - if (ComponentbuilderHelper::checkArray($buttons)) + $view->custom_button = json_decode($view->custom_button,true); + // check what type of custom_button array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($view->custom_button['name'])) { - foreach ($buttons as $option => $values) + $bucket = array(); + foreach($view->custom_button as $option => $values) { - foreach ($values as $nr => $value) + foreach($values as $nr => $value) { - $view->custom_buttons[$nr][$option] = $value; + $bucket['custom_button'.$nr][$option] = $value; } } + $view->custom_button = array_values($bucket); + $objectUpdate->custom_button = json_encode($bucket); } + // sort the values + if (ComponentbuilderHelper::checkArray($view->custom_button)) + { + $view->custom_buttons = array_values($view->custom_button); + } + unset($view->custom_button); + } + // be sure to update the table if we found repeatable fields that are still not converted + if (count((array) $objectUpdate) > 1) + { + $this->db->updateObject('#__componentbuilder_'.$table, $objectUpdate, 'id'); } // return the found view data return $view; @@ -1782,7 +1900,7 @@ class Get * @return oject The field data * */ - public function getFieldData($id,$name_single = null,$name_list = null) + public function getFieldData($id, $name_single = null, $name_list = null) { if (!isset($this->_fieldData[$id]) && $id > 0) { @@ -1791,7 +1909,7 @@ class Get // Order it by the ordering field. $query->select('a.*'); - $query->select($this->db->quoteName(array('c.name', 'c.properties'),array('type_name','properties'))); + $query->select($this->db->quoteName(array('c.name', 'c.properties'), array('type_name', 'properties'))); $query->from('#__componentbuilder_field AS a'); $query->join('LEFT', $this->db->quoteName('#__componentbuilder_fieldtype', 'c') . ' ON (' . $this->db->quoteName('a.fieldtype') . ' = ' . $this->db->quoteName('c.id') . ')'); $query->where($this->db->quoteName('a.id') . ' = '. $this->db->quote($id)); @@ -1811,8 +1929,27 @@ class Get $field->xml = $this->setDynamicValues(json_decode($field->xml)); // load the type values form type params - $field->properties = json_decode($field->properties,true); - + $properties = json_decode($field->properties,true); + // check what type of field array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($properties['name'])) + { + $bucket = array(); + foreach($properties as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addfields'.$nr][$option] = $value; + } + } + $properties = $bucket; + // be sure to update the value in the db + $objectUpdate = new stdClass(); + $objectUpdate->id = $field->fieldtype; + $objectUpdate->properties = json_encode($bucket); + $this->db->updateObject('#__componentbuilder_fieldtype', $objectUpdate, 'id'); + } + $field->properties = array_values($properties); // check if we have advanced encryption if (4 == $field->store && (!isset($this->advancedEncryption) || !$this->advancedEncryption)) { @@ -2245,12 +2382,54 @@ class Get protected function setUpdateSQL($old, $new, $type, $key = null) { // check if there were new items added - if (isset($new[$type]) && ComponentbuilderHelper::checkArray($new[$type]) - && isset($old[$type]) && ComponentbuilderHelper::checkArray($old[$type])) + if (ComponentbuilderHelper::checkArray($new) + && ComponentbuilderHelper::checkArray($old)) { - foreach ($new[$type] as $item) + foreach ($new as $item) { - if (!in_array($item, $old[$type])) + // search to see if this is a new value + $newItem = true; + if (isset($item[$type])) + { + // check if this is old repeatable field + if (isset($old[$type]) && ComponentbuilderHelper::checkArray($old[$type])) + { + if (in_array($item[$type], $old[$type])) + { + $newItem = false; + } + } + elseif (!isset($old[$type])) + { + // we have new values + foreach($old as $oldItem) + { + if (isset($oldItem[$type])) + { + if ($oldItem[$type] == $item[$type]) + { + $newItem = false; + break; + } + } + else + { + $newItem = false; + break; + } + } + } + else + { + $newItem = false; + } + } + else + { + break; + } + // ad if new + if ($newItem) { // we have a new item, lets add to SQL if (!isset($this->addSQL[$type]) || !ComponentbuilderHelper::checkArray($this->addSQL[$type])) @@ -2264,18 +2443,18 @@ class Get { $this->addSQL[$type][$key] = array(); } - $this->addSQL[$type][$key][] = (int) $item; + $this->addSQL[$type][$key][] = (int) $item[$type]; } else { // convert adminview id to name if ('adminview' === $type) { - $this->addSQL[$type][] = ComponentbuilderHelper::safeString($this->getAdminViewData($item)->name_single); + $this->addSQL[$type][] = ComponentbuilderHelper::safeString($this->getAdminViewData($item[$type])->name_single); } else { - $this->addSQL[$type][] = (int) item; + $this->addSQL[$type][] = (int) $item[$type]; } } } @@ -2774,7 +2953,7 @@ class Get * @return string on success with the Dump SQL * */ - public function buildSqlDump($tables,$view,$view_id) + public function buildSqlDump($tables, $view, $view_id) { // first build a query statment to get all the data (insure it must be added - check the tweaking) if (ComponentbuilderHelper::checkArray($tables) && (!isset($this->sqlTweak[$view_id]['remove']) || !$this->sqlTweak[$view_id]['remove'])) diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php index 99d3f496d..3c3383f6d 100644 --- a/admin/helpers/compiler/b_Structure.php +++ b/admin/helpers/compiler/b_Structure.php @@ -311,7 +311,7 @@ class Structure extends Get { // first we run the perent constructor if (parent::__construct($config)) - { + { // set the Joomla version $this->joomlaVersion = $config['joomlaVersion']; // set the template path diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php index 4d20edbe8..a1dee2332 100644 --- a/admin/helpers/compiler/c_Fields.php +++ b/admin/helpers/compiler/c_Fields.php @@ -1526,7 +1526,7 @@ class Fields extends Structure } // check if translatable - if (ComponentbuilderHelper::checkString($xmlValue) && $property['translatable'] == 1) + if (ComponentbuilderHelper::checkString($xmlValue) && isset($property['translatable']) && $property['translatable'] == 1) { // update lable if field use multiple times if ($property['name'] === 'label') @@ -1550,7 +1550,7 @@ class Fields extends Structure // use lang value $xmlValue = $langValue; } - elseif (isset($field['alias']) && $field['alias'] && $property['translatable'] == 1) + elseif (isset($field['alias']) && $field['alias'] && isset($property['translatable']) && $property['translatable'] == 1) { if ($property['name'] === 'label') { @@ -1565,7 +1565,7 @@ class Fields extends Structure $xmlValue = 'JFIELD_ALIAS_PLACEHOLDER'; } } - elseif (isset($field['title']) && $field['title'] && $property['translatable'] == 1) + elseif (isset($field['title']) && $field['title'] && isset($property['translatable']) && $property['translatable'] == 1) { if ($property['name'] === 'label') { @@ -1577,7 +1577,7 @@ class Fields extends Structure } } // only load value if found or is mandatory - if (ComponentbuilderHelper::checkString($xmlValue) || ($property['mandatory'] == 1 && !$setCustom)) + if (ComponentbuilderHelper::checkString($xmlValue) || (isset($property['mandatory']) && $property['mandatory'] == 1 && !$setCustom)) { // make sure mantory fields are added if (!ComponentbuilderHelper::checkString($xmlValue)) diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 3df4416fc..ac289ddac 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index fb2ca8812..5bc48a64a 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilderemail.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 83b71315d..1e4e0f004 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 963fffada..5da897a35 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 2daeb7bcf..901dacf8b 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index 567335eab..c38eea2d0 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 86798ec99..b2e45164a 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 6da4d2a2d..a7ad37ff4 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -11,174 +11,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_OPTIONS="Batch process the selected Admin COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_TIP="All changes will be applied to all selected Admin Views" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE="Admin Views Batch Use" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admin views" -COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE="Admin Views Create" -COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD="Admin Views Dashboard Add" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST="Admin Views Dashboard List" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete" -COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDCONDITIONS="Admin Views Edit Addconditions" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDCONDITIONS_DESC="Allows the users in this group to update the edit addconditions of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDFIELDS="Admin Views Edit Addfields" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDFIELDS_DESC="Allows the users in this group to update the edit addfields of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDLINKED_VIEWS="Admin Views Edit Addlinked Views" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDLINKED_VIEWS_DESC="Allows the users in this group to update the edit addlinked views of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDPERMISSIONS="Admin Views Edit Addpermissions" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDPERMISSIONS_DESC="Allows the users in this group to update the edit addpermissions of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABLES="Admin Views Edit Addtables" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABLES_DESC="Allows the users in this group to update the edit addtables of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABS="Admin Views Edit Addtabs" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABS_DESC="Allows the users in this group to update the edit addtabs of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEW="Admin Views Edit Add Css View" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEWS="Admin Views Edit Add Css Views" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEWS_DESC="Allows the users in this group to update the edit add css views of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEW_DESC="Allows the users in this group to update the edit add css view of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_BUTTON="Admin Views Edit Add Custom Button" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_BUTTON_DESC="Allows the users in this group to update the edit add custom button of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_IMPORT="Admin Views Edit Add Custom Import" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_IMPORT_DESC="Allows the users in this group to update the edit add custom import of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_FADEIN="Admin Views Edit Add Fadein" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_FADEIN_DESC="Allows the users in this group to update the edit add fadein of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FILE="Admin Views Edit Add Javascript Views File" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FILE_DESC="Allows the users in this group to update the edit add javascript views file of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FOOTER="Admin Views Edit Add Javascript Views Footer" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FOOTER_DESC="Allows the users in this group to update the edit add javascript views footer of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FILE="Admin Views Edit Add Javascript View File" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FILE_DESC="Allows the users in this group to update the edit add javascript view file of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FOOTER="Admin Views Edit Add Javascript View Footer" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FOOTER_DESC="Allows the users in this group to update the edit add javascript view footer of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_DELETE="Admin Views Edit Add Php After Delete" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_DELETE_DESC="Allows the users in this group to update the edit add php after delete of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_PUBLISH="Admin Views Edit Add Php After Publish" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_PUBLISH_DESC="Allows the users in this group to update the edit add php after publish of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AJAX="Admin Views Edit Add Php Ajax" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AJAX_DESC="Allows the users in this group to update the edit add php ajax of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_ALLOWEDIT="Admin Views Edit Add Php Allowedit" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_ALLOWEDIT_DESC="Allows the users in this group to update the edit add php allowedit of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHCOPY="Admin Views Edit Add Php Batchcopy" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHCOPY_DESC="Allows the users in this group to update the edit add php batchcopy of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHMOVE="Admin Views Edit Add Php Batchmove" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHMOVE_DESC="Allows the users in this group to update the edit add php batchmove of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_DELETE="Admin Views Edit Add Php Before Delete" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_DELETE_DESC="Allows the users in this group to update the edit add php before delete of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_PUBLISH="Admin Views Edit Add Php Before Publish" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_PUBLISH_DESC="Allows the users in this group to update the edit add php before publish of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_SAVE="Admin Views Edit Add Php Before Save" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_SAVE_DESC="Allows the users in this group to update the edit add php before save of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_DOCUMENT="Admin Views Edit Add Php Document" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_DOCUMENT_DESC="Allows the users in this group to update the edit add php document of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEM="Admin Views Edit Add Php Getitem" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS="Admin Views Edit Add Php Getitems" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS_AFTER_ALL="Admin Views Edit Add Php Getitems After All" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS_AFTER_ALL_DESC="Allows the users in this group to update the edit add php getitems after all of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS_DESC="Allows the users in this group to update the edit add php getitems of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEM_DESC="Allows the users in this group to update the edit add php getitem of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETLISTQUERY="Admin Views Edit Add Php Getlistquery" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETLISTQUERY_DESC="Allows the users in this group to update the edit add php getlistquery of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_POSTSAVEHOOK="Admin Views Edit Add Php Postsavehook" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_POSTSAVEHOOK_DESC="Allows the users in this group to update the edit add php postsavehook of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_SAVE="Admin Views Edit Add Php Save" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_SAVE_DESC="Allows the users in this group to update the edit add php save of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_SQL="Admin Views Edit Add Sql" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_SQL_DESC="Allows the users in this group to update the edit add sql of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_AJAX_INPUT="Admin Views Edit Ajax Input" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_AJAX_INPUT_DESC="Allows the users in this group to update the edit ajax input of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEW="Admin Views Edit Css View" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEWS="Admin Views Edit Css Views" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEWS_DESC="Allows the users in this group to update the edit css views of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEW_DESC="Allows the users in this group to update the edit css view of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CUSTOM_BUTTON="Admin Views Edit Custom Button" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CUSTOM_BUTTON_DESC="Allows the users in this group to update the edit custom button of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC="Allows the users in this group to edit the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESCRIPTION="Admin Views Edit Description" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_HTML_IMPORT_VIEW="Admin Views Edit Html Import View" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_HTML_IMPORT_VIEW_DESC="Allows the users in this group to update the edit html import view of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON="Admin Views Edit Icon" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_ADD="Admin Views Edit Icon Add" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_ADD_DESC="Allows the users in this group to update the edit icon add of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_CATEGORY="Admin Views Edit Icon Category" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_CATEGORY_DESC="Allows the users in this group to update the edit icon category of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_DESC="Allows the users in this group to update the edit icon of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FILE="Admin Views Edit Javascript Views File" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FILE_DESC="Allows the users in this group to update the edit javascript views file of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FOOTER="Admin Views Edit Javascript Views Footer" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FOOTER_DESC="Allows the users in this group to update the edit javascript views footer of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FILE="Admin Views Edit Javascript View File" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FILE_DESC="Allows the users in this group to update the edit javascript view file of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FOOTER="Admin Views Edit Javascript View Footer" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FOOTER_DESC="Allows the users in this group to update the edit javascript view footer of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_LIST="Admin Views Edit Name List" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_LIST_DESC="Allows the users in this group to update the edit name list of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_SINGLE="Admin Views Edit Name Single" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_SINGLE_DESC="Allows the users in this group to update the edit name single of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN="Admin Views Edit Own" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admin views created by them" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_DELETE="Admin Views Edit Php After Delete" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_DELETE_DESC="Allows the users in this group to update the edit php after delete of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_PUBLISH="Admin Views Edit Php After Publish" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_PUBLISH_DESC="Allows the users in this group to update the edit php after publish of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AJAXMETHOD="Admin Views Edit Php Ajaxmethod" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AJAXMETHOD_DESC="Allows the users in this group to update the edit php ajaxmethod of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_ALLOWEDIT="Admin Views Edit Php Allowedit" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_ALLOWEDIT_DESC="Allows the users in this group to update the edit php allowedit of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHCOPY="Admin Views Edit Php Batchcopy" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHCOPY_DESC="Allows the users in this group to update the edit php batchcopy of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHMOVE="Admin Views Edit Php Batchmove" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHMOVE_DESC="Allows the users in this group to update the edit php batchmove of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_DELETE="Admin Views Edit Php Before Delete" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_DELETE_DESC="Allows the users in this group to update the edit php before delete of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_PUBLISH="Admin Views Edit Php Before Publish" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_PUBLISH_DESC="Allows the users in this group to update the edit php before publish of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_SAVE="Admin Views Edit Php Before Save" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_SAVE_DESC="Allows the users in this group to update the edit php before save of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER="Admin Views Edit Php Controller" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER_DESC="Allows the users in this group to update the edit php controller of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER_LIST="Admin Views Edit Php Controller List" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER_LIST_DESC="Allows the users in this group to update the edit php controller list of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_DOCUMENT="Admin Views Edit Php Document" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_DOCUMENT_DESC="Allows the users in this group to update the edit php document of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEM="Admin Views Edit Php Getitem" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS="Admin Views Edit Php Getitems" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS_AFTER_ALL="Admin Views Edit Php Getitems After All" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS_AFTER_ALL_DESC="Allows the users in this group to update the edit php getitems after all of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS_DESC="Allows the users in this group to update the edit php getitems of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEM_DESC="Allows the users in this group to update the edit php getitem of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETLISTQUERY="Admin Views Edit Php Getlistquery" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETLISTQUERY_DESC="Allows the users in this group to update the edit php getlistquery of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT="Admin Views Edit Php Import" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_DESC="Allows the users in this group to update the edit php import of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_DISPLAY="Admin Views Edit Php Import Display" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_DISPLAY_DESC="Allows the users in this group to update the edit php import display of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_EXT="Admin Views Edit Php Import Ext" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_EXT_DESC="Allows the users in this group to update the edit php import ext of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SAVE="Admin Views Edit Php Import Save" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SAVE_DESC="Allows the users in this group to update the edit php import save of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SETDATA="Admin Views Edit Php Import Setdata" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SETDATA_DESC="Allows the users in this group to update the edit php import setdata of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL="Admin Views Edit Php Model" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL_DESC="Allows the users in this group to update the edit php model of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL_LIST="Admin Views Edit Php Model List" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL_LIST_DESC="Allows the users in this group to update the edit php model list of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_POSTSAVEHOOK="Admin Views Edit Php Postsavehook" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_POSTSAVEHOOK_DESC="Allows the users in this group to update the edit php postsavehook of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_SAVE="Admin Views Edit Php Save" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_SAVE_DESC="Allows the users in this group to update the edit php save of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SHORT_DESCRIPTION="Admin Views Edit Short Description" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to update the edit short description of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SOURCE="Admin Views Edit Source" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SOURCE_DESC="Allows the users in this group to update the edit source of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SQL="Admin Views Edit Sql" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SQL_DESC="Allows the users in this group to update the edit sql of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE="Admin Views Edit State" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SYSTEM_NAME="Admin Views Edit System Name" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SYSTEM_NAME_DESC="Allows the users in this group to update the edit system name of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_TYPE="Admin Views Edit Type" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_TYPE_DESC="Allows the users in this group to update the edit type of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export" @@ -212,28 +48,22 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD="Add" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS="Addconditions" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS_DESCRIPTION="Conditional setup for the above fields." COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS_LABEL="Conditions" -COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS_SELECT="Add" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDFIELDS="Addfields" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDFIELDS_DESCRIPTION="Setup fields for this view." COM_COMPONENTBUILDER_ADMIN_VIEW_ADDFIELDS_LABEL="Fields" -COM_COMPONENTBUILDER_ADMIN_VIEW_ADDFIELDS_SELECT="Add" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS="Addlinked Views" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_DESCRIPTION="Setup the linked views for this view." COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_LABEL="Linked Views" -COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_SELECT="Add" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_LABEL="Add New Button" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS="Addpermissions" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_DESCRIPTION="Set permissions for this view" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_LABEL="Permissions" -COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_SELECT="Add" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDRESS="Address" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES="Addtables" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL="Tables" -COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_SELECT="Add" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS="Addtabs" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_DESCRIPTION="Setup tabs for this view." COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_LABEL="Tabs" -COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_SELECT="Add" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW="Add Css View" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEWS="Add Css Views" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEWS_LABEL="Add CSS (views)" @@ -293,7 +123,6 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION="Select an admin view" COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL="View" COM_COMPONENTBUILDER_ADMIN_VIEW_AJAX_INPUT="Ajax Input" COM_COMPONENTBUILDER_ADMIN_VIEW_AJAX_INPUT_LABEL="Ajax Input" -COM_COMPONENTBUILDER_ADMIN_VIEW_AJAX_INPUT_SELECT="Add" COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_DESCRIPTION="Select if the field is the alias field." COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_LABEL="Alias" COM_COMPONENTBUILDER_ADMIN_VIEW_ALIGNMENT_DESCRIPTION="Select the field alignment inside a tab/view." @@ -386,7 +215,6 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CUBE="Cube" COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON="Custom Button" COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTONS="Custom Buttons" COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_LABEL="Custom Buttons" -COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_SELECT="Add" COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_IMPORT="Custom Import" COM_COMPONENTBUILDER_ADMIN_VIEW_DASHBOARD="Dashboard" COM_COMPONENTBUILDER_ADMIN_VIEW_DATABASE="Database" @@ -520,7 +348,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components" COM_COMPONENTBUILDER_ADMIN_VIEW_LINK_DESCRIPTION="Select if the field is to be used as a link to a single record, if shown." COM_COMPONENTBUILDER_ADMIN_VIEW_LINK_LABEL="Link" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST="List" -COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_DESCRIPTION="Select if the field it to show in the list view." +COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_DESCRIPTION="Select if this field should show in the list view." COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_LABEL="Admin List" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_TWO="List 2" COM_COMPONENTBUILDER_ADMIN_VIEW_LOCATION="Location" @@ -764,7 +592,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_NEUTRAL_TWO="Smiley Neutral 2" COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_SAD="Smiley Sad" COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_SAD_TWO="Smiley Sad 2" COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_TWO="Smiley 2" -COM_COMPONENTBUILDER_ADMIN_VIEW_SORT_DESCRIPTION="Select if the field it to be sortable in list view, if shown." +COM_COMPONENTBUILDER_ADMIN_VIEW_SORT_DESCRIPTION="Select if the field should be sortable in list view, if shown." COM_COMPONENTBUILDER_ADMIN_VIEW_SORT_LABEL="Sortable" COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCE="Source" COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_DESCRIPTION="Map the Source to this view's fields.
// First Table Map.
SourceField => viewField
// Other Tables Map.
firstTableKeySourceField == keySourceField
SourceField => viewField" @@ -1328,7 +1156,6 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUBE="Cube" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON="Custom Button" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTONS="Custom Buttons" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON_LABEL="Custom Buttons" -COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON_SELECT="Add" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET="Custom Get" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION="Select the custom get methods" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL="Custom Gets" @@ -2715,166 +2542,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD="Joomla Components Dashboar COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST="Joomla Components Dashboard List" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDADMIN_VIEWS="Joomla Components Edit Addadmin Views" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDADMIN_VIEWS_DESC="Allows the users in this group to update the edit addadmin views of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONFIG="Joomla Components Edit Addconfig" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONFIG_DESC="Allows the users in this group to update the edit addconfig of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONTRIBUTORS="Joomla Components Edit Addcontributors" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONTRIBUTORS_DESC="Allows the users in this group to update the edit addcontributors of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOMMENUS="Joomla Components Edit Addcustommenus" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOMMENUS_DESC="Allows the users in this group to update the edit addcustommenus of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOM_ADMIN_VIEWS="Joomla Components Edit Addcustom Admin Views" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOM_ADMIN_VIEWS_DESC="Allows the users in this group to update the edit addcustom admin views of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFILES="Joomla Components Edit Addfiles" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFILES_DESC="Allows the users in this group to update the edit addfiles of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOLDERS="Joomla Components Edit Addfolders" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOLDERS_DESC="Allows the users in this group to update the edit addfolders of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOOTABLE="Joomla Components Edit Addfootable" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOOTABLE_DESC="Allows the users in this group to update the edit addfootable of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDREADME="Joomla Components Edit Addreadme" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDREADME_DESC="Allows the users in this group to update the edit addreadme of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDSITE_VIEWS="Joomla Components Edit Addsite Views" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDSITE_VIEWS_DESC="Allows the users in this group to update the edit addsite views of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDUIKIT="Joomla Components Edit Adduikit" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDUIKIT_DESC="Allows the users in this group to update the edit adduikit of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT="Joomla Components Edit Add Admin Event" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT_DESC="Allows the users in this group to update the edit add admin event of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS="Joomla Components Edit Add Css" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS_DESC="Allows the users in this group to update the edit add css of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER="Joomla Components Edit Add Email Helper" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER_DESC="Allows the users in this group to update the edit add email helper of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT="Joomla Components Edit Add Javascript" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT_DESC="Allows the users in this group to update the edit add javascript of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE="Joomla Components Edit Add License" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE_DESC="Allows the users in this group to update the edit add license of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS="Joomla Components Edit Add Php Dashboard Methods" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS_DESC="Allows the users in this group to update the edit add php dashboard methods of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN="Joomla Components Edit Add Php Helper Admin" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN_DESC="Allows the users in this group to update the edit add php helper admin of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_BOTH="Joomla Components Edit Add Php Helper Both" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_BOTH_DESC="Allows the users in this group to update the edit add php helper both of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_SITE="Joomla Components Edit Add Php Helper Site" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_SITE_DESC="Allows the users in this group to update the edit add php helper site of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_METHOD_UNINSTALL="Joomla Components Edit Add Php Method Uninstall" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_METHOD_UNINSTALL_DESC="Allows the users in this group to update the edit add php method uninstall of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_INSTALL="Joomla Components Edit Add Php Postflight Install" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit add php postflight install of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_UPDATE="Joomla Components Edit Add Php Postflight Update" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit add php postflight update of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_INSTALL="Joomla Components Edit Add Php Preflight Install" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit add php preflight install of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_UPDATE="Joomla Components Edit Add Php Preflight Update" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit add php preflight update of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SALES_SERVER="Joomla Components Edit Add Sales Server" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SALES_SERVER_DESC="Allows the users in this group to update the edit add sales server of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SITE_EVENT="Joomla Components Edit Add Site Event" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SITE_EVENT_DESC="Allows the users in this group to update the edit add site event of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SQL="Joomla Components Edit Add Sql" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SQL_DESC="Allows the users in this group to update the edit add sql of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_UPDATE_SERVER="Joomla Components Edit Add Update Server" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_UPDATE_SERVER_DESC="Allows the users in this group to update the edit add update server of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_AUTHOR="Joomla Components Edit Author" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_AUTHOR_DESC="Allows the users in this group to update the edit author of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BOM="Joomla Components Edit Bom" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BOM_DESC="Allows the users in this group to update the edit bom of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMP="Joomla Components Edit Buildcomp" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMPSQL="Joomla Components Edit Buildcompsql" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMPSQL_DESC="Allows the users in this group to update the edit buildcompsql of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMP_DESC="Allows the users in this group to update the edit buildcomp of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPANYNAME="Joomla Components Edit Companyname" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPANYNAME_DESC="Allows the users in this group to update the edit companyname of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPONENT_VERSION="Joomla Components Edit Component Version" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPONENT_VERSION_DESC="Allows the users in this group to update the edit component version of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COPYRIGHT="Joomla Components Edit Copyright" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COPYRIGHT_DESC="Allows the users in this group to update the edit copyright of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATUSERHELPER="Joomla Components Edit Creatuserhelper" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATUSERHELPER_DESC="Allows the users in this group to update the edit creatuserhelper of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CSS="Joomla Components Edit Css" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CSS_DESC="Allows the users in this group to update the edit css of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DASHBOARD_TAB="Joomla Components Edit Dashboard Tab" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DASHBOARD_TAB_DESC="Allows the users in this group to update the edit dashboard tab of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DEBUG_LINENR="Joomla Components Edit Debug Linenr" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DEBUG_LINENR_DESC="Allows the users in this group to update the edit debug linenr of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DESCRIPTION="Joomla Components Edit Description" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMAIL="Joomla Components Edit Email" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMAIL_DESC="Allows the users in this group to update the edit email of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMPTYCONTRIBUTORS="Joomla Components Edit Emptycontributors" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMPTYCONTRIBUTORS_DESC="Allows the users in this group to update the edit emptycontributors of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_BUY_LINK="Joomla Components Edit Export Buy Link" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_BUY_LINK_DESC="Allows the users in this group to update the edit export buy link of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_KEY="Joomla Components Edit Export Key" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_KEY_DESC="Allows the users in this group to update the edit export key of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK="Joomla Components Edit Export Package Link" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK_DESC="Allows the users in this group to update the edit export package link of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE="Joomla Components Edit Image" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE_DESC="Allows the users in this group to update the edit image of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT="Joomla Components Edit Javascript" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT_DESC="Allows the users in this group to update the edit javascript of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE="Joomla Components Edit License" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_DESC="Allows the users in this group to update the edit license of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE="Joomla Components Edit License Type" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE_DESC="Allows the users in this group to update the edit license type of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_MVC_VERSIONDATE="Joomla Components Edit Mvc Versiondate" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_MVC_VERSIONDATE_DESC="Allows the users in this group to update the edit mvc versiondate of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME="Joomla Components Edit Name" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME_CODE="Joomla Components Edit Name Code" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME_CODE_DESC="Allows the users in this group to update the edit name code of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NUMBER="Joomla Components Edit Number" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NUMBER_DESC="Allows the users in this group to update the edit number of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_ADMIN_EVENT="Joomla Components Edit Php Admin Event" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_ADMIN_EVENT_DESC="Allows the users in this group to update the edit php admin event of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_DASHBOARD_METHODS="Joomla Components Edit Php Dashboard Methods" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_DASHBOARD_METHODS_DESC="Allows the users in this group to update the edit php dashboard methods of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_ADMIN="Joomla Components Edit Php Helper Admin" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_ADMIN_DESC="Allows the users in this group to update the edit php helper admin of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_BOTH="Joomla Components Edit Php Helper Both" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_BOTH_DESC="Allows the users in this group to update the edit php helper both of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_SITE="Joomla Components Edit Php Helper Site" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_SITE_DESC="Allows the users in this group to update the edit php helper site of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_METHOD_UNINSTALL="Joomla Components Edit Php Method Uninstall" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_METHOD_UNINSTALL_DESC="Allows the users in this group to update the edit php method uninstall of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_INSTALL="Joomla Components Edit Php Postflight Install" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit php postflight install of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_UPDATE="Joomla Components Edit Php Postflight Update" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit php postflight update of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_INSTALL="Joomla Components Edit Php Preflight Install" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit php preflight install of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_UPDATE="Joomla Components Edit Php Preflight Update" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit php preflight update of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_SITE_EVENT="Joomla Components Edit Php Site Event" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_SITE_EVENT_DESC="Allows the users in this group to update the edit php site event of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_README="Joomla Components Edit Readme" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_README_DESC="Allows the users in this group to update the edit readme of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SALES_SERVER_FTP="Joomla Components Edit Sales Server Ftp" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SALES_SERVER_FTP_DESC="Allows the users in this group to update the edit sales server ftp of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SHORT_DESCRIPTION="Joomla Components Edit Short Description" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to update the edit short description of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL="Joomla Components Edit Sql" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_DESC="Allows the users in this group to update the edit sql of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_TWEAK="Joomla Components Edit Sql Tweak" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_TWEAK_DESC="Allows the users in this group to update the edit sql tweak of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SYSTEM_NAME="Joomla Components Edit System Name" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SYSTEM_NAME_DESC="Allows the users in this group to update the edit system name of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_TOIGNORE="Joomla Components Edit Toignore" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_TOIGNORE_DESC="Allows the users in this group to update the edit toignore of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER="Joomla Components Edit Update Server" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_DESC="Allows the users in this group to update the edit update server of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_FTP="Joomla Components Edit Update Server Ftp" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_FTP_DESC="Allows the users in this group to update the edit update server ftp of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_TARGET="Joomla Components Edit Update Server Target" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_TARGET_DESC="Allows the users in this group to update the edit update server target of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION="Joomla Components Edit Version" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version joomla components" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_UPDATE="Joomla Components Edit Version Update" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_UPDATE_DESC="Allows the users in this group to update the edit version update of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WEBSITE="Joomla Components Edit Website" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WEBSITE_DESC="Allows the users in this group to update the edit website of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_KEY="Joomla Components Edit Whmcs Key" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_KEY_DESC="Allows the users in this group to update the edit whmcs key of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_URL="Joomla Components Edit Whmcs Url" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_URL_DESC="Allows the users in this group to update the edit whmcs url of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT="Joomla Components Export" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT_DESC="Allows the users in this group to export export joomla components" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_IMPORT="Joomla Components Import" @@ -3971,7 +3640,6 @@ COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_VIEW="Add Php View" COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_VIEW_LABEL="Add PHP (custom view script)" COM_COMPONENTBUILDER_SITE_VIEW_AJAX_INPUT="Ajax Input" COM_COMPONENTBUILDER_SITE_VIEW_AJAX_INPUT_LABEL="Ajax Input" -COM_COMPONENTBUILDER_SITE_VIEW_AJAX_INPUT_SELECT="Add" COM_COMPONENTBUILDER_SITE_VIEW_ALNUM="ALNUM" COM_COMPONENTBUILDER_SITE_VIEW_ARCHIVE="Archive" COM_COMPONENTBUILDER_SITE_VIEW_ARRAY="ARRAY" @@ -4060,7 +3728,6 @@ COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM="Custom" COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTON="Custom Button" COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTONS="Custom Buttons" COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTON_LABEL="Custom Buttons" -COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTON_SELECT="Add" COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET="Custom Get" COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_DESCRIPTION="Select the custom get methods" COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_LABEL="Custom Gets" diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini index 3c5d69bbd..c9d93c783 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini @@ -3,174 +3,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access" COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE="Admin Views Batch Use" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admin views" -COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE="Admin Views Create" -COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD="Admin Views Dashboard Add" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST="Admin Views Dashboard List" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete" -COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDCONDITIONS="Admin Views Edit Addconditions" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDCONDITIONS_DESC="Allows the users in this group to update the edit addconditions of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDFIELDS="Admin Views Edit Addfields" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDFIELDS_DESC="Allows the users in this group to update the edit addfields of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDLINKED_VIEWS="Admin Views Edit Addlinked Views" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDLINKED_VIEWS_DESC="Allows the users in this group to update the edit addlinked views of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDPERMISSIONS="Admin Views Edit Addpermissions" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDPERMISSIONS_DESC="Allows the users in this group to update the edit addpermissions of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABLES="Admin Views Edit Addtables" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABLES_DESC="Allows the users in this group to update the edit addtables of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABS="Admin Views Edit Addtabs" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABS_DESC="Allows the users in this group to update the edit addtabs of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEW="Admin Views Edit Add Css View" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEWS="Admin Views Edit Add Css Views" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEWS_DESC="Allows the users in this group to update the edit add css views of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEW_DESC="Allows the users in this group to update the edit add css view of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_BUTTON="Admin Views Edit Add Custom Button" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_BUTTON_DESC="Allows the users in this group to update the edit add custom button of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_IMPORT="Admin Views Edit Add Custom Import" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_IMPORT_DESC="Allows the users in this group to update the edit add custom import of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_FADEIN="Admin Views Edit Add Fadein" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_FADEIN_DESC="Allows the users in this group to update the edit add fadein of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FILE="Admin Views Edit Add Javascript Views File" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FILE_DESC="Allows the users in this group to update the edit add javascript views file of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FOOTER="Admin Views Edit Add Javascript Views Footer" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FOOTER_DESC="Allows the users in this group to update the edit add javascript views footer of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FILE="Admin Views Edit Add Javascript View File" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FILE_DESC="Allows the users in this group to update the edit add javascript view file of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FOOTER="Admin Views Edit Add Javascript View Footer" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FOOTER_DESC="Allows the users in this group to update the edit add javascript view footer of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_DELETE="Admin Views Edit Add Php After Delete" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_DELETE_DESC="Allows the users in this group to update the edit add php after delete of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_PUBLISH="Admin Views Edit Add Php After Publish" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_PUBLISH_DESC="Allows the users in this group to update the edit add php after publish of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AJAX="Admin Views Edit Add Php Ajax" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AJAX_DESC="Allows the users in this group to update the edit add php ajax of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_ALLOWEDIT="Admin Views Edit Add Php Allowedit" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_ALLOWEDIT_DESC="Allows the users in this group to update the edit add php allowedit of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHCOPY="Admin Views Edit Add Php Batchcopy" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHCOPY_DESC="Allows the users in this group to update the edit add php batchcopy of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHMOVE="Admin Views Edit Add Php Batchmove" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHMOVE_DESC="Allows the users in this group to update the edit add php batchmove of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_DELETE="Admin Views Edit Add Php Before Delete" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_DELETE_DESC="Allows the users in this group to update the edit add php before delete of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_PUBLISH="Admin Views Edit Add Php Before Publish" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_PUBLISH_DESC="Allows the users in this group to update the edit add php before publish of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_SAVE="Admin Views Edit Add Php Before Save" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_SAVE_DESC="Allows the users in this group to update the edit add php before save of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_DOCUMENT="Admin Views Edit Add Php Document" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_DOCUMENT_DESC="Allows the users in this group to update the edit add php document of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEM="Admin Views Edit Add Php Getitem" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS="Admin Views Edit Add Php Getitems" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS_AFTER_ALL="Admin Views Edit Add Php Getitems After All" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS_AFTER_ALL_DESC="Allows the users in this group to update the edit add php getitems after all of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS_DESC="Allows the users in this group to update the edit add php getitems of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEM_DESC="Allows the users in this group to update the edit add php getitem of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETLISTQUERY="Admin Views Edit Add Php Getlistquery" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETLISTQUERY_DESC="Allows the users in this group to update the edit add php getlistquery of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_POSTSAVEHOOK="Admin Views Edit Add Php Postsavehook" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_POSTSAVEHOOK_DESC="Allows the users in this group to update the edit add php postsavehook of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_SAVE="Admin Views Edit Add Php Save" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_SAVE_DESC="Allows the users in this group to update the edit add php save of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_SQL="Admin Views Edit Add Sql" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_SQL_DESC="Allows the users in this group to update the edit add sql of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_AJAX_INPUT="Admin Views Edit Ajax Input" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_AJAX_INPUT_DESC="Allows the users in this group to update the edit ajax input of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEW="Admin Views Edit Css View" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEWS="Admin Views Edit Css Views" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEWS_DESC="Allows the users in this group to update the edit css views of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEW_DESC="Allows the users in this group to update the edit css view of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CUSTOM_BUTTON="Admin Views Edit Custom Button" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CUSTOM_BUTTON_DESC="Allows the users in this group to update the edit custom button of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC="Allows the users in this group to edit the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESCRIPTION="Admin Views Edit Description" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_HTML_IMPORT_VIEW="Admin Views Edit Html Import View" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_HTML_IMPORT_VIEW_DESC="Allows the users in this group to update the edit html import view of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON="Admin Views Edit Icon" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_ADD="Admin Views Edit Icon Add" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_ADD_DESC="Allows the users in this group to update the edit icon add of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_CATEGORY="Admin Views Edit Icon Category" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_CATEGORY_DESC="Allows the users in this group to update the edit icon category of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_DESC="Allows the users in this group to update the edit icon of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FILE="Admin Views Edit Javascript Views File" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FILE_DESC="Allows the users in this group to update the edit javascript views file of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FOOTER="Admin Views Edit Javascript Views Footer" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FOOTER_DESC="Allows the users in this group to update the edit javascript views footer of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FILE="Admin Views Edit Javascript View File" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FILE_DESC="Allows the users in this group to update the edit javascript view file of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FOOTER="Admin Views Edit Javascript View Footer" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FOOTER_DESC="Allows the users in this group to update the edit javascript view footer of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_LIST="Admin Views Edit Name List" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_LIST_DESC="Allows the users in this group to update the edit name list of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_SINGLE="Admin Views Edit Name Single" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_SINGLE_DESC="Allows the users in this group to update the edit name single of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN="Admin Views Edit Own" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admin views created by them" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_DELETE="Admin Views Edit Php After Delete" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_DELETE_DESC="Allows the users in this group to update the edit php after delete of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_PUBLISH="Admin Views Edit Php After Publish" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_PUBLISH_DESC="Allows the users in this group to update the edit php after publish of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AJAXMETHOD="Admin Views Edit Php Ajaxmethod" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AJAXMETHOD_DESC="Allows the users in this group to update the edit php ajaxmethod of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_ALLOWEDIT="Admin Views Edit Php Allowedit" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_ALLOWEDIT_DESC="Allows the users in this group to update the edit php allowedit of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHCOPY="Admin Views Edit Php Batchcopy" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHCOPY_DESC="Allows the users in this group to update the edit php batchcopy of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHMOVE="Admin Views Edit Php Batchmove" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHMOVE_DESC="Allows the users in this group to update the edit php batchmove of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_DELETE="Admin Views Edit Php Before Delete" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_DELETE_DESC="Allows the users in this group to update the edit php before delete of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_PUBLISH="Admin Views Edit Php Before Publish" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_PUBLISH_DESC="Allows the users in this group to update the edit php before publish of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_SAVE="Admin Views Edit Php Before Save" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_SAVE_DESC="Allows the users in this group to update the edit php before save of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER="Admin Views Edit Php Controller" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER_DESC="Allows the users in this group to update the edit php controller of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER_LIST="Admin Views Edit Php Controller List" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER_LIST_DESC="Allows the users in this group to update the edit php controller list of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_DOCUMENT="Admin Views Edit Php Document" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_DOCUMENT_DESC="Allows the users in this group to update the edit php document of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEM="Admin Views Edit Php Getitem" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS="Admin Views Edit Php Getitems" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS_AFTER_ALL="Admin Views Edit Php Getitems After All" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS_AFTER_ALL_DESC="Allows the users in this group to update the edit php getitems after all of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS_DESC="Allows the users in this group to update the edit php getitems of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEM_DESC="Allows the users in this group to update the edit php getitem of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETLISTQUERY="Admin Views Edit Php Getlistquery" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETLISTQUERY_DESC="Allows the users in this group to update the edit php getlistquery of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT="Admin Views Edit Php Import" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_DESC="Allows the users in this group to update the edit php import of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_DISPLAY="Admin Views Edit Php Import Display" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_DISPLAY_DESC="Allows the users in this group to update the edit php import display of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_EXT="Admin Views Edit Php Import Ext" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_EXT_DESC="Allows the users in this group to update the edit php import ext of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SAVE="Admin Views Edit Php Import Save" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SAVE_DESC="Allows the users in this group to update the edit php import save of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SETDATA="Admin Views Edit Php Import Setdata" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SETDATA_DESC="Allows the users in this group to update the edit php import setdata of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL="Admin Views Edit Php Model" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL_DESC="Allows the users in this group to update the edit php model of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL_LIST="Admin Views Edit Php Model List" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL_LIST_DESC="Allows the users in this group to update the edit php model list of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_POSTSAVEHOOK="Admin Views Edit Php Postsavehook" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_POSTSAVEHOOK_DESC="Allows the users in this group to update the edit php postsavehook of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_SAVE="Admin Views Edit Php Save" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_SAVE_DESC="Allows the users in this group to update the edit php save of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SHORT_DESCRIPTION="Admin Views Edit Short Description" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to update the edit short description of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SOURCE="Admin Views Edit Source" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SOURCE_DESC="Allows the users in this group to update the edit source of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SQL="Admin Views Edit Sql" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SQL_DESC="Allows the users in this group to update the edit sql of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE="Admin Views Edit State" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SYSTEM_NAME="Admin Views Edit System Name" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SYSTEM_NAME_DESC="Allows the users in this group to update the edit system name of the admin view" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_TYPE="Admin Views Edit Type" -COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_TYPE_DESC="Allows the users in this group to update the edit type of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export" @@ -404,166 +240,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD="Joomla Components Dashboar COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST="Joomla Components Dashboard List" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDADMIN_VIEWS="Joomla Components Edit Addadmin Views" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDADMIN_VIEWS_DESC="Allows the users in this group to update the edit addadmin views of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONFIG="Joomla Components Edit Addconfig" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONFIG_DESC="Allows the users in this group to update the edit addconfig of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONTRIBUTORS="Joomla Components Edit Addcontributors" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONTRIBUTORS_DESC="Allows the users in this group to update the edit addcontributors of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOMMENUS="Joomla Components Edit Addcustommenus" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOMMENUS_DESC="Allows the users in this group to update the edit addcustommenus of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOM_ADMIN_VIEWS="Joomla Components Edit Addcustom Admin Views" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOM_ADMIN_VIEWS_DESC="Allows the users in this group to update the edit addcustom admin views of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFILES="Joomla Components Edit Addfiles" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFILES_DESC="Allows the users in this group to update the edit addfiles of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOLDERS="Joomla Components Edit Addfolders" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOLDERS_DESC="Allows the users in this group to update the edit addfolders of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOOTABLE="Joomla Components Edit Addfootable" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOOTABLE_DESC="Allows the users in this group to update the edit addfootable of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDREADME="Joomla Components Edit Addreadme" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDREADME_DESC="Allows the users in this group to update the edit addreadme of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDSITE_VIEWS="Joomla Components Edit Addsite Views" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDSITE_VIEWS_DESC="Allows the users in this group to update the edit addsite views of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDUIKIT="Joomla Components Edit Adduikit" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDUIKIT_DESC="Allows the users in this group to update the edit adduikit of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT="Joomla Components Edit Add Admin Event" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT_DESC="Allows the users in this group to update the edit add admin event of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS="Joomla Components Edit Add Css" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS_DESC="Allows the users in this group to update the edit add css of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER="Joomla Components Edit Add Email Helper" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER_DESC="Allows the users in this group to update the edit add email helper of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT="Joomla Components Edit Add Javascript" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT_DESC="Allows the users in this group to update the edit add javascript of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE="Joomla Components Edit Add License" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE_DESC="Allows the users in this group to update the edit add license of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS="Joomla Components Edit Add Php Dashboard Methods" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS_DESC="Allows the users in this group to update the edit add php dashboard methods of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN="Joomla Components Edit Add Php Helper Admin" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN_DESC="Allows the users in this group to update the edit add php helper admin of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_BOTH="Joomla Components Edit Add Php Helper Both" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_BOTH_DESC="Allows the users in this group to update the edit add php helper both of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_SITE="Joomla Components Edit Add Php Helper Site" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_SITE_DESC="Allows the users in this group to update the edit add php helper site of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_METHOD_UNINSTALL="Joomla Components Edit Add Php Method Uninstall" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_METHOD_UNINSTALL_DESC="Allows the users in this group to update the edit add php method uninstall of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_INSTALL="Joomla Components Edit Add Php Postflight Install" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit add php postflight install of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_UPDATE="Joomla Components Edit Add Php Postflight Update" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit add php postflight update of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_INSTALL="Joomla Components Edit Add Php Preflight Install" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit add php preflight install of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_UPDATE="Joomla Components Edit Add Php Preflight Update" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit add php preflight update of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SALES_SERVER="Joomla Components Edit Add Sales Server" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SALES_SERVER_DESC="Allows the users in this group to update the edit add sales server of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SITE_EVENT="Joomla Components Edit Add Site Event" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SITE_EVENT_DESC="Allows the users in this group to update the edit add site event of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SQL="Joomla Components Edit Add Sql" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SQL_DESC="Allows the users in this group to update the edit add sql of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_UPDATE_SERVER="Joomla Components Edit Add Update Server" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_UPDATE_SERVER_DESC="Allows the users in this group to update the edit add update server of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_AUTHOR="Joomla Components Edit Author" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_AUTHOR_DESC="Allows the users in this group to update the edit author of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BOM="Joomla Components Edit Bom" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BOM_DESC="Allows the users in this group to update the edit bom of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMP="Joomla Components Edit Buildcomp" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMPSQL="Joomla Components Edit Buildcompsql" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMPSQL_DESC="Allows the users in this group to update the edit buildcompsql of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMP_DESC="Allows the users in this group to update the edit buildcomp of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPANYNAME="Joomla Components Edit Companyname" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPANYNAME_DESC="Allows the users in this group to update the edit companyname of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPONENT_VERSION="Joomla Components Edit Component Version" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPONENT_VERSION_DESC="Allows the users in this group to update the edit component version of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COPYRIGHT="Joomla Components Edit Copyright" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COPYRIGHT_DESC="Allows the users in this group to update the edit copyright of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATUSERHELPER="Joomla Components Edit Creatuserhelper" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATUSERHELPER_DESC="Allows the users in this group to update the edit creatuserhelper of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CSS="Joomla Components Edit Css" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CSS_DESC="Allows the users in this group to update the edit css of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DASHBOARD_TAB="Joomla Components Edit Dashboard Tab" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DASHBOARD_TAB_DESC="Allows the users in this group to update the edit dashboard tab of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DEBUG_LINENR="Joomla Components Edit Debug Linenr" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DEBUG_LINENR_DESC="Allows the users in this group to update the edit debug linenr of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DESCRIPTION="Joomla Components Edit Description" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMAIL="Joomla Components Edit Email" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMAIL_DESC="Allows the users in this group to update the edit email of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMPTYCONTRIBUTORS="Joomla Components Edit Emptycontributors" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMPTYCONTRIBUTORS_DESC="Allows the users in this group to update the edit emptycontributors of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_BUY_LINK="Joomla Components Edit Export Buy Link" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_BUY_LINK_DESC="Allows the users in this group to update the edit export buy link of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_KEY="Joomla Components Edit Export Key" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_KEY_DESC="Allows the users in this group to update the edit export key of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK="Joomla Components Edit Export Package Link" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK_DESC="Allows the users in this group to update the edit export package link of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE="Joomla Components Edit Image" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE_DESC="Allows the users in this group to update the edit image of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT="Joomla Components Edit Javascript" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT_DESC="Allows the users in this group to update the edit javascript of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE="Joomla Components Edit License" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_DESC="Allows the users in this group to update the edit license of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE="Joomla Components Edit License Type" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE_DESC="Allows the users in this group to update the edit license type of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_MVC_VERSIONDATE="Joomla Components Edit Mvc Versiondate" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_MVC_VERSIONDATE_DESC="Allows the users in this group to update the edit mvc versiondate of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME="Joomla Components Edit Name" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME_CODE="Joomla Components Edit Name Code" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME_CODE_DESC="Allows the users in this group to update the edit name code of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NUMBER="Joomla Components Edit Number" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NUMBER_DESC="Allows the users in this group to update the edit number of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_ADMIN_EVENT="Joomla Components Edit Php Admin Event" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_ADMIN_EVENT_DESC="Allows the users in this group to update the edit php admin event of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_DASHBOARD_METHODS="Joomla Components Edit Php Dashboard Methods" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_DASHBOARD_METHODS_DESC="Allows the users in this group to update the edit php dashboard methods of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_ADMIN="Joomla Components Edit Php Helper Admin" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_ADMIN_DESC="Allows the users in this group to update the edit php helper admin of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_BOTH="Joomla Components Edit Php Helper Both" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_BOTH_DESC="Allows the users in this group to update the edit php helper both of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_SITE="Joomla Components Edit Php Helper Site" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_SITE_DESC="Allows the users in this group to update the edit php helper site of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_METHOD_UNINSTALL="Joomla Components Edit Php Method Uninstall" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_METHOD_UNINSTALL_DESC="Allows the users in this group to update the edit php method uninstall of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_INSTALL="Joomla Components Edit Php Postflight Install" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit php postflight install of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_UPDATE="Joomla Components Edit Php Postflight Update" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit php postflight update of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_INSTALL="Joomla Components Edit Php Preflight Install" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit php preflight install of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_UPDATE="Joomla Components Edit Php Preflight Update" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit php preflight update of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_SITE_EVENT="Joomla Components Edit Php Site Event" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_SITE_EVENT_DESC="Allows the users in this group to update the edit php site event of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_README="Joomla Components Edit Readme" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_README_DESC="Allows the users in this group to update the edit readme of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SALES_SERVER_FTP="Joomla Components Edit Sales Server Ftp" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SALES_SERVER_FTP_DESC="Allows the users in this group to update the edit sales server ftp of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SHORT_DESCRIPTION="Joomla Components Edit Short Description" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to update the edit short description of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL="Joomla Components Edit Sql" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_DESC="Allows the users in this group to update the edit sql of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_TWEAK="Joomla Components Edit Sql Tweak" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_TWEAK_DESC="Allows the users in this group to update the edit sql tweak of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SYSTEM_NAME="Joomla Components Edit System Name" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SYSTEM_NAME_DESC="Allows the users in this group to update the edit system name of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_TOIGNORE="Joomla Components Edit Toignore" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_TOIGNORE_DESC="Allows the users in this group to update the edit toignore of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER="Joomla Components Edit Update Server" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_DESC="Allows the users in this group to update the edit update server of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_FTP="Joomla Components Edit Update Server Ftp" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_FTP_DESC="Allows the users in this group to update the edit update server ftp of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_TARGET="Joomla Components Edit Update Server Target" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_TARGET_DESC="Allows the users in this group to update the edit update server target of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION="Joomla Components Edit Version" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version joomla components" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_UPDATE="Joomla Components Edit Version Update" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_UPDATE_DESC="Allows the users in this group to update the edit version update of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WEBSITE="Joomla Components Edit Website" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WEBSITE_DESC="Allows the users in this group to update the edit website of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_KEY="Joomla Components Edit Whmcs Key" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_KEY_DESC="Allows the users in this group to update the edit whmcs key of the joomla component" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_URL="Joomla Components Edit Whmcs Url" -COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_URL_DESC="Allows the users in this group to update the edit whmcs url of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT="Joomla Components Export" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT_DESC="Allows the users in this group to export export joomla components" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_IMPORT="Joomla Components Import" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 5e40869ec..3e66a213e 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php index 497679e1e..6beef7b10 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index 030c3ccae..864ee61b8 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index 72d6e31e9..869154d06 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php index 5f08d8b92..315c8f2cd 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -27,132 +27,25 @@ defined('_JEXEC') or die('Restricted access'); -// set the defaults -$items = $displayData->vxzfields; -$user = JFactory::getUser(); -$id = $displayData->item->id; -$edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; -$ref = ($id) ? "&ref=admin_view&refid=".$id : ""; -$new = "index.php?option=com_componentbuilder&view=field&layout=edit".$ref; -$can = ComponentbuilderHelper::getActions('field'); +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'note_on_views', + 'addfields', + 'note_on_conditions', + 'addconditions' +); ?>
-get('field.create')): ?> -

- - - - - - - - - - - - - - - - - - $item): ?> - authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; - $userChkOut = JFactory::getUser($item->checked_out); - $canDo = ComponentbuilderHelper::getActions('field',$item,'fields'); - ?> - - - - - - - - - published == 1):?> - - published == 0):?> - - published == 2):?> - - published == -2):?> - - - - - - -
- - - - - - - - - - - - - - - - - -
- get('field.edit')): ?> - escape($item->name); ?> - checked_out): ?> - name, $item->checked_out_time, 'fields.', $canCheckin); ?> - - -
escape($item->name); ?>
- - 		- authorise('fieldtype.edit', 'com_componentbuilder.fieldtype.' . (int)$item->fieldtype)): ?> - escape($item->fieldtype_name); ?> - -
escape($item->fieldtype_name); ?>
- - 		- datatype); ?> - - indexes); ?> - - null_switch); ?> - - authorise('core.edit', 'com_componentbuilder.fields.category.' . (int)$item->catid)): ?> - escape($item->category_title); ?> - - escape($item->category_title); ?> - - - store); ?> - - - - - - - - - - - - - - - - - - id; ?> -
- -
- -
- + +
+
+ getLabel($field); ?> +
+
+ getInput($field); ?> +
+
+
diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 19a05def4..b1fdcecd3 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php index 3ca2bed3e..c2750f0d3 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vyalinked_components; +$items = $displayData->vxzlinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index 9d5038c29..597276414 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index cd0fd94f5..11d3e75d3 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index efee3617e..213e39020 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php index a77274f10..61f4bc533 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_above.php diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php index 0ee6ee432..c44cccebb 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php index 527a5549d..6b197abbe 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php @@ -34,10 +34,6 @@ $fields = $displayData->get('fields') ?: array( 'addpermissions', 'note_on_tabs', 'addtabs', - 'note_on_views', - 'addfields', - 'note_on_conditions', - 'addconditions', 'addlinked_views' ); diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index 45261b871..0ff35d1b3 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_under.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 60b1eeb6a..4290e2d32 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 3d898d998..d8d80d24e 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index 030c3ccae..864ee61b8 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index 950added5..c24827da7 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index b5e3e769a..cf5d9da9e 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index 37cb6f57b..424473003 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index 1bffb5ef9..6b747dfa0 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index e0f1c8b92..558cd9ed8 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index b017076ff..6d3dee0c3 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index b39d6a504..752bff74f 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index 6e4982fa5..1549e536f 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vyklinked_components; +$items = $displayData->vyjlinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index c6531c421..eb338613b 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index 1f975d3f3..2edfab238 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index 1d55d54b6..32a271892 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index 61d0db080..68f4ee2a3 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php index b39d6a504..752bff74f 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index f4608fe8e..eaaa21a1f 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index 89dcffdca..2a36cca6b 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index 3892d6e23..20b8488a1 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/joint_fullwidth.php b/admin/layouts/dynamic_get/joint_fullwidth.php index 76272ff92..b77201752 100644 --- a/admin/layouts/dynamic_get/joint_fullwidth.php +++ b/admin/layouts/dynamic_get/joint_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage joint_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_above.php b/admin/layouts/dynamic_get/main_above.php index 69296c816..6b03e7818 100644 --- a/admin/layouts/dynamic_get/main_above.php +++ b/admin/layouts/dynamic_get/main_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_above.php diff --git a/admin/layouts/dynamic_get/main_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php index 0c3ae6065..45e8f669b 100644 --- a/admin/layouts/dynamic_get/main_fullwidth.php +++ b/admin/layouts/dynamic_get/main_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_left.php b/admin/layouts/dynamic_get/main_left.php index 459821207..196da991b 100644 --- a/admin/layouts/dynamic_get/main_left.php +++ b/admin/layouts/dynamic_get/main_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_left.php diff --git a/admin/layouts/dynamic_get/main_right.php b/admin/layouts/dynamic_get/main_right.php index 30ef8b441..68c078370 100644 --- a/admin/layouts/dynamic_get/main_right.php +++ b/admin/layouts/dynamic_get/main_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_right.php diff --git a/admin/layouts/dynamic_get/main_under.php b/admin/layouts/dynamic_get/main_under.php index 48d1fa24d..224591950 100644 --- a/admin/layouts/dynamic_get/main_under.php +++ b/admin/layouts/dynamic_get/main_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index 3b93f8fc4..318390af1 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index 545727954..e8c391328 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index bbc95c9f1..531f66b6b 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index b39d6a504..752bff74f 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php index cba04af0d..8fad49a7d 100644 --- a/admin/layouts/field/linked_admin_views_fullwidth.php +++ b/admin/layouts/field/linked_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_admin_views_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->waclinked_admin_views; +$items = $displayData->wablinked_admin_views; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit"; diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index 5d0f26605..35661ade1 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index dec429da8..c459c580b 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_fullwidth.php b/admin/layouts/fieldtype/details_fullwidth.php index 40a6895d2..29a43f549 100644 --- a/admin/layouts/fieldtype/details_fullwidth.php +++ b/admin/layouts/fieldtype/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 915d06347..fa046b014 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index 150fdbf90..8bcf0197d 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 2c5bbbdcf..09868f512 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wadfields; +$items = $displayData->wacfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/ftp/details_above.php b/admin/layouts/ftp/details_above.php index ed41a9114..06d39f38d 100644 --- a/admin/layouts/ftp/details_above.php +++ b/admin/layouts/ftp/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/ftp/details_fullwidth.php b/admin/layouts/ftp/details_fullwidth.php index b57ecaa12..224ba4fdb 100644 --- a/admin/layouts/ftp/details_fullwidth.php +++ b/admin/layouts/ftp/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index dc29386f7..cff85088b 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->waelinked_components; +$items = $displayData->wadlinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/ftp/publishing.php b/admin/layouts/ftp/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/ftp/publishing.php +++ b/admin/layouts/ftp/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/ftp/publlshing.php b/admin/layouts/ftp/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/ftp/publlshing.php +++ b/admin/layouts/ftp/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index d11370c22..85058e0cb 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 4322467c2..4526b7d3f 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index af8402247..a23705fe0 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index fad9e09d2..ecb08d1c9 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index b39d6a504..752bff74f 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 57e4ad263..414f558f4 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php index d0e13dcb6..6c931c449 100644 --- a/admin/layouts/joomla_component/admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index e2eaf5b20..ae812db1f 100644 --- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index b5e3e769a..cf5d9da9e 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index c1cdee5fc..bb6bec6d1 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index 4af263aa9..d0a9163a5 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php index b39d6a504..752bff74f 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php index 2a84a11da..edfae3f11 100644 --- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index ee095540b..6aa316ece 100644 --- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php index 187d068a4..59c81b734 100644 --- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php +++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index 85546c38f..b583cf211 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php index 428da7b9f..3a527eeb0 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/publlshing.php b/admin/layouts/joomla_component/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/joomla_component/publlshing.php +++ b/admin/layouts/joomla_component/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index 7c98bd0ef..ffa7e2432 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php index 50998a4d0..cce9880fe 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php index 848344f10..d1017c034 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index 7abd9e2ae..33461e68f 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index 3e2f233e6..b5409ec3d 100644 --- a/admin/layouts/joomla_component/site_views_fullwidth.php +++ b/admin/layouts/joomla_component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php index e3cc90284..d88364bbe 100644 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ b/admin/layouts/joomla_component/translation_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage translation_fullwidth.php diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index 6e7540050..c7c1f0cce 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php index 382ba6ec0..2d2b05d7e 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/language_translation/details_above.php b/admin/layouts/language_translation/details_above.php index 655d19659..115f6aef7 100644 --- a/admin/layouts/language_translation/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php index 297aeb817..647bedfb1 100644 --- a/admin/layouts/language_translation/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/language_translation/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/language_translation/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index 28d4abef9..9037e7b79 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index cbdfe7274..112ffc15a 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index 3b25306df..fc2b93218 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index ea28fc350..e211859a8 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index aaee21bbb..0b1ec7323 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index b39d6a504..752bff74f 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index 3d898d998..983e181e6 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php @@ -30,6 +30,8 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( + 'note_custom_toolbar_placeholder', + 'custom_button', 'php_controller', 'php_model' ); diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php index 1c0dd2997..55086c164 100644 --- a/admin/layouts/site_view/custom_buttons_left.php +++ b/admin/layouts/site_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php @@ -30,7 +30,6 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'button_position', 'add_custom_button' ); diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php index ec75d90cd..83f244633 100644 --- a/admin/layouts/site_view/custom_buttons_right.php +++ b/admin/layouts/site_view/custom_buttons_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_right.php @@ -30,8 +30,7 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'note_custom_toolbar_placeholder', - 'custom_button' + 'button_position' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index b5e3e769a..cf5d9da9e 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index 37cb6f57b..424473003 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index 1bffb5ef9..6b747dfa0 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index ea28fc350..e211859a8 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index b017076ff..6d3dee0c3 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index b39d6a504..752bff74f 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index c18f7b503..5a9fdf03e 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index 7ace291f0..791b66d23 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vyvlinked_components; +$items = $displayData->vyulinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 7548721a3..12356d149 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index 9b9b1dacd..627d9bbf6 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index 5b0d2e42e..fa2029108 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index b3998a70c..44fa2ea43 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index 28d4abef9..9037e7b79 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index 462d02d3c..69a7693af 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index 3b25306df..fc2b93218 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index ea28fc350..e211859a8 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index aaee21bbb..0b1ec7323 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index b39d6a504..752bff74f 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index 8d79c177f..124f89ba1 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index 3dae5e08a..7b4a2be8e 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index ccf3a27fe..82277ad41 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 114 of this MVC - @build 28th August, 2017 + @version @update number 126 of this MVC + @build 11th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -95,16 +95,68 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->php_batchmove)) + if (!empty($item->addpermissions)) { - // base64 Decode php_batchmove. - $item->php_batchmove = base64_decode($item->php_batchmove); + // Convert the addpermissions field to an array. + $addpermissions = new Registry; + $addpermissions->loadString($item->addpermissions); + $item->addpermissions = $addpermissions->toArray(); } - if (!empty($item->php_save)) + if (!empty($item->addtabs)) { - // base64 Decode php_save. - $item->php_save = base64_decode($item->php_save); + // Convert the addtabs field to an array. + $addtabs = new Registry; + $addtabs->loadString($item->addtabs); + $item->addtabs = $addtabs->toArray(); + } + + if (!empty($item->addlinked_views)) + { + // Convert the addlinked_views field to an array. + $addlinked_views = new Registry; + $addlinked_views->loadString($item->addlinked_views); + $item->addlinked_views = $addlinked_views->toArray(); + } + + if (!empty($item->addfields)) + { + // Convert the addfields field to an array. + $addfields = new Registry; + $addfields->loadString($item->addfields); + $item->addfields = $addfields->toArray(); + } + + if (!empty($item->addconditions)) + { + // Convert the addconditions field to an array. + $addconditions = new Registry; + $addconditions->loadString($item->addconditions); + $item->addconditions = $addconditions->toArray(); + } + + if (!empty($item->custom_button)) + { + // Convert the custom_button field to an array. + $custom_button = new Registry; + $custom_button->loadString($item->custom_button); + $item->custom_button = $custom_button->toArray(); + } + + if (!empty($item->addtables)) + { + // Convert the addtables field to an array. + $addtables = new Registry; + $addtables->loadString($item->addtables); + $item->addtables = $addtables->toArray(); + } + + if (!empty($item->ajax_input)) + { + // Convert the ajax_input field to an array. + $ajax_input = new Registry; + $ajax_input->loadString($item->ajax_input); + $item->ajax_input = $ajax_input->toArray(); } if (!empty($item->php_after_delete)) @@ -113,6 +165,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_after_delete = base64_decode($item->php_after_delete); } + if (!empty($item->php_save)) + { + // base64 Decode php_save. + $item->php_save = base64_decode($item->php_save); + } + if (!empty($item->php_getlistquery)) { // base64 Decode php_getlistquery. @@ -161,6 +219,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_postsavehook = base64_decode($item->php_postsavehook); } + if (!empty($item->php_batchmove)) + { + // base64 Decode php_batchmove. + $item->php_batchmove = base64_decode($item->php_batchmove); + } + if (!empty($item->php_batchcopy)) { // base64 Decode php_batchcopy. @@ -299,8 +363,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.admin_view'); } } - $this->idvvvz = $item->addfields; - $this->addadmin_viewsvvwa = $item->id; + $this->addadmin_viewsvvvz = $item->id; return $item; } @@ -310,200 +373,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxzfields() - { - // Get the user object. - $user = JFactory::getUser(); - // Create a new query object. - $db = JFactory::getDBO(); - $query = $db->getQuery(true); - - // Select some fields - $query->select('a.*'); - $query->select($db->quoteName('c.title','category_title')); - - // From the componentbuilder_field table - $query->from($db->quoteName('#__componentbuilder_field', 'a')); - $query->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON (' . $db->quoteName('a.catid') . ' = ' . $db->quoteName('c.id') . ')'); - - // From the componentbuilder_fieldtype table. - $query->select($db->quoteName('g.name','fieldtype_name')); - $query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('g.id') . ')'); - - // Join over the asset groups. - $query->select('ag.title AS access_level'); - $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // Filter by access level. - if ($access = $this->getState('filter.access')) - { - $query->where('a.access = ' . (int) $access); - } - // Implement View Level Access - if (!$user->authorise('core.options', 'com_componentbuilder')) - { - $groups = implode(',', $user->getAuthorisedViewLevels()); - $query->where('a.access IN (' . $groups . ')'); - } - - // Order the results by ordering - $query->order('a.published ASC'); - $query->order('a.ordering ASC'); - - // Load the items - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - $items = $db->loadObjectList(); - - // set values to display correctly. - if (ComponentbuilderHelper::checkArray($items)) - { - // get user object. - $user = JFactory::getUser(); - foreach ($items as $nr => &$item) - { - $access = ($user->authorise('field.access', 'com_componentbuilder.field.' . (int) $item->id) && $user->authorise('field.access', 'com_componentbuilder')); - if (!$access) - { - unset($items[$nr]); - continue; - } - - } - } - - // set selection value to a translatable value - if (ComponentbuilderHelper::checkArray($items)) - { - foreach ($items as $nr => &$item) - { - // convert datatype - $item->datatype = $this->selectionTranslationVxzfields($item->datatype, 'datatype'); - // convert indexes - $item->indexes = $this->selectionTranslationVxzfields($item->indexes, 'indexes'); - // convert null_switch - $item->null_switch = $this->selectionTranslationVxzfields($item->null_switch, 'null_switch'); - // convert store - $item->store = $this->selectionTranslationVxzfields($item->store, 'store'); - } - } - - - // Filter by id Repetable Field - $idvvvz = json_decode($this->idvvvz,true); - if (ComponentbuilderHelper::checkArray($items) && isset($idvvvz) && ComponentbuilderHelper::checkArray($idvvvz)) - { - foreach ($items as $nr => &$item) - { - if ($item->id && isset($idvvvz['field']) && ComponentbuilderHelper::checkArray($idvvvz['field'])) - { - if (!in_array($item->id,$idvvvz['field'])) - { - unset($items[$nr]); - continue; - } - } - else - { - unset($items[$nr]); - continue; - } - } - } - else - { - return false; - } - return $items; - } - return false; - } - - /** - * Method to convert selection values to translatable string. - * - * @return translatable string - */ - public function selectionTranslationVxzfields($value,$name) - { - // Array of datatype language strings - if ($name === 'datatype') - { - $datatypeArray = array( - 'CHAR' => 'COM_COMPONENTBUILDER_FIELD_CHAR', - 'VARCHAR' => 'COM_COMPONENTBUILDER_FIELD_VARCHAR', - 'TEXT' => 'COM_COMPONENTBUILDER_FIELD_TEXT', - 'MEDIUMTEXT' => 'COM_COMPONENTBUILDER_FIELD_MEDIUMTEXT', - 'LONGTEXT' => 'COM_COMPONENTBUILDER_FIELD_LONGTEXT', - 'DATETIME' => 'COM_COMPONENTBUILDER_FIELD_DATETIME', - 'DATE' => 'COM_COMPONENTBUILDER_FIELD_DATE', - 'TIME' => 'COM_COMPONENTBUILDER_FIELD_TIME', - 'INT' => 'COM_COMPONENTBUILDER_FIELD_INT', - 'TINYINT' => 'COM_COMPONENTBUILDER_FIELD_TINYINT', - 'BIGINT' => 'COM_COMPONENTBUILDER_FIELD_BIGINT', - 'FLOAT' => 'COM_COMPONENTBUILDER_FIELD_FLOAT', - 'DECIMAL' => 'COM_COMPONENTBUILDER_FIELD_DECIMAL', - 'DOUBLE' => 'COM_COMPONENTBUILDER_FIELD_DOUBLE' - ); - // Now check if value is found in this array - if (isset($datatypeArray[$value]) && ComponentbuilderHelper::checkString($datatypeArray[$value])) - { - return $datatypeArray[$value]; - } - } - // Array of indexes language strings - if ($name === 'indexes') - { - $indexesArray = array( - 1 => 'COM_COMPONENTBUILDER_FIELD_UNIQUE_KEY', - 2 => 'COM_COMPONENTBUILDER_FIELD_KEY', - 0 => 'COM_COMPONENTBUILDER_FIELD_NONE' - ); - // Now check if value is found in this array - if (isset($indexesArray[$value]) && ComponentbuilderHelper::checkString($indexesArray[$value])) - { - return $indexesArray[$value]; - } - } - // Array of null_switch language strings - if ($name === 'null_switch') - { - $null_switchArray = array( - 'NULL' => 'COM_COMPONENTBUILDER_FIELD_NULL', - 'NOT NULL' => 'COM_COMPONENTBUILDER_FIELD_NOT_NULL' - ); - // Now check if value is found in this array - if (isset($null_switchArray[$value]) && ComponentbuilderHelper::checkString($null_switchArray[$value])) - { - return $null_switchArray[$value]; - } - } - // Array of store language strings - if ($name === 'store') - { - $storeArray = array( - 0 => 'COM_COMPONENTBUILDER_FIELD_DEFAULT', - 1 => 'COM_COMPONENTBUILDER_FIELD_JSON', - 2 => 'COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR', - 3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALKEY', - 4 => 'COM_COMPONENTBUILDER_FIELD_ADVANCE_ENCRYPTION_WHMCSKEY' - ); - // Now check if value is found in this array - if (isset($storeArray[$value]) && ComponentbuilderHelper::checkString($storeArray[$value])) - { - return $storeArray[$value]; - } - } - return $value; - } - - /** - * Method to get list data. - * - * @return mixed An array of data items on success, false on failure. - */ - public function getVyalinked_components() + public function getVxzlinked_components() { // Get the user object. $user = JFactory::getUser(); @@ -543,15 +413,15 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin { $items = $db->loadObjectList(); - // Filter by addadmin_viewsvvwa in this Repetable Field - if (ComponentbuilderHelper::checkArray($items) && isset($this->addadmin_viewsvvwa)) + // Filter by addadmin_viewsvvvz in this Repetable Field + if (ComponentbuilderHelper::checkArray($items) && isset($this->addadmin_viewsvvvz)) { foreach ($items as $nr => &$item) { if (isset($item->addadmin_views) && ComponentbuilderHelper::checkJson($item->addadmin_views)) { $tmpArray = json_decode($item->addadmin_views,true); - if (!isset($tmpArray['adminview']) || !ComponentbuilderHelper::checkArray($tmpArray['adminview']) || !in_array($this->addadmin_viewsvvwa, $tmpArray['adminview'])) + if (!isset($tmpArray['adminview']) || !ComponentbuilderHelper::checkArray($tmpArray['adminview']) || !in_array($this->addadmin_viewsvvvz, $tmpArray['adminview'])) { unset($items[$nr]); continue; @@ -644,1343 +514,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin // Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } - // Modify the form based on Edit System Name access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.system_name', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.system_name', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('system_name', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('system_name', 'readonly', 'true'); - if (!$form->getValue('system_name')) - { - // Disable fields while saving. - $form->setFieldAttribute('system_name', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('system_name', 'required', 'false'); - } - } - // Modify the form based on Edit Name Single access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.name_single', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.name_single', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('name_single', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('name_single', 'readonly', 'true'); - if (!$form->getValue('name_single')) - { - // Disable fields while saving. - $form->setFieldAttribute('name_single', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('name_single', 'required', 'false'); - } - } - // Modify the form based on Edit Name List access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.name_list', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.name_list', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('name_list', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('name_list', 'readonly', 'true'); - if (!$form->getValue('name_list')) - { - // Disable fields while saving. - $form->setFieldAttribute('name_list', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('name_list', 'required', 'false'); - } - } - // Modify the form based on Edit Short Description access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.short_description', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.short_description', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('short_description', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('short_description', 'readonly', 'true'); - if (!$form->getValue('short_description')) - { - // Disable fields while saving. - $form->setFieldAttribute('short_description', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('short_description', 'required', 'false'); - } - } - // Modify the form based on Edit Php Batchmove access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_batchmove', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_batchmove', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_batchmove', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_batchmove', 'readonly', 'true'); - if (!$form->getValue('php_batchmove')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_batchmove', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_batchmove', 'required', 'false'); - } - } - // Modify the form based on Edit Type access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.type', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.type', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('type', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('type', 'readonly', 'true'); - if (!$form->getValue('type')) - { - // Disable fields while saving. - $form->setFieldAttribute('type', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('type', 'required', 'false'); - } - } - // Modify the form based on Edit Php Save access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_save', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_save', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_save', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_save', 'readonly', 'true'); - if (!$form->getValue('php_save')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_save', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_save', 'required', 'false'); - } - } - // Modify the form based on Edit Description access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.description', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.description', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('description', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('description', 'readonly', 'true'); - if (!$form->getValue('description')) - { - // Disable fields while saving. - $form->setFieldAttribute('description', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('description', 'required', 'false'); - } - } - // Modify the form based on Edit Php After Delete access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_after_delete', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_after_delete', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_after_delete', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_after_delete', 'readonly', 'true'); - if (!$form->getValue('php_after_delete')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_after_delete', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_after_delete', 'required', 'false'); - } - } - // Modify the form based on Edit Add Fadein access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_fadein', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_fadein', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_fadein', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_fadein', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_fadein', 'class', ''); - $form->setFieldAttribute('add_fadein', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_fadein')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_fadein', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_fadein', 'required', 'false'); - } - } - // Modify the form based on Edit Icon access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.icon', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.icon', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('icon', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('icon', 'readonly', 'true'); - if (!$form->getValue('icon')) - { - // Disable fields while saving. - $form->setFieldAttribute('icon', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('icon', 'required', 'false'); - } - } - // Modify the form based on Edit Php Getlistquery access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_getlistquery', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_getlistquery', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_getlistquery', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_getlistquery', 'readonly', 'true'); - if (!$form->getValue('php_getlistquery')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_getlistquery', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_getlistquery', 'required', 'false'); - } - } - // Modify the form based on Edit Icon Add access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.icon_add', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.icon_add', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('icon_add', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('icon_add', 'readonly', 'true'); - if (!$form->getValue('icon_add')) - { - // Disable fields while saving. - $form->setFieldAttribute('icon_add', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('icon_add', 'required', 'false'); - } - } - // Modify the form based on Edit Php Allowedit access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_allowedit', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_allowedit', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_allowedit', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_allowedit', 'readonly', 'true'); - if (!$form->getValue('php_allowedit')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_allowedit', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_allowedit', 'required', 'false'); - } - } - // Modify the form based on Edit Icon Category access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.icon_category', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.icon_category', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('icon_category', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('icon_category', 'readonly', 'true'); - if (!$form->getValue('icon_category')) - { - // Disable fields while saving. - $form->setFieldAttribute('icon_category', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('icon_category', 'required', 'false'); - } - } - // Modify the form based on Edit Php After Publish access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_after_publish', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_after_publish', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_after_publish', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_after_publish', 'readonly', 'true'); - if (!$form->getValue('php_after_publish')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_after_publish', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_after_publish', 'required', 'false'); - } - } - // Modify the form based on Edit Source access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.source', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.source', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('source', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('source', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('source', 'class', ''); - $form->setFieldAttribute('source', 'class', $class.' disabled no-click'); - if (!$form->getValue('source')) - { - // Disable fields while saving. - $form->setFieldAttribute('source', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('source', 'required', 'false'); - } - } - // Modify the form based on Edit Php Getitems access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_getitems', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_getitems', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_getitems', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_getitems', 'readonly', 'true'); - if (!$form->getValue('php_getitems')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_getitems', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_getitems', 'required', 'false'); - } - } - // Modify the form based on Edit Php Import access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_import', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_import', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_import', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_import', 'readonly', 'true'); - if (!$form->getValue('php_import')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_import', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_import', 'required', 'false'); - } - } - // Modify the form based on Edit Addpermissions access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.addpermissions', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.addpermissions', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('addpermissions', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('addpermissions', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('addpermissions', 'class', ''); - $form->setFieldAttribute('addpermissions', 'class', $class.' disabled no-click'); - if (!$form->getValue('addpermissions')) - { - // Disable fields while saving. - $form->setFieldAttribute('addpermissions', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('addpermissions', 'required', 'false'); - } - } - // Modify the form based on Edit Php Getitems After All access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_getitems_after_all', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_getitems_after_all', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_getitems_after_all', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_getitems_after_all', 'readonly', 'true'); - if (!$form->getValue('php_getitems_after_all')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_getitems_after_all', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_getitems_after_all', 'required', 'false'); - } - } - // Modify the form based on Edit Addtabs access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.addtabs', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.addtabs', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('addtabs', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('addtabs', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('addtabs', 'class', ''); - $form->setFieldAttribute('addtabs', 'class', $class.' disabled no-click'); - if (!$form->getValue('addtabs')) - { - // Disable fields while saving. - $form->setFieldAttribute('addtabs', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('addtabs', 'required', 'false'); - } - } - // Modify the form based on Edit Php Before Save access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_before_save', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_before_save', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_before_save', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_before_save', 'readonly', 'true'); - if (!$form->getValue('php_before_save')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_before_save', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_before_save', 'required', 'false'); - } - } - // Modify the form based on Edit Php Postsavehook access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_postsavehook', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_postsavehook', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_postsavehook', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_postsavehook', 'readonly', 'true'); - if (!$form->getValue('php_postsavehook')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_postsavehook', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_postsavehook', 'required', 'false'); - } - } - // Modify the form based on Edit Addfields access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.addfields', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.addfields', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('addfields', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('addfields', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('addfields', 'class', ''); - $form->setFieldAttribute('addfields', 'class', $class.' disabled no-click'); - if (!$form->getValue('addfields')) - { - // Disable fields while saving. - $form->setFieldAttribute('addfields', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('addfields', 'required', 'false'); - } - } - // Modify the form based on Edit Php Batchcopy access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_batchcopy', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_batchcopy', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_batchcopy', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_batchcopy', 'readonly', 'true'); - if (!$form->getValue('php_batchcopy')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_batchcopy', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_batchcopy', 'required', 'false'); - } - } - // Modify the form based on Edit Php Before Publish access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_before_publish', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_before_publish', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_before_publish', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_before_publish', 'readonly', 'true'); - if (!$form->getValue('php_before_publish')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_before_publish', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_before_publish', 'required', 'false'); - } - } - // Modify the form based on Edit Addconditions access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.addconditions', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.addconditions', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('addconditions', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('addconditions', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('addconditions', 'class', ''); - $form->setFieldAttribute('addconditions', 'class', $class.' disabled no-click'); - if (!$form->getValue('addconditions')) - { - // Disable fields while saving. - $form->setFieldAttribute('addconditions', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('addconditions', 'required', 'false'); - } - } - // Modify the form based on Edit Php Before Delete access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_before_delete', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_before_delete', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_before_delete', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_before_delete', 'readonly', 'true'); - if (!$form->getValue('php_before_delete')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_before_delete', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_before_delete', 'required', 'false'); - } - } - // Modify the form based on Edit Addlinked Views access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.addlinked_views', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.addlinked_views', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('addlinked_views', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('addlinked_views', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('addlinked_views', 'class', ''); - $form->setFieldAttribute('addlinked_views', 'class', $class.' disabled no-click'); - if (!$form->getValue('addlinked_views')) - { - // Disable fields while saving. - $form->setFieldAttribute('addlinked_views', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('addlinked_views', 'required', 'false'); - } - } - // Modify the form based on Edit Php Document access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_document', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_document', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_document', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_document', 'readonly', 'true'); - if (!$form->getValue('php_document')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_document', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_document', 'required', 'false'); - } - } - // Modify the form based on Edit Sql access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.sql', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.sql', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('sql', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('sql', 'readonly', 'true'); - if (!$form->getValue('sql')) - { - // Disable fields while saving. - $form->setFieldAttribute('sql', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('sql', 'required', 'false'); - } - } - // Modify the form based on Edit Php Import Display access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_import_display', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_import_display', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_import_display', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_import_display', 'readonly', 'true'); - if (!$form->getValue('php_import_display')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_import_display', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_import_display', 'required', 'false'); - } - } - // Modify the form based on Edit Php Getitem access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_getitem', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_getitem', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_getitem', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_getitem', 'readonly', 'true'); - if (!$form->getValue('php_getitem')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_getitem', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_getitem', 'required', 'false'); - } - } - // Modify the form based on Edit Php Import Save access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_import_save', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_import_save', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_import_save', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_import_save', 'readonly', 'true'); - if (!$form->getValue('php_import_save')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_import_save', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_import_save', 'required', 'false'); - } - } - // Modify the form based on Edit Add Css View access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_css_view', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_css_view', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_css_view', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_css_view', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_css_view', 'class', ''); - $form->setFieldAttribute('add_css_view', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_css_view')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_css_view', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_css_view', 'required', 'false'); - } - } - // Modify the form based on Edit Css View access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.css_view', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.css_view', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('css_view', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('css_view', 'readonly', 'true'); - if (!$form->getValue('css_view')) - { - // Disable fields while saving. - $form->setFieldAttribute('css_view', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('css_view', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Getitems access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_getitems', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_getitems', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_getitems', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_getitems', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_getitems', 'class', ''); - $form->setFieldAttribute('add_php_getitems', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_getitems')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_getitems', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_getitems', 'required', 'false'); - } - } - // Modify the form based on Edit Add Css Views access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_css_views', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_css_views', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_css_views', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_css_views', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_css_views', 'class', ''); - $form->setFieldAttribute('add_css_views', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_css_views')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_css_views', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_css_views', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Getitems After All access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_getitems_after_all', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_getitems_after_all', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_getitems_after_all', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_getitems_after_all', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_getitems_after_all', 'class', ''); - $form->setFieldAttribute('add_php_getitems_after_all', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_getitems_after_all')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_getitems_after_all', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_getitems_after_all', 'required', 'false'); - } - } - // Modify the form based on Edit Css Views access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.css_views', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.css_views', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('css_views', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('css_views', 'readonly', 'true'); - if (!$form->getValue('css_views')) - { - // Disable fields while saving. - $form->setFieldAttribute('css_views', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('css_views', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Getlistquery access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_getlistquery', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_getlistquery', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_getlistquery', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_getlistquery', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_getlistquery', 'class', ''); - $form->setFieldAttribute('add_php_getlistquery', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_getlistquery')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_getlistquery', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_getlistquery', 'required', 'false'); - } - } - // Modify the form based on Edit Add Javascript View File access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_javascript_view_file', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_javascript_view_file', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_javascript_view_file', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_javascript_view_file', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_javascript_view_file', 'class', ''); - $form->setFieldAttribute('add_javascript_view_file', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_javascript_view_file')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_javascript_view_file', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_javascript_view_file', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Before Save access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_before_save', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_before_save', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_before_save', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_before_save', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_before_save', 'class', ''); - $form->setFieldAttribute('add_php_before_save', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_before_save')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_before_save', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_before_save', 'required', 'false'); - } - } - // Modify the form based on Edit Javascript View File access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.javascript_view_file', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.javascript_view_file', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('javascript_view_file', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('javascript_view_file', 'readonly', 'true'); - if (!$form->getValue('javascript_view_file')) - { - // Disable fields while saving. - $form->setFieldAttribute('javascript_view_file', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('javascript_view_file', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Save access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_save', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_save', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_save', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_save', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_save', 'class', ''); - $form->setFieldAttribute('add_php_save', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_save')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_save', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_save', 'required', 'false'); - } - } - // Modify the form based on Edit Add Javascript View Footer access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_javascript_view_footer', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_javascript_view_footer', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_javascript_view_footer', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_javascript_view_footer', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_javascript_view_footer', 'class', ''); - $form->setFieldAttribute('add_javascript_view_footer', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_javascript_view_footer')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_javascript_view_footer', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_javascript_view_footer', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Postsavehook access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_postsavehook', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_postsavehook', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_postsavehook', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_postsavehook', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_postsavehook', 'class', ''); - $form->setFieldAttribute('add_php_postsavehook', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_postsavehook')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_postsavehook', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_postsavehook', 'required', 'false'); - } - } - // Modify the form based on Edit Javascript View Footer access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.javascript_view_footer', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.javascript_view_footer', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('javascript_view_footer', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('javascript_view_footer', 'readonly', 'true'); - if (!$form->getValue('javascript_view_footer')) - { - // Disable fields while saving. - $form->setFieldAttribute('javascript_view_footer', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('javascript_view_footer', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Allowedit access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_allowedit', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_allowedit', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_allowedit', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_allowedit', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_allowedit', 'class', ''); - $form->setFieldAttribute('add_php_allowedit', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_allowedit')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_allowedit', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_allowedit', 'required', 'false'); - } - } - // Modify the form based on Edit Add Javascript Views File access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_javascript_views_file', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_javascript_views_file', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_javascript_views_file', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_javascript_views_file', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_javascript_views_file', 'class', ''); - $form->setFieldAttribute('add_javascript_views_file', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_javascript_views_file')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_javascript_views_file', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_javascript_views_file', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Batchcopy access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_batchcopy', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_batchcopy', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_batchcopy', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_batchcopy', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_batchcopy', 'class', ''); - $form->setFieldAttribute('add_php_batchcopy', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_batchcopy')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_batchcopy', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_batchcopy', 'required', 'false'); - } - } - // Modify the form based on Edit Javascript Views File access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.javascript_views_file', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.javascript_views_file', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('javascript_views_file', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('javascript_views_file', 'readonly', 'true'); - if (!$form->getValue('javascript_views_file')) - { - // Disable fields while saving. - $form->setFieldAttribute('javascript_views_file', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('javascript_views_file', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Batchmove access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_batchmove', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_batchmove', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_batchmove', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_batchmove', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_batchmove', 'class', ''); - $form->setFieldAttribute('add_php_batchmove', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_batchmove')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_batchmove', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_batchmove', 'required', 'false'); - } - } - // Modify the form based on Edit Add Javascript Views Footer access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_javascript_views_footer', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_javascript_views_footer', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_javascript_views_footer', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_javascript_views_footer', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_javascript_views_footer', 'class', ''); - $form->setFieldAttribute('add_javascript_views_footer', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_javascript_views_footer')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_javascript_views_footer', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_javascript_views_footer', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Before Publish access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_before_publish', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_before_publish', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_before_publish', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_before_publish', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_before_publish', 'class', ''); - $form->setFieldAttribute('add_php_before_publish', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_before_publish')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_before_publish', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_before_publish', 'required', 'false'); - } - } - // Modify the form based on Edit Javascript Views Footer access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.javascript_views_footer', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.javascript_views_footer', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('javascript_views_footer', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('javascript_views_footer', 'readonly', 'true'); - if (!$form->getValue('javascript_views_footer')) - { - // Disable fields while saving. - $form->setFieldAttribute('javascript_views_footer', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('javascript_views_footer', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php After Publish access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_after_publish', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_after_publish', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_after_publish', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_after_publish', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_after_publish', 'class', ''); - $form->setFieldAttribute('add_php_after_publish', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_after_publish')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_after_publish', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_after_publish', 'required', 'false'); - } - } - // Modify the form based on Edit Add Custom Button access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_custom_button', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_custom_button', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_custom_button', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_custom_button', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_custom_button', 'class', ''); - $form->setFieldAttribute('add_custom_button', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_custom_button')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_custom_button', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_custom_button', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Before Delete access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_before_delete', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_before_delete', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_before_delete', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_before_delete', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_before_delete', 'class', ''); - $form->setFieldAttribute('add_php_before_delete', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_before_delete')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_before_delete', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_before_delete', 'required', 'false'); - } - } - // Modify the form based on Edit Custom Button access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.custom_button', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.custom_button', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('custom_button', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('custom_button', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('custom_button', 'class', ''); - $form->setFieldAttribute('custom_button', 'class', $class.' disabled no-click'); - if (!$form->getValue('custom_button')) - { - // Disable fields while saving. - $form->setFieldAttribute('custom_button', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('custom_button', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php After Delete access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_after_delete', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_after_delete', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_after_delete', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_after_delete', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_after_delete', 'class', ''); - $form->setFieldAttribute('add_php_after_delete', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_after_delete')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_after_delete', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_after_delete', 'required', 'false'); - } - } - // Modify the form based on Edit Php Controller access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_controller', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_controller', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_controller', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_controller', 'readonly', 'true'); - if (!$form->getValue('php_controller')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_controller', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_controller', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Document access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_document', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_document', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_document', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_document', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_document', 'class', ''); - $form->setFieldAttribute('add_php_document', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_document')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_document', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_document', 'required', 'false'); - } - } - // Modify the form based on Edit Php Model access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_model', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_model', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_model', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_model', 'readonly', 'true'); - if (!$form->getValue('php_model')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_model', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_model', 'required', 'false'); - } - } - // Modify the form based on Edit Add Sql access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_sql', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_sql', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_sql', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_sql', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_sql', 'class', ''); - $form->setFieldAttribute('add_sql', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_sql')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_sql', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_sql', 'required', 'false'); - } - } - // Modify the form based on Edit Php Controller List access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_controller_list', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_controller_list', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_controller_list', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_controller_list', 'readonly', 'true'); - if (!$form->getValue('php_controller_list')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_controller_list', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_controller_list', 'required', 'false'); - } - } - // Modify the form based on Edit Addtables access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.addtables', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.addtables', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('addtables', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('addtables', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('addtables', 'class', ''); - $form->setFieldAttribute('addtables', 'class', $class.' disabled no-click'); - if (!$form->getValue('addtables')) - { - // Disable fields while saving. - $form->setFieldAttribute('addtables', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('addtables', 'required', 'false'); - } - } - // Modify the form based on Edit Php Model List access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_model_list', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_model_list', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_model_list', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_model_list', 'readonly', 'true'); - if (!$form->getValue('php_model_list')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_model_list', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_model_list', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Ajax access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_ajax', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_ajax', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_ajax', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_ajax', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_ajax', 'class', ''); - $form->setFieldAttribute('add_php_ajax', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_ajax')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_ajax', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_ajax', 'required', 'false'); - } - } - // Modify the form based on Edit Add Custom Import access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_custom_import', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_custom_import', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_custom_import', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_custom_import', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_custom_import', 'class', ''); - $form->setFieldAttribute('add_custom_import', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_custom_import')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_custom_import', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_custom_import', 'required', 'false'); - } - } - // Modify the form based on Edit Php Ajaxmethod access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_ajaxmethod', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_ajaxmethod', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_ajaxmethod', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_ajaxmethod', 'readonly', 'true'); - if (!$form->getValue('php_ajaxmethod')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_ajaxmethod', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_ajaxmethod', 'required', 'false'); - } - } - // Modify the form based on Edit Html Import View access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.html_import_view', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.html_import_view', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('html_import_view', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('html_import_view', 'readonly', 'true'); - if (!$form->getValue('html_import_view')) - { - // Disable fields while saving. - $form->setFieldAttribute('html_import_view', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('html_import_view', 'required', 'false'); - } - } - // Modify the form based on Edit Ajax Input access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.ajax_input', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.ajax_input', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('ajax_input', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('ajax_input', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('ajax_input', 'class', ''); - $form->setFieldAttribute('ajax_input', 'class', $class.' disabled no-click'); - if (!$form->getValue('ajax_input')) - { - // Disable fields while saving. - $form->setFieldAttribute('ajax_input', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('ajax_input', 'required', 'false'); - } - } - // Modify the form based on Edit Php Import Setdata access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_import_setdata', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_import_setdata', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_import_setdata', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_import_setdata', 'readonly', 'true'); - if (!$form->getValue('php_import_setdata')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_import_setdata', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_import_setdata', 'required', 'false'); - } - } - // Modify the form based on Edit Add Php Getitem access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_getitem', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.add_php_getitem', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('add_php_getitem', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('add_php_getitem', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('add_php_getitem', 'class', ''); - $form->setFieldAttribute('add_php_getitem', 'class', $class.' disabled no-click'); - if (!$form->getValue('add_php_getitem')) - { - // Disable fields while saving. - $form->setFieldAttribute('add_php_getitem', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('add_php_getitem', 'required', 'false'); - } - } - // Modify the form based on Edit Php Import Ext access controls. - if ($id != 0 && (!$user->authorise('admin_view.edit.php_import_ext', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('admin_view.edit.php_import_ext', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('php_import_ext', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('php_import_ext', 'readonly', 'true'); - if (!$form->getValue('php_import_ext')) - { - // Disable fields while saving. - $form->setFieldAttribute('php_import_ext', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('php_import_ext', 'required', 'false'); - } - } // Only load these values if no id is found if (0 == $id) { @@ -2072,9 +605,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin protected function allowEdit($data = array(), $key = 'id') { // Check specific edit permission then general edit permission. - $user = JFactory::getUser(); - return $user->authorise('core.edit', 'com_componentbuilder.admin_view.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('core.edit', 'com_componentbuilder'); + return JFactory::getUser()->authorise('core.edit', 'com_componentbuilder.admin_view.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or parent::allowEdit($data, $key); } /** @@ -2621,16 +1153,108 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['metadata'] = (string) $metadata; } - // Set the php_batchmove string to base64 string. - if (isset($data['php_batchmove'])) + // Set the addpermissions items to data. + if (isset($data['addpermissions']) && is_array($data['addpermissions'])) { - $data['php_batchmove'] = base64_encode($data['php_batchmove']); + $addpermissions = new JRegistry; + $addpermissions->loadArray($data['addpermissions']); + $data['addpermissions'] = (string) $addpermissions; + } + elseif (!isset($data['addpermissions'])) + { + // Set the empty addpermissions to data + $data['addpermissions'] = ''; } - // Set the php_save string to base64 string. - if (isset($data['php_save'])) + // Set the addtabs items to data. + if (isset($data['addtabs']) && is_array($data['addtabs'])) { - $data['php_save'] = base64_encode($data['php_save']); + $addtabs = new JRegistry; + $addtabs->loadArray($data['addtabs']); + $data['addtabs'] = (string) $addtabs; + } + elseif (!isset($data['addtabs'])) + { + // Set the empty addtabs to data + $data['addtabs'] = ''; + } + + // Set the addlinked_views items to data. + if (isset($data['addlinked_views']) && is_array($data['addlinked_views'])) + { + $addlinked_views = new JRegistry; + $addlinked_views->loadArray($data['addlinked_views']); + $data['addlinked_views'] = (string) $addlinked_views; + } + elseif (!isset($data['addlinked_views'])) + { + // Set the empty addlinked_views to data + $data['addlinked_views'] = ''; + } + + // Set the addfields items to data. + if (isset($data['addfields']) && is_array($data['addfields'])) + { + $addfields = new JRegistry; + $addfields->loadArray($data['addfields']); + $data['addfields'] = (string) $addfields; + } + elseif (!isset($data['addfields'])) + { + // Set the empty addfields to data + $data['addfields'] = ''; + } + + // Set the addconditions items to data. + if (isset($data['addconditions']) && is_array($data['addconditions'])) + { + $addconditions = new JRegistry; + $addconditions->loadArray($data['addconditions']); + $data['addconditions'] = (string) $addconditions; + } + elseif (!isset($data['addconditions'])) + { + // Set the empty addconditions to data + $data['addconditions'] = ''; + } + + // Set the custom_button items to data. + if (isset($data['custom_button']) && is_array($data['custom_button'])) + { + $custom_button = new JRegistry; + $custom_button->loadArray($data['custom_button']); + $data['custom_button'] = (string) $custom_button; + } + elseif (!isset($data['custom_button'])) + { + // Set the empty custom_button to data + $data['custom_button'] = ''; + } + + // Set the addtables items to data. + if (isset($data['addtables']) && is_array($data['addtables'])) + { + $addtables = new JRegistry; + $addtables->loadArray($data['addtables']); + $data['addtables'] = (string) $addtables; + } + elseif (!isset($data['addtables'])) + { + // Set the empty addtables to data + $data['addtables'] = ''; + } + + // Set the ajax_input items to data. + if (isset($data['ajax_input']) && is_array($data['ajax_input'])) + { + $ajax_input = new JRegistry; + $ajax_input->loadArray($data['ajax_input']); + $data['ajax_input'] = (string) $ajax_input; + } + elseif (!isset($data['ajax_input'])) + { + // Set the empty ajax_input to data + $data['ajax_input'] = ''; } // Set the php_after_delete string to base64 string. @@ -2639,6 +1263,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_after_delete'] = base64_encode($data['php_after_delete']); } + // Set the php_save string to base64 string. + if (isset($data['php_save'])) + { + $data['php_save'] = base64_encode($data['php_save']); + } + // Set the php_getlistquery string to base64 string. if (isset($data['php_getlistquery'])) { @@ -2687,6 +1317,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_postsavehook'] = base64_encode($data['php_postsavehook']); } + // Set the php_batchmove string to base64 string. + if (isset($data['php_batchmove'])) + { + $data['php_batchmove'] = base64_encode($data['php_batchmove']); + } + // Set the php_batchcopy string to base64 string. if (isset($data['php_batchcopy'])) { @@ -2817,46 +1453,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin if (isset($data['php_import_ext'])) { $data['php_import_ext'] = base64_encode($data['php_import_ext']); - } - - if (isset($data['addfields']) && ComponentbuilderHelper::checkJson($data['addfields'])) - { - // Sort fields by 'Tab' ASC, 'Order in Edit' ASC - $addfields = json_decode($data['addfields'], true); - if (ComponentbuilderHelper::checkArray($addfields)) - { - $out = array(); - foreach ($addfields as $key => $subarr) - { - if (ComponentbuilderHelper::checkArray($subarr)) - { - foreach ($subarr as $subkey => $subvalue) - { - $out[$subkey][$key] = $subvalue; - } - } - } - if (ComponentbuilderHelper::checkArray($out)) - { - // do the actual sort by tab and order_edit - usort($out, function ($a, $b) { - $val_a = sprintf('%02u', $a['tab']) . sprintf('%02u', $a['alignment']) . sprintf('%03u', $a['order_edit']); - $val_b = sprintf('%02u', $b['tab']) . sprintf('%02u', $b['alignment']) . sprintf('%03u', $b['order_edit']); - return strcmp($val_a, $val_b); - }); - - $addfields = array(); - foreach ($out as $key => $subarr) - { - foreach ($subarr as $subkey => $subvalue) - { - $addfields[$subkey][$key] = $subvalue; - } - } - $data['addfields'] = json_encode($addfields, true); - } } - } // Set the Params Items to data if (isset($data['params']) && is_array($data['params'])) diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index c30624758..d5a7380bb 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 114 of this MVC - @build 28th August, 2017 + @version @update number 126 of this MVC + @build 11th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php @@ -113,24 +113,7 @@ class ComponentbuilderModelAdmin_views extends JModelList $this->checkInNow(); // load parent items - $items = parent::getItems(); - - // set values to display correctly. - if (ComponentbuilderHelper::checkArray($items)) - { - // get user object. - $user = JFactory::getUser(); - foreach ($items as $nr => &$item) - { - $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); - if (!$access) - { - unset($items[$nr]); - continue; - } - - } - } + $items = parent::getItems(); // return items return $items; @@ -251,23 +234,12 @@ class ComponentbuilderModelAdmin_views extends JModelList // set values to display correctly. if (ComponentbuilderHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); - if (!$access) - { - unset($items[$nr]); - continue; - } - - // decode php_batchmove - $item->php_batchmove = base64_decode($item->php_batchmove); - // decode php_save - $item->php_save = base64_decode($item->php_save); // decode php_after_delete $item->php_after_delete = base64_decode($item->php_after_delete); + // decode php_save + $item->php_save = base64_decode($item->php_save); // decode php_getlistquery $item->php_getlistquery = base64_decode($item->php_getlistquery); // decode php_allowedit @@ -284,6 +256,8 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->php_before_save = base64_decode($item->php_before_save); // decode php_postsavehook $item->php_postsavehook = base64_decode($item->php_postsavehook); + // decode php_batchmove + $item->php_batchmove = base64_decode($item->php_batchmove); // decode php_batchcopy $item->php_batchcopy = base64_decode($item->php_batchcopy); // decode php_before_publish diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 6e558c1c1..10f0319ec 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -403,29 +403,17 @@ class ComponentbuilderModelAjax extends JModelList { $fields = array(); // get data - foreach ($addfields as $option => $values) + foreach ($addfields as $nr => $value) { - foreach ($values as $nr => $value) + $tmp = $this->getFieldData((int) $value['field']); + if (ComponentbuilderHelper::checkArray($tmp)) { - if ($option == 'field') - { - $value = $this->getFieldData((int) $value); - if (ComponentbuilderHelper::checkArray($value)) - { - $field[$nr] = $value; - } - } - elseif ($option == 'alias') - { - if ($value == 1) - { - $name[$nr] = 'alias'; - } - else - { - $name[$nr] = ''; - } - } + $field[$nr] = $tmp; + } + // insure it is set to alias if needed + if ($value['alias'] == 1) + { + $field[$nr]['name'] = 'alias'; } } // add the basic defaults @@ -436,10 +424,6 @@ class ComponentbuilderModelAjax extends JModelList { if (ComponentbuilderHelper::checkArray($f)) { - if (ComponentbuilderHelper::checkString($name[$n])) - { - $f['name'] = $name[$n]; - } $fields[] = $as.".".$f['name']." AS ".$tableName.$f['name']; } } diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index a479053d4..0e19fdc4c 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 83baf65c1..35c8650dd 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 27 of this MVC - @build 27th September, 2017 + @build 9th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php @@ -103,6 +103,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $item->custom_get = $custom_get->toArray(); } + if (!empty($item->custom_button)) + { + // Convert the custom_button field to an array. + $custom_button = new Registry; + $custom_button->loadString($item->custom_button); + $item->custom_button = $custom_button->toArray(); + } + if (!empty($item->php_controller)) { // base64 Decode php_controller. @@ -169,7 +177,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.custom_admin_view'); } } - $this->addcustom_admin_viewsvvwb = $item->id; + $this->addcustom_admin_viewsvvwa = $item->id; return $item; } @@ -179,7 +187,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVyklinked_components() + public function getVyjlinked_components() { // Get the user object. $user = JFactory::getUser(); @@ -219,15 +227,15 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin { $items = $db->loadObjectList(); - // Filter by addcustom_admin_viewsvvwb in this Repetable Field - if (ComponentbuilderHelper::checkArray($items) && isset($this->addcustom_admin_viewsvvwb)) + // Filter by addcustom_admin_viewsvvwa in this Repetable Field + if (ComponentbuilderHelper::checkArray($items) && isset($this->addcustom_admin_viewsvvwa)) { foreach ($items as $nr => &$item) { if (isset($item->addcustom_admin_views) && ComponentbuilderHelper::checkJson($item->addcustom_admin_views)) { $tmpArray = json_decode($item->addcustom_admin_views,true); - if (!isset($tmpArray['customadminview']) || !ComponentbuilderHelper::checkArray($tmpArray['customadminview']) || !in_array($this->addcustom_admin_viewsvvwb, $tmpArray['customadminview'])) + if (!isset($tmpArray['customadminview']) || !ComponentbuilderHelper::checkArray($tmpArray['customadminview']) || !in_array($this->addcustom_admin_viewsvvwa, $tmpArray['customadminview'])) { unset($items[$nr]); continue; @@ -975,6 +983,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $data['custom_get'] = ''; } + // Set the custom_button items to data. + if (isset($data['custom_button']) && is_array($data['custom_button'])) + { + $custom_button = new JRegistry; + $custom_button->loadArray($data['custom_button']); + $data['custom_button'] = (string) $custom_button; + } + elseif (!isset($data['custom_button'])) + { + // Set the empty custom_button to data + $data['custom_button'] = ''; + } + // Set the php_controller string to base64 string. if (isset($data['php_controller'])) { diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index cd0c73eb1..a9627583a 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 27 of this MVC - @build 27th September, 2017 + @build 9th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 548deab14..f2adfb57a 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 94 of this MVC - @build 27th September, 2017 + @version @update number 95 of this MVC + @build 10th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php index 86c3fbdc7..9849b23e9 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 94 of this MVC - @build 27th September, 2017 + @version @update number 95 of this MVC + @build 10th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/models/field.php b/admin/models/field.php index b9ae4aaa2..dcb250c83 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -131,7 +131,7 @@ class ComponentbuilderModelField extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.field'); } } - $this->addfieldsvvwd = $item->id; + $this->addfieldsvvwc = $item->id; return $item; } @@ -141,7 +141,7 @@ class ComponentbuilderModelField extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWaclinked_admin_views() + public function getWablinked_admin_views() { // Get the user object. $user = JFactory::getUser(); @@ -181,32 +181,15 @@ class ComponentbuilderModelField extends JModelAdmin { $items = $db->loadObjectList(); - // set values to display correctly. - if (ComponentbuilderHelper::checkArray($items)) - { - // get user object. - $user = JFactory::getUser(); - foreach ($items as $nr => &$item) - { - $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); - if (!$access) - { - unset($items[$nr]); - continue; - } - - } - } - - // Filter by addfieldsvvwd in this Repetable Field - if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvwd)) + // Filter by addfieldsvvwc in this Repetable Field + if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvwc)) { foreach ($items as $nr => &$item) { if (isset($item->addfields) && ComponentbuilderHelper::checkJson($item->addfields)) { $tmpArray = json_decode($item->addfields,true); - if (!isset($tmpArray['field']) || !ComponentbuilderHelper::checkArray($tmpArray['field']) || !in_array($this->addfieldsvvwd, $tmpArray['field'])) + if (!isset($tmpArray['field']) || !ComponentbuilderHelper::checkArray($tmpArray['field']) || !in_array($this->addfieldsvvwc, $tmpArray['field'])) { unset($items[$nr]); continue; diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index d7a0b7779..0acdd4eeb 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 9ef2e0894..470bc23d2 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 8c237a1f6..df11b6111 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index ae516c9c3..774845828 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php index 7e1ad247e..d654521fd 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index f269d5bfe..f95d84373 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index 25a4fab00..e7363a2e7 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 0e3685ed4..db587a064 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index d9d89c0ed..4e612bb25 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index 3ad08c46d..86c8ff3f7 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php index f3de392d3..7f42c8294 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicget.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index a3fbbef60..f508a74ff 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 5d00a70e0..381d6fe41 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index 436810fc9..f7151708c 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index cd3b2629c..2731ea2ae 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/ftps.php b/admin/models/fields/ftps.php index 2e2a83614..2a3f680ba 100644 --- a/admin/models/fields/ftps.php +++ b/admin/models/fields/ftps.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ftps.php diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php index 6095d037d..866dc3c88 100644 --- a/admin/models/fields/lang.php +++ b/admin/models/fields/lang.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage lang.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 18bc93dc4..ad51b4201 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index b043e9dd4..685f28b35 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index b72f11fd6..e861f95bb 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index 119083765..07315804f 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.6 - @build 6th October, 2017 + @build 12th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index ebcb29d20..86239e209 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -109,7 +109,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.fieldtype'); } } - $this->fieldtypevvwe = $item->id; + $this->fieldtypevvwd = $item->id; return $item; } @@ -119,7 +119,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWadfields() + public function getWacfields() { // Get the user object. $user = JFactory::getUser(); @@ -139,15 +139,15 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $query->select($db->quoteName('g.name','fieldtype_name')); $query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('g.id') . ')'); - // Filter by fieldtypevvwe global. - $fieldtypevvwe = $this->fieldtypevvwe; - if (is_numeric($fieldtypevvwe )) + // Filter by fieldtypevvwd global. + $fieldtypevvwd = $this->fieldtypevvwd; + if (is_numeric($fieldtypevvwd )) { - $query->where('a.fieldtype = ' . (int) $fieldtypevvwe ); + $query->where('a.fieldtype = ' . (int) $fieldtypevvwd ); } - elseif (is_string($fieldtypevvwe)) + elseif (is_string($fieldtypevvwd)) { - $query->where('a.fieldtype = ' . $db->quote($fieldtypevvwe)); + $query->where('a.fieldtype = ' . $db->quote($fieldtypevvwd)); } else { @@ -203,13 +203,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationWadfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationWacfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationWadfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationWacfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationWadfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationWacfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationWadfields($item->store, 'store'); + $item->store = $this->selectionTranslationWacfields($item->store, 'store'); } } @@ -223,7 +223,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationWadfields($value,$name) + public function selectionTranslationWacfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 5ee0ff272..a4d42ebe0 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 114 of this MVC - @build 28th August, 2017 + @version @update number 126 of this MVC + @build 11th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js @@ -340,7 +340,7 @@ function vvvvvxd(add_php_ajax_vvvvvxd) // set the function logic if (add_php_ajax_vvvvvxd == 1) { - jQuery('#jform_ajax_input').closest('.control-group').show(); + jQuery('#jform_ajax_input-lbl').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod').closest('.control-group').show(); if (jform_vvvvvxdvwx_required) { @@ -354,7 +354,7 @@ function vvvvvxd(add_php_ajax_vvvvvxd) } else { - jQuery('#jform_ajax_input').closest('.control-group').hide(); + jQuery('#jform_ajax_input-lbl').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod').closest('.control-group').hide(); if (!jform_vvvvvxdvwx_required) { @@ -900,11 +900,11 @@ function vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw) // set the function logic if (source_vvvvvxw == 1 && add_sql_vvvvvxw == 1) { - jQuery('#jform_addtables').closest('.control-group').show(); + jQuery('#jform_addtables-lbl').closest('.control-group').show(); } else { - jQuery('#jform_addtables').closest('.control-group').hide(); + jQuery('#jform_addtables-lbl').closest('.control-group').hide(); } } @@ -1056,7 +1056,7 @@ function vvvvvya(add_custom_button_vvvvvya) // set the function logic if (add_custom_button_vvvvvya == 1) { - jQuery('#jform_custom_button').closest('.control-group').show(); + jQuery('#jform_custom_button-lbl').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); if (jform_vvvvvyavxv_required) { @@ -1100,7 +1100,7 @@ function vvvvvya(add_custom_button_vvvvvya) } else { - jQuery('#jform_custom_button').closest('.control-group').hide(); + jQuery('#jform_custom_button-lbl').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); if (!jform_vvvvvyavxv_required) { @@ -1196,16 +1196,20 @@ function getFieldSelectOptions_server(fieldId){ }); } -function getFieldSelectOptions(id,fieldKey){ - getFieldSelectOptions_server(id).done(function(result) { - if(result){ - jQuery('textarea#'+fieldKey+'-jform_addconditions_fields_match_options').val(result); - } - else - { - jQuery('textarea#'+fieldKey+'-jform_addconditions_fields_match_options').val(''); - } - }) +function getFieldSelectOptions(fieldKey, table_, nr_){ + // first check if the field is set + if(jQuery("#jform_addconditions"+table_+"_addconditions"+fieldKey+nr_+"_match_field").length) { + var fieldId = jQuery("#jform_addconditions"+table_+"_addconditions"+fieldKey+nr_+"_match_field option:selected").val(); + getFieldSelectOptions_server(fieldId).done(function(result) { + if(result){ + jQuery('textarea#jform_addconditions'+table_+'_addconditions'+fieldKey+nr_+'_match_options').val(result); + } + else + { + jQuery('textarea#jform_addconditions'+table_+'_addconditions'+fieldKey+nr_+'_match_options').val(''); + } + }); + } } function getTableColumns_server(tableName){ @@ -1222,16 +1226,21 @@ function getTableColumns_server(tableName){ }); } -function getTableColumns(tableName,fieldKey){ - getTableColumns_server(tableName).done(function(result) { - if(result){ - jQuery('textarea#'+fieldKey+'-jform_addtables_fields_sourcemap').val(result); - } - else - { - jQuery('textarea#'+fieldKey+'-jform_addtables_fields_sourcemap').val(''); - } - }) +function getTableColumns(fieldKey, table_, nr_){ + // first check if the field is set + if(jQuery("#jform_addtables_"+table_+"addtables"+fieldKey+nr_+"_table").length) { + // get options + var tableName = jQuery("#jform_addtables_"+table_+"addtables"+fieldKey+nr_+"_table option:selected").val(); + getTableColumns_server(tableName).done(function(result) { + if(result){ + jQuery("textarea#jform_addtables_"+table_+"addtables"+fieldKey+nr_+"_sourcemap").val(result); + } + else + { + jQuery("textarea#jform_addtables_"+table_+"addtables"+fieldKey+nr_+"_sourcemap").val(''); + } + }); + } } function getImportScripts_server(typpe){ diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index af259205a..81b034823 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -149,17 +149,17 @@ message="Error! Please add some short description here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> - + @@ -202,19 +202,6 @@ filter="HTML" hint="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT" /> - - COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE + + - + - - - + @@ -422,37 +411,34 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_HINT" required="true" /> - + - - - + - - + + +
+ + + + + + + +
@@ -325,9 +357,25 @@
+ + + + + + + +
+ + + + + + + +
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 596f2fa77..3901e6c14 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_fields.css b/admin/assets/css/admin_fields.css index 9354bd1dd..b279cb665 100644 --- a/admin/assets/css/admin_fields.css +++ b/admin/assets/css/admin_fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.css diff --git a/admin/assets/css/admin_fields_conditions.css b/admin/assets/css/admin_fields_conditions.css index 951a843cb..5dcff7b02 100644 --- a/admin/assets/css/admin_fields_conditions.css +++ b/admin/assets/css/admin_fields_conditions.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.css diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index 22a346cd8..375ea3ae0 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.css diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index 2332f6397..8549c050c 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/admins_fields.css b/admin/assets/css/admins_fields.css index 78c8dbb36..7e7d9af24 100644 --- a/admin/assets/css/admins_fields.css +++ b/admin/assets/css/admins_fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.css diff --git a/admin/assets/css/admins_fields_conditions.css b/admin/assets/css/admins_fields_conditions.css index 7a214503d..da6d2813e 100644 --- a/admin/assets/css/admins_fields_conditions.css +++ b/admin/assets/css/admins_fields_conditions.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields_conditions.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 099381f0d..6d24cef0c 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index c819c95e9..d8bb05b56 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.js diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index ff6f1b438..281718ff5 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 556773ee3..5bd961228 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_fields.php b/admin/controllers/admin_fields.php index 507ec74b6..b0b4ba727 100644 --- a/admin/controllers/admin_fields.php +++ b/admin/controllers/admin_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php @@ -59,8 +59,15 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm * @since 1.6 */ protected function allowAdd($data = array()) - { // In the absense of better information, revert to the component permissions. - return parent::allowAdd($data); + { + // Access check. + $access = JFactory::getUser()->authorise('admin_fields.access', 'com_componentbuilder'); + if (!$access) + { + return false; + } + // In the absense of better information, revert to the component permissions. + return JFactory::getUser()->authorise('admin_fields.create', $this->option); } /** @@ -81,13 +88,20 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + // Access check. + $access = ($user->authorise('admin_fields.access', 'com_componentbuilder.admin_fields.' . (int) $recordId) && $user->authorise('admin_fields.access', 'com_componentbuilder')); + if (!$access) + { + return false; + } + if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit', 'com_componentbuilder.admin_fields.' . (int) $recordId); + $permission = $user->authorise('admin_fields.edit', 'com_componentbuilder.admin_fields.' . (int) $recordId); if (!$permission) { - if ($user->authorise('core.edit.own', 'com_componentbuilder.admin_fields.' . $recordId)) + if ($user->authorise('admin_fields.edit.own', 'com_componentbuilder.admin_fields.' . $recordId)) { // Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; @@ -106,7 +120,7 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm // If the owner matches 'me' then allow. if ($ownerId == $user->id) { - if ($user->authorise('core.edit.own', 'com_componentbuilder')) + if ($user->authorise('admin_fields.edit.own', 'com_componentbuilder')) { return true; } @@ -116,7 +130,7 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm } } // Since there is no permission, revert to the component permissions. - return parent::allowEdit($data, $key); + return $user->authorise('admin_fields.edit', $this->option); } /** diff --git a/admin/controllers/admin_fields_conditions.php b/admin/controllers/admin_fields_conditions.php index 9562e9fed..39a9652fa 100644 --- a/admin/controllers/admin_fields_conditions.php +++ b/admin/controllers/admin_fields_conditions.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.php @@ -59,8 +59,15 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm * @since 1.6 */ protected function allowAdd($data = array()) - { // In the absense of better information, revert to the component permissions. - return parent::allowAdd($data); + { + // Access check. + $access = JFactory::getUser()->authorise('admin_fields_conditions.access', 'com_componentbuilder'); + if (!$access) + { + return false; + } + // In the absense of better information, revert to the component permissions. + return JFactory::getUser()->authorise('admin_fields_conditions.create', $this->option); } /** @@ -81,13 +88,20 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + // Access check. + $access = ($user->authorise('admin_fields_conditions.access', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId) && $user->authorise('admin_fields_conditions.access', 'com_componentbuilder')); + if (!$access) + { + return false; + } + if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId); + $permission = $user->authorise('admin_fields_conditions.edit', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId); if (!$permission) { - if ($user->authorise('core.edit.own', 'com_componentbuilder.admin_fields_conditions.' . $recordId)) + if ($user->authorise('admin_fields_conditions.edit.own', 'com_componentbuilder.admin_fields_conditions.' . $recordId)) { // Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; @@ -106,7 +120,7 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm // If the owner matches 'me' then allow. if ($ownerId == $user->id) { - if ($user->authorise('core.edit.own', 'com_componentbuilder')) + if ($user->authorise('admin_fields_conditions.edit.own', 'com_componentbuilder')) { return true; } @@ -116,7 +130,7 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm } } // Since there is no permission, revert to the component permissions. - return parent::allowEdit($data, $key); + return $user->authorise('admin_fields_conditions.edit', $this->option); } /** diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 0bc2fcd16..90838ccd3 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -59,8 +59,15 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm * @since 1.6 */ protected function allowAdd($data = array()) - { // In the absense of better information, revert to the component permissions. - return parent::allowAdd($data); + { + // Access check. + $access = JFactory::getUser()->authorise('admin_view.access', 'com_componentbuilder'); + if (!$access) + { + return false; + } + // In the absense of better information, revert to the component permissions. + return JFactory::getUser()->authorise('admin_view.create', $this->option); } /** @@ -81,13 +88,20 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + // Access check. + $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $recordId) && $user->authorise('admin_view.access', 'com_componentbuilder')); + if (!$access) + { + return false; + } + if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit', 'com_componentbuilder.admin_view.' . (int) $recordId); + $permission = $user->authorise('admin_view.edit', 'com_componentbuilder.admin_view.' . (int) $recordId); if (!$permission) { - if ($user->authorise('core.edit.own', 'com_componentbuilder.admin_view.' . $recordId)) + if ($user->authorise('admin_view.edit.own', 'com_componentbuilder.admin_view.' . $recordId)) { // Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; @@ -106,7 +120,7 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm // If the owner matches 'me' then allow. if ($ownerId == $user->id) { - if ($user->authorise('core.edit.own', 'com_componentbuilder')) + if ($user->authorise('admin_view.edit.own', 'com_componentbuilder')) { return true; } @@ -116,7 +130,7 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm } } // Since there is no permission, revert to the component permissions. - return parent::allowEdit($data, $key); + return $user->authorise('admin_view.edit', $this->option); } /** diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index c7023b6e8..7ecf068f2 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/controllers/admins_fields.php b/admin/controllers/admins_fields.php index f8fea80dc..573620637 100644 --- a/admin/controllers/admins_fields.php +++ b/admin/controllers/admins_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.php diff --git a/admin/controllers/admins_fields_conditions.php b/admin/controllers/admins_fields_conditions.php index ec1b57bc4..f363dd8cf 100644 --- a/admin/controllers/admins_fields_conditions.php +++ b/admin/controllers/admins_fields_conditions.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields_conditions.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 935127758..d72a54fda 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 598fe4fdb..815c6acf9 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 14d1f9c80..84c9e7b93 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 1ccc6a0ed..223a62e3a 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index a4699f9fb..40b50cd48 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 43cc1752d..dd6d2c6bc 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -1393,7 +1393,10 @@ abstract class ComponentbuilderHelper { JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_JOOMLA_COMPONENTS'), 'index.php?option=com_componentbuilder&view=joomla_components', $submenu === 'joomla_components'); } - JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_ADMIN_VIEWS'), 'index.php?option=com_componentbuilder&view=admin_views', $submenu === 'admin_views'); + if ($user->authorise('admin_view.access', 'com_componentbuilder') && $user->authorise('admin_view.submenu', 'com_componentbuilder')) + { + JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_ADMIN_VIEWS'), 'index.php?option=com_componentbuilder&view=admin_views', $submenu === 'admin_views'); + } if ($user->authorise('custom_admin_view.access', 'com_componentbuilder') && $user->authorise('custom_admin_view.submenu', 'com_componentbuilder')) { JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_CUSTOM_ADMIN_VIEWS'), 'index.php?option=com_componentbuilder&view=custom_admin_views', $submenu === 'custom_admin_views'); diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index 7a9aaf45f..12d4dc5d0 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilderemail.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 1bcdda490..76e526aec 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index abac1fa9c..c4ea6db0f 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 139d76958..6da9b7576 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index c5f9cc013..3e6c7f909 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 2d03fed9f..ce4a6004d 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 457eb0750..1fc25c5b8 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -4,15 +4,33 @@ COM_COMPONENTBUILDER_ADD_CUSTOM_CODE_PLACEHOLDERS="Add Custom Code Placeholders" COM_COMPONENTBUILDER_ADD_TO_BACKUP_FOLDER_AMP_SALES_SERVER_LTSMALLGTIF_SETLTSMALLGT="Add to Backup Folder & Sales Server <small>(if set)</small>" COM_COMPONENTBUILDER_ADD_TO_REPOSITORY_FOLDER="Add to Repository Folder" COM_COMPONENTBUILDER_ADMINS_FIELDS="Admins Fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS="Admins Fields Access" +COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS_DESC="Allows the users in this group to access access admins fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_OPTIONS="Batch process the selected Admins Fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_TIP="All changes will be applied to all selected Admins Fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE="Admins Fields Batch Use" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS="Admins Fields Conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS="Admins Fields Conditions Access" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS_DESC="Allows the users in this group to access access admins fields conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_OPTIONS="Batch process the selected Admins Fields Conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_TIP="All changes will be applied to all selected Admins Fields Conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE="Admins Fields Conditions Batch Use" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE="Admins Fields Conditions Create" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE_DESC="Allows the users in this group to create create admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE="Admins Fields Conditions Delete" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE_DESC="Allows the users in this group to delete delete admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT="Admins Fields Conditions Edit" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY="Admins Fields Conditions Edit Created By" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE="Admins Fields Conditions Edit Created Date" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_DESC="Allows the users in this group to edit the admin fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN="Admins Fields Conditions Edit Own" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields conditions created by them" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE="Admins Fields Conditions Edit State" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION="Admins Fields Conditions Edit Version" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_ARCHIVED="%s Admins Fields Conditions archived." @@ -32,6 +50,20 @@ COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNFEATURED="%s Admins Fiel COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNFEATURED_1="%s Admin Fields Conditions unfeatured." COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNPUBLISHED="%s Admins Fields Conditions unpublished." COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNPUBLISHED_1="%s Admin Fields Conditions unpublished." +COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE="Admins Fields Create" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE_DESC="Allows the users in this group to create create admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE="Admins Fields Delete" +COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE_DESC="Allows the users in this group to delete delete admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT="Admins Fields Edit" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY="Admins Fields Edit Created By" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE="Admins Fields Edit Created Date" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_DESC="Allows the users in this group to edit the admin fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN="Admins Fields Edit Own" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields created by them" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE="Admins Fields Edit State" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION="Admins Fields Edit Version" COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_N_ITEMS_ARCHIVED="%s Admins Fields archived." @@ -168,6 +200,7 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_LABEL="Searchable" COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_DESCRIPTION="Select if the field should be sortable in list view, if shown." COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_LABEL="Sortable" COM_COMPONENTBUILDER_ADMIN_FIELDS_STATUS="Status" +COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB="Tab" COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_DESCRIPTION="Select the tab this field belongs to." COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_LABEL="Tab" COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_DESCRIPTION="Select if the field is the title field." @@ -177,14 +210,30 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_DESC="A count of the number of times t COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_LABEL="Revision" COM_COMPONENTBUILDER_ADMIN_VIEW="Admin View" COM_COMPONENTBUILDER_ADMIN_VIEWS="Admin Views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access" +COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_OPTIONS="Batch process the selected Admin Views" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_TIP="All changes will be applied to all selected Admin Views" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE="Admin Views Batch Use" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE="Admin Views Create" +COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD="Admin Views Dashboard Add" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST="Admin Views Dashboard List" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete" +COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY="Admin Views Edit Created By" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE="Admin Views Edit Created Date" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC="Allows the users in this group to edit the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN="Admin Views Edit Own" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admin views created by them" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE="Admin Views Edit State" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export" @@ -380,6 +429,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION="Description" COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_DESCRIPTION="Add Description Here" COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT="Add Description Here" COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_LABEL="Description" +COM_COMPONENTBUILDER_ADMIN_VIEW_DETAILS="Details" COM_COMPONENTBUILDER_ADMIN_VIEW_DOWNLOAD="Download" COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP="Dump" COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT="Editing the Admin View" @@ -482,7 +532,6 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL="Child Key" COM_COMPONENTBUILDER_ADMIN_VIEW_LAMP="Lamp" COM_COMPONENTBUILDER_ADMIN_VIEW_LAST="Last" COM_COMPONENTBUILDER_ADMIN_VIEW_LINK="Link" -COM_COMPONENTBUILDER_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST="List" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_TWO="List 2" COM_COMPONENTBUILDER_ADMIN_VIEW_LOCATION="Location" @@ -1762,6 +1811,7 @@ COM_COMPONENTBUILDER_DASHBOARD_TEMPLATES="Templates

" COM_COMPONENTBUILDER_DASHBOARD_TEMPLATE_ADD="Add Template

" COM_COMPONENTBUILDER_DATE="Date" COM_COMPONENTBUILDER_DEBUG_LINE_NUMBERS="Debug (line numbers)" +COM_COMPONENTBUILDER_DETAILS="Details" COM_COMPONENTBUILDER_DOES_THIS_PACKAGE_REQUIRE_A_KEY_TO_INSTALL="Does this package require a key to install" COM_COMPONENTBUILDER_DOWNLOAD="download" COM_COMPONENTBUILDER_DYNAMIC_GET="Dynamic Get" diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini index 9da821953..f3c9677cb 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini @@ -1,18 +1,66 @@ COM_COMPONENTBUILDER="Component Builder" +COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS="Admins Fields Access" +COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS_DESC="Allows the users in this group to access access admins fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE="Admins Fields Batch Use" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS="Admins Fields Conditions Access" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS_DESC="Allows the users in this group to access access admins fields conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE="Admins Fields Conditions Batch Use" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE="Admins Fields Conditions Create" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE_DESC="Allows the users in this group to create create admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE="Admins Fields Conditions Delete" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE_DESC="Allows the users in this group to delete delete admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT="Admins Fields Conditions Edit" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY="Admins Fields Conditions Edit Created By" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE="Admins Fields Conditions Edit Created Date" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_DESC="Allows the users in this group to edit the admin fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN="Admins Fields Conditions Edit Own" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields conditions created by them" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE="Admins Fields Conditions Edit State" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION="Admins Fields Conditions Edit Version" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE="Admins Fields Create" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE_DESC="Allows the users in this group to create create admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE="Admins Fields Delete" +COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE_DESC="Allows the users in this group to delete delete admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT="Admins Fields Edit" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY="Admins Fields Edit Created By" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE="Admins Fields Edit Created Date" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_DESC="Allows the users in this group to edit the admin fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN="Admins Fields Edit Own" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields created by them" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE="Admins Fields Edit State" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION="Admins Fields Edit Version" COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields" +COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access" +COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE="Admin Views Batch Use" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE="Admin Views Create" +COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD="Admin Views Dashboard Add" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST="Admin Views Dashboard List" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete" +COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY="Admin Views Edit Created By" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE="Admin Views Edit Created Date" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC="Allows the users in this group to edit the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN="Admin Views Edit Own" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admin views created by them" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE="Admin Views Edit State" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export" diff --git a/admin/layouts/admin_fields/fields_above.php b/admin/layouts/admin_fields/fields_above.php index 23ec9f312..0c596d8d3 100644 --- a/admin/layouts/admin_fields/fields_above.php +++ b/admin/layouts/admin_fields/fields_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_above.php diff --git a/admin/layouts/admin_fields/fields_fullwidth.php b/admin/layouts/admin_fields/fields_fullwidth.php index 69aeab513..550fba1c1 100644 --- a/admin/layouts/admin_fields/fields_fullwidth.php +++ b/admin/layouts/admin_fields/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_fields/publishing.php b/admin/layouts/admin_fields/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/admin_fields/publishing.php +++ b/admin/layouts/admin_fields/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields/publlshing.php b/admin/layouts/admin_fields/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/admin_fields/publlshing.php +++ b/admin/layouts/admin_fields/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_fields_conditions/conditions_above.php b/admin/layouts/admin_fields_conditions/conditions_above.php index 0b6ff91d1..7171f3638 100644 --- a/admin/layouts/admin_fields_conditions/conditions_above.php +++ b/admin/layouts/admin_fields_conditions/conditions_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_above.php diff --git a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php index 282485ce4..a6043c13f 100644 --- a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php +++ b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_fullwidth.php diff --git a/admin/layouts/admin_fields_conditions/publishing.php b/admin/layouts/admin_fields_conditions/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/admin_fields_conditions/publishing.php +++ b/admin/layouts/admin_fields_conditions/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields_conditions/publlshing.php b/admin/layouts/admin_fields_conditions/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/admin_fields_conditions/publlshing.php +++ b/admin/layouts/admin_fields_conditions/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 723bff5bc..e0820f63b 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php index dcfd33f63..682d05925 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index 2725c535c..2fae75522 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index c60c1a6d6..197d3d232 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php @@ -27,30 +27,112 @@ defined('_JEXEC') or die('Restricted access'); -$form = $displayData->getForm(); - -$fields = $displayData->get('fields') ?: array( - 'note_beginner_import', - 'note_advanced_import', - 'add_custom_import', - 'php_import_display', - 'html_import_view', - 'php_import', - 'php_import_setdata', - 'php_import_save', - 'php_import_ext' -); +// set the defaults +$items = $displayData->vxzcustom_import; +$user = JFactory::getUser(); +$id = $displayData->item->id; +$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; ?>
- -
-
- getLabel($field); ?> -
-
- getInput($field); ?> -
-
- + + + + + + + + + + + + + + + + $item): ?> + authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; + $userChkOut = JFactory::getUser($item->checked_out); + $canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components'); + ?> + + + + + + + + published == 1):?> + + published == 0):?> + + published == 2):?> + + published == -2):?> + + + + + + +
+ + + + + + + + + + + + + + + +
+ get('core.edit')): ?> + escape($item->system_name); ?> + checked_out): ?> + name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> + + +
escape($item->system_name); ?>
+ + 		+ escape($item->name_code); ?> + + escape($item->component_version); ?> + + escape($item->short_description); ?> + + escape($item->companyname); ?> + + escape($item->author); ?> + + + + + + + + + + + + + + + + + + id; ?> +
+ +
+ +
+
diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/details_above.php similarity index 95% rename from admin/layouts/admin_view/settings_above.php rename to admin/layouts/admin_view/details_above.php index fb478bd95..f05c54994 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/details_above.php @@ -11,10 +11,10 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage settings_above.php + @subpackage details_above.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/details_left.php similarity index 93% rename from admin/layouts/admin_view/settings_left.php rename to admin/layouts/admin_view/details_left.php index d097ef3c7..7d814163f 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/details_left.php @@ -11,10 +11,10 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage settings_left.php + @subpackage details_left.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -33,9 +33,6 @@ $fields = $displayData->get('fields') ?: array( 'name_single', 'name_list', 'type', - 'short_description', - 'description', - 'add_fadein', 'icon', 'icon_add', 'icon_category' diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/details_right.php similarity index 91% rename from admin/layouts/admin_view/settings_right.php rename to admin/layouts/admin_view/details_right.php index c1fe36818..e3e792a3a 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/details_right.php @@ -11,10 +11,10 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage settings_right.php + @subpackage details_right.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -30,11 +30,9 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'note_on_permissions', - 'addpermissions', - 'note_on_tabs', - 'addtabs', - 'addlinked_views' + 'short_description', + 'description', + 'add_fadein' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/details_under.php similarity index 95% rename from admin/layouts/admin_view/settings_under.php rename to admin/layouts/admin_view/details_under.php index 162833565..1d11bc093 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/details_under.php @@ -11,10 +11,10 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage settings_under.php + @subpackage details_under.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/layouts/admin_view/fields_conditions_fullwidth.php b/admin/layouts/admin_view/fields_conditions_fullwidth.php index 17a6aca8c..76ef39b14 100644 --- a/admin/layouts/admin_view/fields_conditions_fullwidth.php +++ b/admin/layouts/admin_view/fields_conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_fullwidth.php diff --git a/admin/layouts/admin_view/fields_conditions_left.php b/admin/layouts/admin_view/fields_conditions_left.php index 8c9af1fe7..0623ce25c 100644 --- a/admin/layouts/admin_view/fields_conditions_left.php +++ b/admin/layouts/admin_view/fields_conditions_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_left.php diff --git a/admin/layouts/admin_view/fields_conditions_right.php b/admin/layouts/admin_view/fields_conditions_right.php index 69071374c..f757aa767 100644 --- a/admin/layouts/admin_view/fields_conditions_right.php +++ b/admin/layouts/admin_view/fields_conditions_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_right.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 524350d58..baad275f9 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php deleted file mode 100644 index 955fc207a..000000000 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ /dev/null @@ -1,138 +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 - - Builds Complex Joomla Components - -/-----------------------------------------------------------------------------------------------------------------------------*/ - -// No direct access to this file - -defined('_JEXEC') or die('Restricted access'); - -// set the defaults -$items = $displayData->vxzlinked_components; -$user = JFactory::getUser(); -$id = $displayData->item->id; -$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; - -?> -
- - - - - - - - - - - - - - - - $item): ?> - authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; - $userChkOut = JFactory::getUser($item->checked_out); - $canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components'); - ?> - - - - - - - - published == 1):?> - - published == 0):?> - - published == 2):?> - - published == -2):?> - - - - - - -
- - - - - - - - - - - - - - - -
- get('core.edit')): ?> - escape($item->system_name); ?> - checked_out): ?> - name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> - - -
escape($item->system_name); ?>
- - 		- escape($item->name_code); ?> - - escape($item->component_version); ?> - - escape($item->short_description); ?> - - escape($item->companyname); ?> - - escape($item->author); ?> - - - - - - - - - - - - - - - - - - id; ?> -
- -
- -
- -
diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index b0d3bdc94..f4fd388fe 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index bc7bf48a6..8e577d2e0 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index 63fefe8fc..829fbc5fa 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_fullwidth.php b/admin/layouts/admin_view/settings_fullwidth.php new file mode 100644 index 000000000..ede1fbae3 --- /dev/null +++ b/admin/layouts/admin_view/settings_fullwidth.php @@ -0,0 +1,52 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'note_on_permissions', + 'addpermissions', + 'note_on_tabs', + 'addtabs', + 'addlinked_views' +); + +?> +
+ +
+
+ getLabel($field); ?> +
+
+ getInput($field); ?> +
+
+ +
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 83fcedc36..5bb9604fc 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 3c75a77c4..e88926942 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index 2725c535c..2fae75522 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index c5e7bc878..b9ccfada6 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index f23dac70d..f05c54994 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index cf0e1f4c9..6b7444ac5 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index e97d5302c..3bdbc32ad 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index 30ff71078..6749a9fa8 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index 199ef5937..a7487da57 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index 21469c10a..1d11bc093 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index 44cbfd749..c14d1301d 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index ebcb00eb4..fcf66fd67 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index fb2c9dd47..f332ac07c 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index 11332d983..e1a4bee7f 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index 44a1536e1..c6a616685 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php index 21469c10a..1d11bc093 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index 9a3d8998a..e3bbeb30e 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index b7e511227..8277f6571 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index 480bce0cf..d23e216f8 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/joint_fullwidth.php b/admin/layouts/dynamic_get/joint_fullwidth.php index 60e46f647..d59fd3b93 100644 --- a/admin/layouts/dynamic_get/joint_fullwidth.php +++ b/admin/layouts/dynamic_get/joint_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage joint_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_above.php b/admin/layouts/dynamic_get/main_above.php index 5a9ac9720..981debe49 100644 --- a/admin/layouts/dynamic_get/main_above.php +++ b/admin/layouts/dynamic_get/main_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_above.php diff --git a/admin/layouts/dynamic_get/main_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php index b69ad2324..423e52c05 100644 --- a/admin/layouts/dynamic_get/main_fullwidth.php +++ b/admin/layouts/dynamic_get/main_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_left.php b/admin/layouts/dynamic_get/main_left.php index 4887d7ac9..fa8ffeca0 100644 --- a/admin/layouts/dynamic_get/main_left.php +++ b/admin/layouts/dynamic_get/main_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_left.php diff --git a/admin/layouts/dynamic_get/main_right.php b/admin/layouts/dynamic_get/main_right.php index 6dc1fe383..8d3351c6d 100644 --- a/admin/layouts/dynamic_get/main_right.php +++ b/admin/layouts/dynamic_get/main_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_right.php diff --git a/admin/layouts/dynamic_get/main_under.php b/admin/layouts/dynamic_get/main_under.php index e714dcb1f..4cafe4bff 100644 --- a/admin/layouts/dynamic_get/main_under.php +++ b/admin/layouts/dynamic_get/main_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index efe14f575..c7d2d67b6 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index e4bfa611e..f96100401 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index 78805a53f..ae5271306 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index 21469c10a..1d11bc093 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php index 1740a412a..603b5ce38 100644 --- a/admin/layouts/field/linked_admin_views_fullwidth.php +++ b/admin/layouts/field/linked_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_admin_views_fullwidth.php @@ -68,7 +68,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view. ?> - get('core.edit')): ?> + get('admin_view.edit')): ?> escape($item->system_name); ?> checked_out): ?> name, $item->checked_out_time, 'admin_views.', $canCheckin); ?> diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index 29cca0a17..5279e2a2c 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index 8454b21ae..b3f145e2d 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_fullwidth.php b/admin/layouts/fieldtype/details_fullwidth.php index 8fe616fc4..f3215fdce 100644 --- a/admin/layouts/fieldtype/details_fullwidth.php +++ b/admin/layouts/fieldtype/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 49a1c01e7..67bb31889 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index f2dd1ef0e..f2b1a1189 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 1a7278104..bbd9a31d0 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/ftp/details_above.php b/admin/layouts/ftp/details_above.php index ddf73b2ea..04e15b13c 100644 --- a/admin/layouts/ftp/details_above.php +++ b/admin/layouts/ftp/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/ftp/details_fullwidth.php b/admin/layouts/ftp/details_fullwidth.php index 74c89401a..1a8d925ce 100644 --- a/admin/layouts/ftp/details_fullwidth.php +++ b/admin/layouts/ftp/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index 81441858e..209e61fb6 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/ftp/publishing.php b/admin/layouts/ftp/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/ftp/publishing.php +++ b/admin/layouts/ftp/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/ftp/publlshing.php b/admin/layouts/ftp/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/ftp/publlshing.php +++ b/admin/layouts/ftp/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index a43418bfa..29dd1599a 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index b815e1f5d..3c71d469f 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index bf20ea1b8..8b4538841 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index a4b6056f6..3746e8497 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 21469c10a..1d11bc093 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php index 44b541fc7..b9f5657a6 100644 --- a/admin/layouts/joomla_component/admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php @@ -38,7 +38,7 @@ $can = ComponentbuilderHelper::getActions('admin_view'); ?>
-get('core.create')): ?> +get('admin_view.create')): ?>

@@ -74,7 +74,7 @@ $can = ComponentbuilderHelper::getActions('admin_view'); ?> - get('core.edit')): ?> + get('admin_view.edit')): ?> escape($item->system_name); ?> checked_out): ?> name, $item->checked_out_time, 'admin_views.', $canCheckin); ?> diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index 22a7f2d94..a72ba8cbd 100644 --- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index f23dac70d..f05c54994 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index cc99d2903..2a8282eea 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index 29575f88c..ebd7d7f84 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php index 21469c10a..1d11bc093 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php index 59b12684e..f79f0247d 100644 --- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index c0c76492c..9cf159784 100644 --- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php index fdf3c095a..25db77e86 100644 --- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php +++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/metadata.php b/admin/layouts/joomla_component/metadata.php index 1ce02c258..feacbbe9e 100644 --- a/admin/layouts/joomla_component/metadata.php +++ b/admin/layouts/joomla_component/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage metadata.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index 33e3b0c57..30ad472d0 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php index 50884943e..acb709273 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php index d5c295540..b48e51357 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index a4bed1ca4..5272dfcae 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php index 7c5b9c3bc..636e40a43 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php index 0e1305dab..04b6946c0 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index b97449d7c..93a2558e2 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index ae8b3114b..650dca686 100644 --- a/admin/layouts/joomla_component/site_views_fullwidth.php +++ b/admin/layouts/joomla_component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php index 96a982f3f..fb613ac6d 100644 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ b/admin/layouts/joomla_component/translation_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage translation_fullwidth.php diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index 9401a56e4..4c09bab1a 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php index 62441e6d3..ec59fd56f 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/language_translation/details_above.php b/admin/layouts/language_translation/details_above.php index b5b4aef34..b25a2cc83 100644 --- a/admin/layouts/language_translation/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php index eb1d0117a..64acb9121 100644 --- a/admin/layouts/language_translation/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/language_translation/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/language_translation/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index 32ecee070..4fb14add5 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index 54b2f1ee2..16a2d5dca 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index 6df1fb844..d761d08cf 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index 9b2e232c3..f5696cacd 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index d462afb5f..9cfff0555 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index 21469c10a..1d11bc093 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index 969ef17a5..8fb1b677f 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php index 04b569c28..5e761dd58 100644 --- a/admin/layouts/site_view/custom_buttons_left.php +++ b/admin/layouts/site_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php index 208628d3f..60f066d6a 100644 --- a/admin/layouts/site_view/custom_buttons_right.php +++ b/admin/layouts/site_view/custom_buttons_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_right.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index f23dac70d..f05c54994 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index cf0e1f4c9..6b7444ac5 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index e97d5302c..3bdbc32ad 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index 9b2e232c3..f5696cacd 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index 199ef5937..a7487da57 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index 21469c10a..1d11bc093 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index 055a6e300..e2879e9ad 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index cfb7fcb47..836b25b8b 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 754c7f23e..ab45d3b36 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index 35bc05647..0f2766aa2 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index f1ba0a275..f37672112 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index 72b9af6c0..38f0d35f0 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index 32ecee070..4fb14add5 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index f874474c4..d0e0f82fc 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index 6df1fb844..d761d08cf 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index 9b2e232c3..f5696cacd 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index d462afb5f..9cfff0555 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index 21469c10a..1d11bc093 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php index 2c8aa3729..146b0fc58 100644 --- a/admin/models/admin_fields.php +++ b/admin/models/admin_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php @@ -101,6 +101,26 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $addfields = new Registry; $addfields->loadString($item->addfields); $item->addfields = $addfields->toArray(); + } + + // check what type of field array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->addfields) && isset($item->addfields['field'])) + { + $bucket = array(); + foreach($item->addfields as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addfields'.$nr][$option] = $value; + } + } + $item->addfields = $bucket; + // update the fields in the DB + $fieldsUpdate = new stdClass(); + $fieldsUpdate->id = (int) $item->id; + $fieldsUpdate->addfields = json_encode($bucket); + $this->_db->updateObject('#__componentbuilder_admin_fields', $fieldsUpdate, 'id'); } if (!empty($item->id)) @@ -150,8 +170,8 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin // Check for existing item. // Modify the form based on Edit State access controls. - if ($id != 0 && (!$user->authorise('core.edit.state', 'com_componentbuilder.admin_fields.' . (int) $id)) - || ($id == 0 && !$user->authorise('core.edit.state', 'com_componentbuilder'))) + if ($id != 0 && (!$user->authorise('admin_fields.edit.state', 'com_componentbuilder.admin_fields.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields.edit.state', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); @@ -167,7 +187,8 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $form->setValue('created_by', null, $user->id); } // Modify the form based on Edit Creaded By access controls. - if (!$user->authorise('core.edit.created_by', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_fields.edit.created_by', 'com_componentbuilder.admin_fields.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields.edit.created_by', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); @@ -177,7 +198,8 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $form->setFieldAttribute('created_by', 'filter', 'unset'); } // Modify the form based on Edit Creaded Date access controls. - if (!$user->authorise('core.edit.created', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_fields.edit.created', 'com_componentbuilder.admin_fields.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields.edit.created', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); @@ -231,7 +253,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $user = JFactory::getUser(); // The record has been set. Check the record permissions. - return $user->authorise('core.delete', 'com_componentbuilder.admin_fields.' . (int) $record->id); + return $user->authorise('admin_fields.delete', 'com_componentbuilder.admin_fields.' . (int) $record->id); } return false; } @@ -253,14 +275,14 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit.state', 'com_componentbuilder.admin_fields.' . (int) $recordId); + $permission = $user->authorise('admin_fields.edit.state', 'com_componentbuilder.admin_fields.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } // In the absense of better information, revert to the component permissions. - return parent::canEditState($record); + return $user->authorise('admin_fields.edit.state', 'com_componentbuilder'); } /** @@ -275,8 +297,9 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin protected function allowEdit($data = array(), $key = 'id') { // Check specific edit permission then general edit permission. + $user = JFactory::getUser(); - return JFactory::getUser()->authorise('core.edit', 'com_componentbuilder.admin_fields.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or parent::allowEdit($data, $key); + return $user->authorise('admin_fields.edit', 'com_componentbuilder.admin_fields.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('admin_fields.edit', 'com_componentbuilder'); } /** @@ -528,7 +551,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_fields'); } - if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_fields.create') && !$this->canDo->get('admin_fields.batch')) { return false; } @@ -543,7 +566,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin { $values['published'] = 0; } - elseif (isset($values['published']) && !$this->canDo->get('core.edit.state')) + elseif (isset($values['published']) && !$this->canDo->get('admin_fields.edit.state')) { $values['published'] = 0; } @@ -560,7 +583,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin // only allow copy if user may edit this item. - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_fields.edit', $contexts[$pk])) { @@ -677,14 +700,14 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_fields'); } - if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_fields.edit') && !$this->canDo->get('admin_fields.batch')) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); return false; } // make sure published only updates if user has the permission. - if (isset($values['published']) && !$this->canDo->get('core.edit.state')) + if (isset($values['published']) && !$this->canDo->get('admin_fields.edit.state')) { unset($values['published']); } @@ -694,7 +717,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin // Parent exists so we proceed foreach ($pks as $pk) { - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_fields.edit', $contexts[$pk])) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php index 87be74748..05609d174 100644 --- a/admin/models/admin_fields_conditions.php +++ b/admin/models/admin_fields_conditions.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.php @@ -101,6 +101,26 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $addconditions = new Registry; $addconditions->loadString($item->addconditions); $item->addconditions = $addconditions->toArray(); + } + + // check what type of conditions array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->addconditions) && isset($item->addconditions['target_field'])) + { + $bucket = array(); + foreach($item->addconditions as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addconditions'.$nr][$option] = $value; + } + } + $item->addconditions = $bucket; + // update the fields + $conditionsUpdate = new stdClass(); + $conditionsUpdate->id = (int) $item->id; + $conditionsUpdate->addconditions = json_encode($bucket); + $this->_db->updateObject('#__componentbuilder_admin_fields_conditions', $conditionsUpdate, 'id'); } if (!empty($item->id)) @@ -150,8 +170,8 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin // Check for existing item. // Modify the form based on Edit State access controls. - if ($id != 0 && (!$user->authorise('core.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $id)) - || ($id == 0 && !$user->authorise('core.edit.state', 'com_componentbuilder'))) + if ($id != 0 && (!$user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); @@ -167,7 +187,8 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $form->setValue('created_by', null, $user->id); } // Modify the form based on Edit Creaded By access controls. - if (!$user->authorise('core.edit.created_by', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_fields_conditions.edit.created_by', 'com_componentbuilder.admin_fields_conditions.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields_conditions.edit.created_by', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); @@ -177,7 +198,8 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $form->setFieldAttribute('created_by', 'filter', 'unset'); } // Modify the form based on Edit Creaded Date access controls. - if (!$user->authorise('core.edit.created', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_fields_conditions.edit.created', 'com_componentbuilder.admin_fields_conditions.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields_conditions.edit.created', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); @@ -231,7 +253,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $user = JFactory::getUser(); // The record has been set. Check the record permissions. - return $user->authorise('core.delete', 'com_componentbuilder.admin_fields_conditions.' . (int) $record->id); + return $user->authorise('admin_fields_conditions.delete', 'com_componentbuilder.admin_fields_conditions.' . (int) $record->id); } return false; } @@ -253,14 +275,14 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId); + $permission = $user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } // In the absense of better information, revert to the component permissions. - return parent::canEditState($record); + return $user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder'); } /** @@ -275,8 +297,9 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin protected function allowEdit($data = array(), $key = 'id') { // Check specific edit permission then general edit permission. + $user = JFactory::getUser(); - return JFactory::getUser()->authorise('core.edit', 'com_componentbuilder.admin_fields_conditions.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or parent::allowEdit($data, $key); + return $user->authorise('admin_fields_conditions.edit', 'com_componentbuilder.admin_fields_conditions.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('admin_fields_conditions.edit', 'com_componentbuilder'); } /** @@ -528,7 +551,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions'); } - if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_fields_conditions.create') && !$this->canDo->get('admin_fields_conditions.batch')) { return false; } @@ -543,7 +566,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin { $values['published'] = 0; } - elseif (isset($values['published']) && !$this->canDo->get('core.edit.state')) + elseif (isset($values['published']) && !$this->canDo->get('admin_fields_conditions.edit.state')) { $values['published'] = 0; } @@ -560,7 +583,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin // only allow copy if user may edit this item. - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_fields_conditions.edit', $contexts[$pk])) { @@ -677,14 +700,14 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions'); } - if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_fields_conditions.edit') && !$this->canDo->get('admin_fields_conditions.batch')) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); return false; } // make sure published only updates if user has the permission. - if (isset($values['published']) && !$this->canDo->get('core.edit.state')) + if (isset($values['published']) && !$this->canDo->get('admin_fields_conditions.edit.state')) { unset($values['published']); } @@ -694,7 +717,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin // Parent exists so we proceed foreach ($pks as $pk) { - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_fields_conditions.edit', $contexts[$pk])) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 3be57afe9..94beb47e6 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -148,10 +148,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->ajax_input = $ajax_input->toArray(); } - if (!empty($item->php_after_delete)) + if (!empty($item->php_getitems)) { - // base64 Decode php_after_delete. - $item->php_after_delete = base64_decode($item->php_after_delete); + // base64 Decode php_getitems. + $item->php_getitems = base64_decode($item->php_getitems); + } + + if (!empty($item->php_batchmove)) + { + // base64 Decode php_batchmove. + $item->php_batchmove = base64_decode($item->php_batchmove); } if (!empty($item->php_save)) @@ -160,6 +166,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_save = base64_decode($item->php_save); } + if (!empty($item->php_after_delete)) + { + // base64 Decode php_after_delete. + $item->php_after_delete = base64_decode($item->php_after_delete); + } + if (!empty($item->php_getlistquery)) { // base64 Decode php_getlistquery. @@ -178,12 +190,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_after_publish = base64_decode($item->php_after_publish); } - if (!empty($item->php_getitems)) - { - // base64 Decode php_getitems. - $item->php_getitems = base64_decode($item->php_getitems); - } - if (!empty($item->php_import)) { // base64 Decode php_import. @@ -208,12 +214,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_postsavehook = base64_decode($item->php_postsavehook); } - if (!empty($item->php_batchmove)) - { - // base64 Decode php_batchmove. - $item->php_batchmove = base64_decode($item->php_batchmove); - } - if (!empty($item->php_batchcopy)) { // base64 Decode php_batchcopy. @@ -383,7 +383,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxzlinked_components() + public function getVxzcustom_import() { // Get the user object. $user = JFactory::getUser(); @@ -490,8 +490,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin // Check for existing item. // Modify the form based on Edit State access controls. - if ($id != 0 && (!$user->authorise('core.edit.state', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('core.edit.state', 'com_componentbuilder'))) + if ($id != 0 && (!$user->authorise('admin_view.edit.state', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.state', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); @@ -507,7 +507,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $form->setValue('created_by', null, $user->id); } // Modify the form based on Edit Creaded By access controls. - if (!$user->authorise('core.edit.created_by', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_view.edit.created_by', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.created_by', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); @@ -517,7 +518,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $form->setFieldAttribute('created_by', 'filter', 'unset'); } // Modify the form based on Edit Creaded Date access controls. - if (!$user->authorise('core.edit.created', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_view.edit.created', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.created', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); @@ -571,7 +573,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $user = JFactory::getUser(); // The record has been set. Check the record permissions. - return $user->authorise('core.delete', 'com_componentbuilder.admin_view.' . (int) $record->id); + return $user->authorise('admin_view.delete', 'com_componentbuilder.admin_view.' . (int) $record->id); } return false; } @@ -593,14 +595,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit.state', 'com_componentbuilder.admin_view.' . (int) $recordId); + $permission = $user->authorise('admin_view.edit.state', 'com_componentbuilder.admin_view.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } // In the absense of better information, revert to the component permissions. - return parent::canEditState($record); + return $user->authorise('admin_view.edit.state', 'com_componentbuilder'); } /** @@ -615,8 +617,9 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin protected function allowEdit($data = array(), $key = 'id') { // Check specific edit permission then general edit permission. + $user = JFactory::getUser(); - return JFactory::getUser()->authorise('core.edit', 'com_componentbuilder.admin_view.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or parent::allowEdit($data, $key); + return $user->authorise('admin_view.edit', 'com_componentbuilder.admin_view.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('admin_view.edit', 'com_componentbuilder'); } /** @@ -904,7 +907,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_view'); } - if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_view.create') && !$this->canDo->get('admin_view.batch')) { return false; } @@ -919,7 +922,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin { $values['published'] = 0; } - elseif (isset($values['published']) && !$this->canDo->get('core.edit.state')) + elseif (isset($values['published']) && !$this->canDo->get('admin_view.edit.state')) { $values['published'] = 0; } @@ -936,7 +939,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin // only allow copy if user may edit this item. - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_view.edit', $contexts[$pk])) { @@ -1051,14 +1054,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_view'); } - if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_view.edit') && !$this->canDo->get('admin_view.batch')) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); return false; } // make sure published only updates if user has the permission. - if (isset($values['published']) && !$this->canDo->get('core.edit.state')) + if (isset($values['published']) && !$this->canDo->get('admin_view.edit.state')) { unset($values['published']); } @@ -1068,7 +1071,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin // Parent exists so we proceed foreach ($pks as $pk) { - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_view.edit', $contexts[$pk])) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); @@ -1241,10 +1244,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['ajax_input'] = ''; } - // Set the php_after_delete string to base64 string. - if (isset($data['php_after_delete'])) + // Set the php_getitems string to base64 string. + if (isset($data['php_getitems'])) { - $data['php_after_delete'] = base64_encode($data['php_after_delete']); + $data['php_getitems'] = base64_encode($data['php_getitems']); + } + + // Set the php_batchmove string to base64 string. + if (isset($data['php_batchmove'])) + { + $data['php_batchmove'] = base64_encode($data['php_batchmove']); } // Set the php_save string to base64 string. @@ -1253,6 +1262,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_save'] = base64_encode($data['php_save']); } + // Set the php_after_delete string to base64 string. + if (isset($data['php_after_delete'])) + { + $data['php_after_delete'] = base64_encode($data['php_after_delete']); + } + // Set the php_getlistquery string to base64 string. if (isset($data['php_getlistquery'])) { @@ -1271,12 +1286,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_after_publish'] = base64_encode($data['php_after_publish']); } - // Set the php_getitems string to base64 string. - if (isset($data['php_getitems'])) - { - $data['php_getitems'] = base64_encode($data['php_getitems']); - } - // Set the php_import string to base64 string. if (isset($data['php_import'])) { @@ -1301,12 +1310,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_postsavehook'] = base64_encode($data['php_postsavehook']); } - // Set the php_batchmove string to base64 string. - if (isset($data['php_batchmove'])) - { - $data['php_batchmove'] = base64_encode($data['php_batchmove']); - } - // Set the php_batchcopy string to base64 string. if (isset($data['php_batchcopy'])) { diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 7f62d32cd..8ab537601 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php @@ -113,7 +113,24 @@ class ComponentbuilderModelAdmin_views extends JModelList $this->checkInNow(); // load parent items - $items = parent::getItems(); + $items = parent::getItems(); + + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } // return items return $items; @@ -213,20 +230,31 @@ class ComponentbuilderModelAdmin_views extends JModelList // set values to display correctly. if (ComponentbuilderHelper::checkArray($items)) { + // get user object. + $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - // decode php_after_delete - $item->php_after_delete = base64_decode($item->php_after_delete); + $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + // decode php_getitems + $item->php_getitems = base64_decode($item->php_getitems); + // decode php_batchmove + $item->php_batchmove = base64_decode($item->php_batchmove); // decode php_save $item->php_save = base64_decode($item->php_save); + // decode php_after_delete + $item->php_after_delete = base64_decode($item->php_after_delete); // decode php_getlistquery $item->php_getlistquery = base64_decode($item->php_getlistquery); // decode php_allowedit $item->php_allowedit = base64_decode($item->php_allowedit); // decode php_after_publish $item->php_after_publish = base64_decode($item->php_after_publish); - // decode php_getitems - $item->php_getitems = base64_decode($item->php_getitems); // decode php_import $item->php_import = base64_decode($item->php_import); // decode php_getitems_after_all @@ -235,8 +263,6 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->php_before_save = base64_decode($item->php_before_save); // decode php_postsavehook $item->php_postsavehook = base64_decode($item->php_postsavehook); - // decode php_batchmove - $item->php_batchmove = base64_decode($item->php_batchmove); // decode php_batchcopy $item->php_batchcopy = base64_decode($item->php_batchcopy); // decode php_before_publish diff --git a/admin/models/admins_fields.php b/admin/models/admins_fields.php index b375ff59e..8af1845df 100644 --- a/admin/models/admins_fields.php +++ b/admin/models/admins_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.php @@ -99,7 +99,24 @@ class ComponentbuilderModelAdmins_fields extends JModelList $this->checkInNow(); // load parent items - $items = parent::getItems(); + $items = parent::getItems(); + + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('admin_fields.access', 'com_componentbuilder.admin_fields.' . (int) $item->id) && $user->authorise('admin_fields.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } // return items return $items; diff --git a/admin/models/admins_fields_conditions.php b/admin/models/admins_fields_conditions.php index 36979f431..4883cf0c8 100644 --- a/admin/models/admins_fields_conditions.php +++ b/admin/models/admins_fields_conditions.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields_conditions.php @@ -99,7 +99,24 @@ class ComponentbuilderModelAdmins_fields_conditions extends JModelList $this->checkInNow(); // load parent items - $items = parent::getItems(); + $items = parent::getItems(); + + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('admin_fields_conditions.access', 'com_componentbuilder.admin_fields_conditions.' . (int) $item->id) && $user->authorise('admin_fields_conditions.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } // return items return $items; diff --git a/admin/models/ajax.php b/admin/models/ajax.php index b58ba619f..2c2435f15 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 398a23be7..b540dc7ff 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -54,6 +54,9 @@ class ComponentbuilderModelComponentbuilder extends JModelList 'joomla_components.submenu' => 'joomla_component.submenu', 'joomla_components.dashboard_list' => 'joomla_component.dashboard_list', 'joomla_component.dashboard_add' => 'joomla_component.dashboard_add', + 'admin_view.create' => 'admin_view.create', + 'admin_views.access' => 'admin_view.access', + 'admin_view.access' => 'admin_view.access', 'admin_views.submenu' => 'admin_view.submenu', 'admin_views.dashboard_list' => 'admin_view.dashboard_list', 'admin_view.dashboard_add' => 'admin_view.dashboard_add', @@ -124,7 +127,13 @@ class ComponentbuilderModelComponentbuilder extends JModelList 'help_document.access' => 'help_document.access', 'help_documents.submenu' => 'help_document.submenu', 'help_documents.dashboard_list' => 'help_document.dashboard_list', - 'help_document.dashboard_add' => 'help_document.dashboard_add'); + 'help_document.dashboard_add' => 'help_document.dashboard_add', + 'admin_fields.create' => 'admin_fields.create', + 'admins_fields.access' => 'admin_fields.access', + 'admin_fields.access' => 'admin_fields.access', + 'admin_fields_conditions.create' => 'admin_fields_conditions.create', + 'admins_fields_conditions.access' => 'admin_fields_conditions.access', + 'admin_fields_conditions.access' => 'admin_fields_conditions.access'); foreach($viewGroups as $group => $views) { $i = 0; diff --git a/admin/models/field.php b/admin/models/field.php index 3604b418a..bff97fa66 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -166,6 +166,23 @@ class ComponentbuilderModelField extends JModelAdmin { $items = $db->loadObjectList(); + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } + // Filter by addfieldsvvwc in this Repetable Field if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvwc)) { diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 208ef6616..995749d30 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 077fcc271..042704d80 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php @@ -79,7 +79,7 @@ class JFormFieldAdminviews extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create admin_view - if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -92,7 +92,7 @@ class JFormFieldAdminviews extends JFormFieldList '; } // only add if user allowed to edit admin_view - if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index c14e6d885..07238581b 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index ccb86a672..e8a915b16 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php index 66bdb14d5..7d6b9a6ae 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 4b64cd33f..415eebcb4 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index bc69b8833..b007a9ef5 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 666be06d7..51418843b 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index 09df4d3f5..e1eda63ec 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index e60ed4939..a727528f3 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php index 28f9e2073..cbb6ee87b 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicget.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 5cfac4ced..4cd91a92f 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index cbeb0dca4..772ce5fb2 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index 731c207cc..5c6ac133b 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index fba9ce108..a70833672 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/ftps.php b/admin/models/fields/ftps.php index 3ae998a9f..805bcd530 100644 --- a/admin/models/fields/ftps.php +++ b/admin/models/fields/ftps.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ftps.php diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php index 877ca35ea..5fea9c660 100644 --- a/admin/models/fields/lang.php +++ b/admin/models/fields/lang.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage lang.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index b18f26dbb..8b6718eb8 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index e1a17660e..b155075ab 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index dac3d1c10..b69a51766 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index 7ba01126e..3eb187395 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fields/viewtabs.php b/admin/models/fields/viewtabs.php new file mode 100644 index 000000000..39b441769 --- /dev/null +++ b/admin/models/fields/viewtabs.php @@ -0,0 +1,183 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import the list field type +jimport('joomla.form.helper'); +JFormHelper::loadFieldClass('list'); + +/** + * Viewtabs Form Field class for the Componentbuilder component + */ +class JFormFieldViewtabs extends JFormFieldList +{ + /** + * The viewtabs field type. + * + * @var string + */ + public $type = 'viewtabs'; + /** + * Override to add new button + * + * @return string The field input markup. + * + * @since 3.2 + */ + protected function getInput() + { + // see if we should add buttons + $setButton = $this->getAttribute('button'); + // get html + $html = parent::getInput(); + // if true set button + if ($setButton === 'true') + { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $app = JFactory::getApplication(); + $jinput = $app->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } + $user = JFactory::getUser(); + // only add if user allowed to create admin_view + if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build Create button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' + '; + } + // only add if user allowed to edit admin_view + if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for admin_view field. + if (is_array($button) && count($button) > 0) + { + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return '
' .$html . implode('',$button).'
'; + } + } + return $html; + } + + /** + * Method to get a list of options for a list input. + * + * @return array An array of JHtml options. + */ + public function getOptions() + { + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the view name & id + $fieldsID = $jinput->getInt('id', 0); + $db = JFactory::getDBO(); + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.id','a.addtabs'),array('id','addtabs'))); + $query->from($db->quoteName('#__componentbuilder_admin_view', 'a')); + $query->join('LEFT', $db->quoteName('#__componentbuilder_admin_fields', 'b') . ' ON (' . $db->quoteName('a.id') . ' = ' . $db->quoteName('b.admin_view') . ')'); + $query->where($db->quoteName('a.published') . ' >= 1'); + $query->where($db->quoteName('b.id') . ' = ' . (int) $fieldsID); + $query->order('a.addtabs ASC'); + $db->setQuery((string)$query); + $item = $db->loadObject(); + $options = array(); + if (isset($item->addtabs) && strlen($item->addtabs) > 5) + { + $items = json_decode($item->addtabs, true); + $nr = 1; + foreach($items as $itemName) + { + $options[] = JHtml::_('select.option', $nr, $itemName['name']); + $nr++; + } + } + else + { + $options[] = JHtml::_('select.option', 1, JText::_('COM_COMPONENTBUILDER_DETAILS')); + } + return $options; + } +} diff --git a/admin/models/forms/admin_fields.js b/admin/models/forms/admin_fields.js index 9cf522a5d..928ed138a 100644 --- a/admin/models/forms/admin_fields.js +++ b/admin/models/forms/admin_fields.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.js diff --git a/admin/models/forms/admin_fields.xml b/admin/models/forms/admin_fields.xml index ad594989f..9aa2bbc66 100644 --- a/admin/models/forms/admin_fields.xml +++ b/admin/models/forms/admin_fields.xml @@ -112,7 +112,7 @@ name="field" label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_LABEL" description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION" - class="fieldMedium" + class="list_class" multiple="false" required="false" button="false" @@ -200,18 +200,17 @@ description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_DESCRIPTION" class="inputbox" /> - + diff --git a/admin/models/forms/admin_fields_conditions.js b/admin/models/forms/admin_fields_conditions.js index 8622ccdac..3c8108173 100644 --- a/admin/models/forms/admin_fields_conditions.js +++ b/admin/models/forms/admin_fields_conditions.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.js diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 89b4c3c6c..6ed7119c5 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js @@ -1210,36 +1210,6 @@ function addButtonID(type,where){ }) } -function getFieldSelectOptions_server(fieldId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json"; - if(token.length > 0 && fieldId > 0){ - var request = 'token='+token+'&id='+fieldId; - } - return jQuery.ajax({ - type: 'GET', - url: getUrl, - dataType: 'jsonp', - data: request, - jsonp: 'callback' - }); -} - -function getFieldSelectOptions(fieldKey, table_, nr_){ - // first check if the field is set - if(jQuery("#jform_addconditions"+table_+"_addconditions"+fieldKey+nr_+"_match_field").length) { - var fieldId = jQuery("#jform_addconditions"+table_+"_addconditions"+fieldKey+nr_+"_match_field option:selected").val(); - getFieldSelectOptions_server(fieldId).done(function(result) { - if(result){ - jQuery('textarea#jform_addconditions'+table_+'_addconditions'+fieldKey+nr_+'_match_options').val(result); - } - else - { - jQuery('textarea#jform_addconditions'+table_+'_addconditions'+fieldKey+nr_+'_match_options').val(''); - } - }); - } -} - function getTableColumns_server(tableName){ var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json"; if(token.length > 0 && tableName.length > 0){ diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index 1966c1cc8..92b12974c 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -140,6 +140,69 @@ message="Error! Please add some short description here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> + + + + + + + + + + + + + + + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY - + @@ -193,6 +284,19 @@ filter="HTML" hint="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT" /> + + + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - + + + + + @@ -431,17 +476,17 @@ /> - + @@ -523,51 +568,6 @@ /> - - - - - - - - loadObjectList(); + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } + // Filter by id Repetable Field $idvvvv = json_decode($this->idvvvv,true); if (ComponentbuilderHelper::checkArray($items) && isset($idvvvv) && ComponentbuilderHelper::checkArray($idvvvv)) diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 2973d4c02..2a802b4ec 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -233,8 +233,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( KEY `idx_name_single` (`name_single`), KEY `idx_name_list` (`name_list`), KEY `idx_type` (`type`), - KEY `idx_add_fadein` (`add_fadein`), KEY `idx_source` (`source`), + KEY `idx_add_fadein` (`add_fadein`), KEY `idx_add_css_view` (`add_css_view`), KEY `idx_add_css_views` (`add_css_views`), KEY `idx_add_php_getitems` (`add_php_getitems`), diff --git a/admin/tables/admin_fields.php b/admin/tables/admin_fields.php index 3844b96b0..be7966ad2 100644 --- a/admin/tables/admin_fields.php +++ b/admin/tables/admin_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php diff --git a/admin/tables/admin_fields_conditions.php b/admin/tables/admin_fields_conditions.php index 325ed90f1..2e9a91d8e 100644 --- a/admin/tables/admin_fields_conditions.php +++ b/admin/tables/admin_fields_conditions.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.php diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index 36b2716ec..11ec3bec8 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/views/admin_fields/submitbutton.js b/admin/views/admin_fields/submitbutton.js index 54a0326b1..c21683f90 100644 --- a/admin/views/admin_fields/submitbutton.js +++ b/admin/views/admin_fields/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_fields/tmpl/edit.php b/admin/views/admin_fields/tmpl/edit.php index bfdc5fa9f..36dccbac8 100644 --- a/admin/views/admin_fields/tmpl/edit.php +++ b/admin/views/admin_fields/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage edit.php @@ -73,7 +73,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
- canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?> + canDo->get('admin_fields.delete') || $this->canDo->get('admin_fields.edit.created_by') || $this->canDo->get('admin_fields.edit.state') || $this->canDo->get('admin_fields.edit.created')) : ?>
diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php index 3df6e00d9..97ea09447 100644 --- a/admin/views/admin_fields/view.html.php +++ b/admin/views/admin_fields/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php @@ -95,12 +95,12 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy // Built the actions for new and existing records. if ($this->refid || $this->ref) { - if ($this->canDo->get('core.create') && $isNew) + if ($this->canDo->get('admin_fields.create') && $isNew) { // We can create the record. JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE'); } - elseif ($this->canDo->get('core.edit')) + elseif ($this->canDo->get('admin_fields.edit')) { // We can save the record. JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE'); @@ -121,7 +121,7 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy if ($isNew) { // For new records, check the create permission. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields.create')) { JToolBarHelper::apply('admin_fields.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE'); @@ -131,24 +131,24 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy } else { - if ($this->canDo->get('core.edit')) + if ($this->canDo->get('admin_fields.edit')) { // We can save the new record JToolBarHelper::apply('admin_fields.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE'); // We can save this record, but check the create permission to see // if we can return to make a new one. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields.create')) { JToolBarHelper::custom('admin_fields.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false); } } $canVersion = ($this->canDo->get('core.version') && $this->canDo->get('admin_fields.version')); - if ($this->state->params->get('save_history', 1) && $this->canDo->get('core.edit') && $canVersion) + if ($this->state->params->get('save_history', 1) && $this->canDo->get('admin_fields.edit') && $canVersion) { JToolbarHelper::versions('com_componentbuilder.admin_fields', $this->item->id); } - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields.create')) { JToolBarHelper::custom('admin_fields.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false); } diff --git a/admin/views/admin_fields_conditions/submitbutton.js b/admin/views/admin_fields_conditions/submitbutton.js index 77f5ff29d..ffe514063 100644 --- a/admin/views/admin_fields_conditions/submitbutton.js +++ b/admin/views/admin_fields_conditions/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_fields_conditions/tmpl/edit.php b/admin/views/admin_fields_conditions/tmpl/edit.php index 9d7cef97c..901a67fbb 100644 --- a/admin/views/admin_fields_conditions/tmpl/edit.php +++ b/admin/views/admin_fields_conditions/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage edit.php @@ -73,7 +73,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
- canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?> + canDo->get('admin_fields_conditions.delete') || $this->canDo->get('admin_fields_conditions.edit.created_by') || $this->canDo->get('admin_fields_conditions.edit.state') || $this->canDo->get('admin_fields_conditions.edit.created')) : ?>
diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php index 1b57c25f3..a680033b8 100644 --- a/admin/views/admin_fields_conditions/view.html.php +++ b/admin/views/admin_fields_conditions/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php @@ -95,12 +95,12 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy // Built the actions for new and existing records. if ($this->refid || $this->ref) { - if ($this->canDo->get('core.create') && $isNew) + if ($this->canDo->get('admin_fields_conditions.create') && $isNew) { // We can create the record. JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE'); } - elseif ($this->canDo->get('core.edit')) + elseif ($this->canDo->get('admin_fields_conditions.edit')) { // We can save the record. JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE'); @@ -121,7 +121,7 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy if ($isNew) { // For new records, check the create permission. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields_conditions.create')) { JToolBarHelper::apply('admin_fields_conditions.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE'); @@ -131,24 +131,24 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy } else { - if ($this->canDo->get('core.edit')) + if ($this->canDo->get('admin_fields_conditions.edit')) { // We can save the new record JToolBarHelper::apply('admin_fields_conditions.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE'); // We can save this record, but check the create permission to see // if we can return to make a new one. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields_conditions.create')) { JToolBarHelper::custom('admin_fields_conditions.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false); } } $canVersion = ($this->canDo->get('core.version') && $this->canDo->get('admin_fields_conditions.version')); - if ($this->state->params->get('save_history', 1) && $this->canDo->get('core.edit') && $canVersion) + if ($this->state->params->get('save_history', 1) && $this->canDo->get('admin_fields_conditions.edit') && $canVersion) { JToolbarHelper::versions('com_componentbuilder.admin_fields_conditions', $this->item->id); } - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields_conditions.create')) { JToolBarHelper::custom('admin_fields_conditions.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false); } diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index cae0aeee3..a574d91eb 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index 6c6ee899b..142428597 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -58,18 +58,28 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+ - canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?> + canDo->get('admin_view.delete') || $this->canDo->get('admin_view.edit.created_by') || $this->canDo->get('admin_view.edit.state') || $this->canDo->get('admin_view.edit.created')) : ?>
@@ -210,7 +210,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
- +
@@ -701,7 +701,6 @@ jQuery('input.form-field-repeatable').on('row-add', function (e) { }); }); item->addtables) + 3, 1);?> -item->addconditions) + 3, 1);?> // for the values already set jQuery(document).ready(function(){ @@ -710,23 +709,12 @@ jQuery(document).ready(function(){ e.preventDefault(); getTableColumns(, "_", "_"); }); - - - jQuery('#adminForm').on('change', '#jform_addconditions__addconditions__match_field',function (e) { - e.preventDefault(); - getFieldSelectOptions(, "_", "_"); - }); jQuery(document).on('subform-row-add', function(event, row){ var groupName = jQuery(row).data('group'); var fieldName = groupName.replace(/([0-9])/g, ''); var fieldNr = groupName.replace(/([A-z_])/g, ''); - if ('addconditions' === fieldName) { - jQuery('#adminForm').on('change', '#jform_addconditions_addconditions'+fieldNr+'_match_field',function (e) { - e.preventDefault(); - getFieldSelectOptions(fieldNr, "", ""); - }); - } else if ('addtables' === fieldName) { + if ('addtables' === fieldName) { jQuery('#adminForm').on('change', '#jform_addtables_addtables'+fieldNr+'_table',function (e) { e.preventDefault(); getTableColumns(fieldNr, "", ""); diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index 57ba5200e..de0fd5bd6 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -71,7 +71,7 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy } // Get Linked view data - $this->vxzlinked_components = $this->get('Vxzlinked_components'); + $this->vxzcustom_import = $this->get('Vxzcustom_import'); // Set the toolbar $this->addToolBar(); @@ -98,12 +98,12 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy // Built the actions for new and existing records. if ($this->refid || $this->ref) { - if ($this->canDo->get('core.create') && $isNew) + if ($this->canDo->get('admin_view.create') && $isNew) { // We can create the record. JToolBarHelper::save('admin_view.save', 'JTOOLBAR_SAVE'); } - elseif ($this->canDo->get('core.edit')) + elseif ($this->canDo->get('admin_view.edit')) { // We can save the record. JToolBarHelper::save('admin_view.save', 'JTOOLBAR_SAVE'); @@ -124,7 +124,7 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy if ($isNew) { // For new records, check the create permission. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_view.create')) { JToolBarHelper::apply('admin_view.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_view.save', 'JTOOLBAR_SAVE'); @@ -134,24 +134,24 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy } else { - if ($this->canDo->get('core.edit')) + if ($this->canDo->get('admin_view.edit')) { // We can save the new record JToolBarHelper::apply('admin_view.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_view.save', 'JTOOLBAR_SAVE'); // We can save this record, but check the create permission to see // if we can return to make a new one. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_view.create')) { JToolBarHelper::custom('admin_view.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false); } } $canVersion = ($this->canDo->get('core.version') && $this->canDo->get('admin_view.version')); - if ($this->state->params->get('save_history', 1) && $this->canDo->get('core.edit') && $canVersion) + if ($this->state->params->get('save_history', 1) && $this->canDo->get('admin_view.edit') && $canVersion) { JToolbarHelper::versions('com_componentbuilder.admin_view', $this->item->id); } - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_view.create')) { JToolBarHelper::custom('admin_view.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false); } diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 08963f4ce..333dd2903 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index c6823b8ee..1637f9576 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index 0a7049877..ad0df7a3f 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 34821aa92..7d20fdeec 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php @@ -37,7 +37,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view. ?> - get('core.edit.state')): ?> + get('admin_view.edit.state')): ?> saveOrder) { @@ -60,7 +60,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view. - get('core.edit')): ?> + get('admin_view.edit')): ?> checked_out) : ?> id); ?> @@ -75,7 +75,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view. - get('core.edit')): ?> + get('admin_view.edit')): ?>
escape($item->system_name); ?> checked_out): ?> @@ -96,7 +96,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view. escape($item->short_description); ?> - get('core.edit.state')) : ?> + get('admin_view.edit.state')) : ?> checked_out) : ?> published, $i, 'admin_views.', true, 'cb'); ?> diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index b773b3c39..7b0a81b90 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index a0c6bafe4..1ac0764a6 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index 60efa9f19..e34e2f285 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 0c6bf5c67..a762b480e 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -63,10 +63,10 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_view'); - $this->canEdit = $this->canDo->get('core.edit'); - $this->canState = $this->canDo->get('core.edit.state'); - $this->canCreate = $this->canDo->get('core.create'); - $this->canDelete = $this->canDo->get('core.delete'); + $this->canEdit = $this->canDo->get('admin_view.edit'); + $this->canState = $this->canDo->get('admin_view.edit.state'); + $this->canCreate = $this->canDo->get('admin_view.create'); + $this->canDelete = $this->canDo->get('admin_view.delete'); $this->canBatch = $this->canDo->get('core.batch'); // We don't need toolbar in the modal window. diff --git a/admin/views/admins_fields/tmpl/default.php b/admin/views/admins_fields/tmpl/default.php index 5b25bcdfc..8c10e71a0 100644 --- a/admin/views/admins_fields/tmpl/default.php +++ b/admin/views/admins_fields/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default.php diff --git a/admin/views/admins_fields/tmpl/default_batch_body.php b/admin/views/admins_fields/tmpl/default_batch_body.php index f243f29f4..7d50c139c 100644 --- a/admin/views/admins_fields/tmpl/default_batch_body.php +++ b/admin/views/admins_fields/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admins_fields/tmpl/default_batch_footer.php b/admin/views/admins_fields/tmpl/default_batch_footer.php index a86f3180a..519b8f44a 100644 --- a/admin/views/admins_fields/tmpl/default_batch_footer.php +++ b/admin/views/admins_fields/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admins_fields/tmpl/default_body.php b/admin/views/admins_fields/tmpl/default_body.php index c1e76b3b7..af9016d1f 100644 --- a/admin/views/admins_fields/tmpl/default_body.php +++ b/admin/views/admins_fields/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_body.php @@ -37,7 +37,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie ?> - get('core.edit.state')): ?> + get('admin_fields.edit.state')): ?> saveOrder) { @@ -60,7 +60,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie - get('core.edit')): ?> + get('admin_fields.edit')): ?> checked_out) : ?> id); ?> @@ -75,7 +75,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie - get('core.edit')): ?> + get('admin_fields.edit')): ?>
escape($item->admin_view_system_name); ?> checked_out): ?> @@ -87,7 +87,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie - get('core.edit.state')) : ?> + get('admin_fields.edit.state')) : ?> checked_out) : ?> published, $i, 'admins_fields.', true, 'cb'); ?> diff --git a/admin/views/admins_fields/tmpl/default_foot.php b/admin/views/admins_fields/tmpl/default_foot.php index 14c246781..22c4ae8e9 100644 --- a/admin/views/admins_fields/tmpl/default_foot.php +++ b/admin/views/admins_fields/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admins_fields/tmpl/default_head.php b/admin/views/admins_fields/tmpl/default_head.php index fd51f7619..598a73fab 100644 --- a/admin/views/admins_fields/tmpl/default_head.php +++ b/admin/views/admins_fields/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admins_fields/tmpl/default_toolbar.php b/admin/views/admins_fields/tmpl/default_toolbar.php index ea56ff939..ef18d1197 100644 --- a/admin/views/admins_fields/tmpl/default_toolbar.php +++ b/admin/views/admins_fields/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php index d274e3b14..abde65254 100644 --- a/admin/views/admins_fields/view.html.php +++ b/admin/views/admins_fields/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php @@ -63,10 +63,10 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_fields'); - $this->canEdit = $this->canDo->get('core.edit'); - $this->canState = $this->canDo->get('core.edit.state'); - $this->canCreate = $this->canDo->get('core.create'); - $this->canDelete = $this->canDo->get('core.delete'); + $this->canEdit = $this->canDo->get('admin_fields.edit'); + $this->canState = $this->canDo->get('admin_fields.edit.state'); + $this->canCreate = $this->canDo->get('admin_fields.create'); + $this->canDelete = $this->canDo->get('admin_fields.delete'); $this->canBatch = $this->canDo->get('core.batch'); // We don't need toolbar in the modal window. diff --git a/admin/views/admins_fields_conditions/tmpl/default.php b/admin/views/admins_fields_conditions/tmpl/default.php index 4ee4db719..5b018810f 100644 --- a/admin/views/admins_fields_conditions/tmpl/default.php +++ b/admin/views/admins_fields_conditions/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_batch_body.php b/admin/views/admins_fields_conditions/tmpl/default_batch_body.php index f22a9312e..081525861 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_batch_body.php +++ b/admin/views/admins_fields_conditions/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php b/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php index 6098671c3..3e187df90 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php +++ b/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_body.php b/admin/views/admins_fields_conditions/tmpl/default_body.php index 40d1b93b5..db4781076 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_body.php +++ b/admin/views/admins_fields_conditions/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_body.php @@ -37,7 +37,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas ?> - get('core.edit.state')): ?> + get('admin_fields_conditions.edit.state')): ?> saveOrder) { @@ -60,7 +60,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas - get('core.edit')): ?> + get('admin_fields_conditions.edit')): ?> checked_out) : ?> id); ?> @@ -75,7 +75,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas - get('core.edit')): ?> + get('admin_fields_conditions.edit')): ?>
escape($item->admin_view_system_name); ?> checked_out): ?> @@ -87,7 +87,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas - get('core.edit.state')) : ?> + get('admin_fields_conditions.edit.state')) : ?> checked_out) : ?> published, $i, 'admins_fields_conditions.', true, 'cb'); ?> diff --git a/admin/views/admins_fields_conditions/tmpl/default_foot.php b/admin/views/admins_fields_conditions/tmpl/default_foot.php index 1a9390954..9f7ea8e35 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_foot.php +++ b/admin/views/admins_fields_conditions/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_head.php b/admin/views/admins_fields_conditions/tmpl/default_head.php index 8e11541e3..8d7da6e5f 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_head.php +++ b/admin/views/admins_fields_conditions/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_toolbar.php b/admin/views/admins_fields_conditions/tmpl/default_toolbar.php index 689f1b1be..a66f9806a 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_toolbar.php +++ b/admin/views/admins_fields_conditions/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php index 88d376d34..cc52def31 100644 --- a/admin/views/admins_fields_conditions/view.html.php +++ b/admin/views/admins_fields_conditions/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php @@ -63,10 +63,10 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions'); - $this->canEdit = $this->canDo->get('core.edit'); - $this->canState = $this->canDo->get('core.edit.state'); - $this->canCreate = $this->canDo->get('core.create'); - $this->canDelete = $this->canDo->get('core.delete'); + $this->canEdit = $this->canDo->get('admin_fields_conditions.edit'); + $this->canState = $this->canDo->get('admin_fields_conditions.edit.state'); + $this->canCreate = $this->canDo->get('admin_fields_conditions.create'); + $this->canDelete = $this->canDo->get('admin_fields_conditions.delete'); $this->canBatch = $this->canDo->get('core.batch'); // We don't need toolbar in the modal window. diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index 851467d0b..ea070e90c 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php index af61463e9..b95e59c67 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php index 1754bc554..ffd5587c8 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index cc3e2ebf9..600e5e1c8 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index 80a81d560..855e2ccf1 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_releases_information.php b/admin/views/componentbuilder/tmpl/default_releases_information.php index 7e3b432eb..56f13c84a 100644 --- a/admin/views/componentbuilder/tmpl/default_releases_information.php +++ b/admin/views/componentbuilder/tmpl/default_releases_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_releases_information.php diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index 56f392398..8fa32700c 100644 --- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index 711e75582..cda38364f 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php index 886658f4f..4ea6d51aa 100644 --- a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php +++ b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_wiki_tutorials.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index bbf827606..7657436b0 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php index fb6a79631..ff1cb5057 100644 --- a/admin/views/field/tmpl/edit.php +++ b/admin/views/field/tmpl/edit.php @@ -89,6 +89,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+ canDo->get('admin_view.access')) : ?>
@@ -98,6 +99,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+ canDo->get('field.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('field.edit.state') || $this->canDo->get('core.edit.created')) : ?> diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index d5938ef12..20c58b4c1 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 7d9c21522..4ddeb7717 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php index 9dc1ae7a6..895080f85 100644 --- a/admin/views/import_joomla_components/tmpl/default.php +++ b/admin/views/import_joomla_components/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index 6052ad0b2..3ebffdcae 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php index f7e3861e5..790781657 100644 --- a/admin/views/joomla_component/tmpl/edit.php +++ b/admin/views/joomla_component/tmpl/edit.php @@ -126,6 +126,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+ canDo->get('admin_view.access')) : ?>
@@ -135,6 +136,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+ canDo->get('custom_admin_view.access')) : ?> diff --git a/componentbuilder.xml b/componentbuilder.xml index 0619529d2..2488816da 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 12th October, 2017 + 13th October, 2017 Llewellyn van der Merwe joomla@vdm.io http://vdm.bz/component-builder diff --git a/script.php b/script.php index 6f45f4128..50c0e6097 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage script.php @@ -2045,9 +2045,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_after_delete":"php_after_delete","type":"type","php_save":"php_save","description":"description","add_fadein":"add_fadein","icon":"icon","php_getlistquery":"php_getlistquery","icon_add":"icon_add","php_allowedit":"php_allowedit","icon_category":"icon_category","php_after_publish":"php_after_publish","source":"source","php_getitems":"php_getitems","php_import":"php_import","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchmove":"php_batchmove","php_batchcopy":"php_batchcopy","not_required":"not_required","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","add_fadein","source","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $admin_view_Inserted = $db->insertObject('#__content_types', $admin_view); @@ -2316,9 +2316,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_after_delete":"php_after_delete","type":"type","php_save":"php_save","description":"description","add_fadein":"add_fadein","icon":"icon","php_getlistquery":"php_getlistquery","icon_add":"icon_add","php_allowedit":"php_allowedit","icon_category":"icon_category","php_after_publish":"php_after_publish","source":"source","php_getitems":"php_getitems","php_import":"php_import","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchmove":"php_batchmove","php_batchcopy":"php_batchcopy","not_required":"not_required","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","add_fadein","source","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Check if admin_view type is already in content_type DB. $admin_view_id = null; diff --git a/site/assets/css/site.css b/site/assets/css/site.css index c12dee686..5d0859fa0 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 1ed4a4e6d..f66ccb8ce 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.js diff --git a/site/componentbuilder.php b/site/componentbuilder.php index 56a0a307c..1f077c663 100644 --- a/site/componentbuilder.php +++ b/site/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/controller.php b/site/controller.php index 3077d6d80..ba6492d71 100644 --- a/site/controller.php +++ b/site/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/site/controllers/api.php b/site/controllers/api.php index 3a7736456..45b94e69d 100644 --- a/site/controllers/api.php +++ b/site/controllers/api.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage api.php diff --git a/site/controllers/help.php b/site/controllers/help.php index ba87c50ca..f2940c85d 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/site/helpers/category.php b/site/helpers/category.php index aa3428827..20e0b527d 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage category.php diff --git a/site/helpers/categoryfields.php b/site/helpers/categoryfields.php index 4ee508df4..4a25e651e 100644 --- a/site/helpers/categoryfields.php +++ b/site/helpers/categoryfields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfields.php diff --git a/site/helpers/categoryfieldtypes.php b/site/helpers/categoryfieldtypes.php index 50cc10ff8..6af242d73 100644 --- a/site/helpers/categoryfieldtypes.php +++ b/site/helpers/categoryfieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfieldtypes.php diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index f59315795..4719eda6c 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 1bcdda490..76e526aec 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 45ca13550..7ee4a1519 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage route.php diff --git a/site/router.php b/site/router.php index ab1396aab..d48ae9abc 100644 --- a/site/router.php +++ b/site/router.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage router.php diff --git a/site/views/api/submitbutton.js b/site/views/api/submitbutton.js index 96d0cbfbb..b3aa700e5 100644 --- a/site/views/api/submitbutton.js +++ b/site/views/api/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js -- 2.40.1 From f7b168d7629e88a9605cabbca053b911959b4886 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 13 Oct 2017 05:51:56 +0200 Subject: [PATCH 05/14] Fixed tab line-up so the linked component in the admin_view will show again --- README.md | 4 +- admin/README.txt | 4 +- .../en-GB/en-GB.com_componentbuilder.ini | 1 + .../admin_view/custom_import_fullwidth.php | 128 +++------------- .../linked_components_fullwidth.php | 138 ++++++++++++++++++ admin/models/admin_view.php | 2 +- admin/views/admin_view/tmpl/edit.php | 12 +- admin/views/admin_view/view.html.php | 2 +- 8 files changed, 179 insertions(+), 112 deletions(-) create mode 100644 admin/layouts/admin_view/linked_components_fullwidth.php diff --git a/README.md b/README.md index b7f6a6663..ed38754aa 100644 --- a/README.md +++ b/README.md @@ -114,8 +114,8 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **123911** -+ *File count*: **741** ++ *Line count*: **123978** ++ *File count*: **742** + *Folder count*: **129** > 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 b7f6a6663..ed38754aa 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -114,8 +114,8 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **123911** -+ *File count*: **741** ++ *Line count*: **123978** ++ *File count*: **742** + *Folder count*: **129** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 1fc25c5b8..51b712f06 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -532,6 +532,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL="Child Key" COM_COMPONENTBUILDER_ADMIN_VIEW_LAMP="Lamp" COM_COMPONENTBUILDER_ADMIN_VIEW_LAST="Last" COM_COMPONENTBUILDER_ADMIN_VIEW_LINK="Link" +COM_COMPONENTBUILDER_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST="List" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_TWO="List 2" COM_COMPONENTBUILDER_ADMIN_VIEW_LOCATION="Location" diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index 197d3d232..cc59ec308 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -27,112 +27,30 @@ defined('_JEXEC') or die('Restricted access'); -// set the defaults -$items = $displayData->vxzcustom_import; -$user = JFactory::getUser(); -$id = $displayData->item->id; -$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'note_beginner_import', + 'note_advanced_import', + 'add_custom_import', + 'php_import_display', + 'html_import_view', + 'php_import', + 'php_import_setdata', + 'php_import_save', + 'php_import_ext' +); ?>
- - - - - - - - - - - - - - - - $item): ?> - authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; - $userChkOut = JFactory::getUser($item->checked_out); - $canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components'); - ?> - - - - - - - - published == 1):?> - - published == 0):?> - - published == 2):?> - - published == -2):?> - - - - - - -
- - - - - - - - - - - - - - - -
- get('core.edit')): ?> - escape($item->system_name); ?> - checked_out): ?> - name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> - - -
escape($item->system_name); ?>
- - 		- escape($item->name_code); ?> - - escape($item->component_version); ?> - - escape($item->short_description); ?> - - escape($item->companyname); ?> - - escape($item->author); ?> - - - - - - - - - - - - - - - - - - id; ?> -
- -
- -
- + +
+
+ getLabel($field); ?> +
+
+ getInput($field); ?> +
+
+
diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php new file mode 100644 index 000000000..7a64979a0 --- /dev/null +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -0,0 +1,138 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +// set the defaults +$items = $displayData->vxzlinked_components; +$user = JFactory::getUser(); +$id = $displayData->item->id; +$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; + +?> +
+ + + + + + + + + + + + + + + + $item): ?> + authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; + $userChkOut = JFactory::getUser($item->checked_out); + $canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components'); + ?> + + + + + + + + published == 1):?> + + published == 0):?> + + published == 2):?> + + published == -2):?> + + + + + + +
+ + + + + + + + + + + + + + + +
+ get('core.edit')): ?> + escape($item->system_name); ?> + checked_out): ?> + name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> + + +
escape($item->system_name); ?>
+ + 		+ escape($item->name_code); ?> + + escape($item->component_version); ?> + + escape($item->short_description); ?> + + escape($item->companyname); ?> + + escape($item->author); ?> + + + + + + + + + + + + + + + + + + id; ?> +
+ +
+ +
+ +
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 94beb47e6..85b2da546 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -383,7 +383,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxzcustom_import() + public function getVxzlinked_components() { // Get the user object. $user = JFactory::getUser(); diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index 142428597..4cda93677 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -157,6 +157,17 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder'); canDo->get('joomla_component.access')) : ?> + +
+
+
+
+ +
+
+ + +
@@ -166,7 +177,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder'); - canDo->get('admin_view.delete') || $this->canDo->get('admin_view.edit.created_by') || $this->canDo->get('admin_view.edit.state') || $this->canDo->get('admin_view.edit.created')) : ?> diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index de0fd5bd6..8ebd9e7d1 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -71,7 +71,7 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy } // Get Linked view data - $this->vxzcustom_import = $this->get('Vxzcustom_import'); + $this->vxzlinked_components = $this->get('Vxzlinked_components'); // Set the toolbar $this->addToolBar(); -- 2.40.1 From 2b7914f05daf7309fb93f0bbb16ad4aedec9bcc8 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sat, 14 Oct 2017 05:37:18 +0200 Subject: [PATCH 06/14] Added field fix in models to help with the change from repeatable fields to subform fields. Added ajax to load admin fields and conditions into the admin view. --- README.md | 4 +- admin/README.txt | 4 +- admin/assets/css/admin.css | 2 +- admin/assets/css/admin_fields.css | 2 +- admin/assets/css/admin_fields_conditions.css | 2 +- admin/assets/css/admin_view.css | 4 +- admin/assets/css/admin_views.css | 4 +- admin/assets/css/admins_fields.css | 2 +- admin/assets/css/admins_fields_conditions.css | 2 +- admin/assets/css/compiler.css | 4 +- admin/assets/css/custom_admin_view.css | 4 +- admin/assets/css/custom_admin_views.css | 4 +- admin/assets/css/custom_code.css | 4 +- admin/assets/css/custom_codes.css | 4 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/fieldtype.css | 4 +- admin/assets/css/fieldtypes.css | 4 +- admin/assets/css/site_view.css | 4 +- admin/assets/css/site_views.css | 4 +- admin/assets/js/admin.js | 2 +- admin/componentbuilder.php | 2 +- admin/controller.php | 2 +- admin/controllers/admin_fields.php | 2 +- admin/controllers/admin_fields_conditions.php | 2 +- admin/controllers/admin_view.php | 4 +- admin/controllers/admin_views.php | 4 +- admin/controllers/admins_fields.php | 2 +- .../controllers/admins_fields_conditions.php | 2 +- admin/controllers/ajax.json.php | 41 ++- admin/controllers/compiler.php | 4 +- admin/controllers/componentbuilder.php | 2 +- admin/controllers/custom_admin_view.php | 4 +- admin/controllers/custom_admin_views.php | 4 +- admin/controllers/custom_code.php | 4 +- admin/controllers/custom_codes.php | 4 +- admin/controllers/fieldtype.php | 4 +- admin/controllers/fieldtypes.php | 4 +- admin/controllers/help.php | 2 +- admin/controllers/import.php | 2 +- .../controllers/import_joomla_components.php | 2 +- admin/controllers/site_view.php | 4 +- admin/controllers/site_views.php | 4 +- admin/helpers/componentbuilder.php | 2 +- admin/helpers/componentbuilderemail.php | 2 +- admin/helpers/headercheck.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/indenter.php | 2 +- admin/helpers/js.php | 2 +- admin/helpers/minify.php | 2 +- .../en-GB/en-GB.com_componentbuilder.ini | 30 +- admin/layouts/admin_fields/fields_above.php | 2 +- .../layouts/admin_fields/fields_fullwidth.php | 2 +- admin/layouts/admin_fields/publishing.php | 2 +- admin/layouts/admin_fields/publlshing.php | 2 +- .../conditions_above.php | 2 +- .../conditions_fullwidth.php | 2 +- .../admin_fields_conditions/publishing.php | 2 +- .../admin_fields_conditions/publlshing.php | 2 +- admin/layouts/admin_view/css_fullwidth.php | 2 +- .../admin_view/custom_buttons_fullwidth.php | 2 +- .../admin_view/custom_buttons_left.php | 2 +- .../admin_view/custom_import_fullwidth.php | 2 +- admin/layouts/admin_view/details_above.php | 2 +- admin/layouts/admin_view/details_left.php | 2 +- admin/layouts/admin_view/details_right.php | 2 +- admin/layouts/admin_view/details_under.php | 2 +- .../fields_conditions_fullwidth.php | 2 +- .../admin_view/fields_conditions_left.php | 2 +- .../admin_view/fields_conditions_right.php | 2 +- .../admin_view/javascript_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_left.php | 2 +- admin/layouts/admin_view/php_fullwidth.php | 2 +- admin/layouts/admin_view/publishing.php | 2 +- admin/layouts/admin_view/publlshing.php | 2 +- .../layouts/admin_view/settings_fullwidth.php | 2 +- admin/layouts/batchselection.php | 2 +- .../custom_buttons_fullwidth.php | 2 +- .../custom_admin_view/custom_buttons_left.php | 2 +- .../custom_script_fullwidth.php | 2 +- .../custom_admin_view/details_above.php | 2 +- .../custom_admin_view/details_fullwidth.php | 2 +- .../custom_admin_view/details_left.php | 2 +- .../custom_admin_view/details_right.php | 2 +- .../custom_admin_view/details_rightside.php | 2 +- .../custom_admin_view/details_under.php | 2 +- .../linked_components_fullwidth.php | 2 +- .../layouts/custom_admin_view/publishing.php | 2 +- .../layouts/custom_admin_view/publlshing.php | 2 +- admin/layouts/custom_code/details_above.php | 2 +- .../layouts/custom_code/details_fullwidth.php | 2 +- admin/layouts/custom_code/details_left.php | 2 +- admin/layouts/custom_code/details_right.php | 2 +- admin/layouts/custom_code/details_under.php | 2 +- admin/layouts/custom_code/publishing.php | 2 +- admin/layouts/custom_code/publlshing.php | 2 +- .../layouts/dynamic_get/abacus_fullwidth.php | 2 +- admin/layouts/dynamic_get/abacus_left.php | 2 +- .../dynamic_get/custom_script_fullwidth.php | 2 +- admin/layouts/dynamic_get/joint_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_above.php | 2 +- admin/layouts/dynamic_get/main_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_left.php | 2 +- admin/layouts/dynamic_get/main_right.php | 2 +- admin/layouts/dynamic_get/main_under.php | 2 +- admin/layouts/dynamic_get/publishing.php | 2 +- admin/layouts/dynamic_get/publlshing.php | 2 +- admin/layouts/field/details_fullwidth.php | 2 +- admin/layouts/field/details_left.php | 2 +- admin/layouts/field/details_right.php | 2 +- admin/layouts/field/details_under.php | 2 +- .../field/linked_admin_views_fullwidth.php | 2 +- admin/layouts/field/publishing.php | 2 +- admin/layouts/field/publlshing.php | 2 +- admin/layouts/field/scripts_left.php | 2 +- admin/layouts/field/scripts_right.php | 2 +- admin/layouts/fieldtype/details_fullwidth.php | 2 +- admin/layouts/fieldtype/details_left.php | 2 +- admin/layouts/fieldtype/details_right.php | 2 +- admin/layouts/fieldtype/fields_fullwidth.php | 2 +- admin/layouts/fieldtype/publishing.php | 2 +- admin/layouts/fieldtype/publlshing.php | 2 +- admin/layouts/ftp/details_above.php | 2 +- admin/layouts/ftp/details_fullwidth.php | 2 +- .../ftp/linked_components_fullwidth.php | 2 +- admin/layouts/ftp/publishing.php | 2 +- admin/layouts/ftp/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- .../admin_views_fullwidth.php | 2 +- .../custom_admin_views_fullwidth.php | 2 +- .../joomla_component/details_above.php | 2 +- .../layouts/joomla_component/details_left.php | 2 +- .../joomla_component/details_right.php | 2 +- .../joomla_component/details_under.php | 2 +- .../dynamic_build_beta_fullwidth.php | 2 +- .../dynamic_integration_fullwidth.php | 2 +- .../libs_helpers_fullwidth.php | 2 +- admin/layouts/joomla_component/metadata.php | 2 +- .../joomla_component/mysql_fullwidth.php | 2 +- .../joomla_component/php_fullwidth.php | 2 +- admin/layouts/joomla_component/publishing.php | 2 +- .../layouts/joomla_component/readme_left.php | 2 +- .../layouts/joomla_component/readme_right.php | 2 +- .../joomla_component/settings_left.php | 2 +- .../joomla_component/settings_right.php | 2 +- .../joomla_component/site_views_fullwidth.php | 2 +- .../translation_fullwidth.php | 2 +- admin/layouts/language/details_left.php | 2 +- admin/layouts/language/details_right.php | 2 +- admin/layouts/language/publishing.php | 2 +- admin/layouts/language/publlshing.php | 2 +- .../language_translation/details_above.php | 2 +- .../details_fullwidth.php | 2 +- .../language_translation/publishing.php | 2 +- .../language_translation/publlshing.php | 2 +- .../layout/custom_script_fullwidth.php | 2 +- admin/layouts/layout/details_fullwidth.php | 2 +- admin/layouts/layout/details_left.php | 2 +- admin/layouts/layout/details_right.php | 2 +- admin/layouts/layout/details_rightside.php | 2 +- admin/layouts/layout/details_under.php | 2 +- admin/layouts/layout/publishing.php | 2 +- admin/layouts/layout/publlshing.php | 2 +- .../site_view/custom_buttons_fullwidth.php | 2 +- .../layouts/site_view/custom_buttons_left.php | 2 +- .../site_view/custom_buttons_right.php | 2 +- admin/layouts/site_view/details_above.php | 2 +- admin/layouts/site_view/details_fullwidth.php | 2 +- admin/layouts/site_view/details_left.php | 2 +- admin/layouts/site_view/details_right.php | 2 +- admin/layouts/site_view/details_rightside.php | 2 +- admin/layouts/site_view/details_under.php | 2 +- .../site_view/javascript_css_fullwidth.php | 2 +- .../site_view/linked_components_fullwidth.php | 2 +- admin/layouts/site_view/php_fullwidth.php | 2 +- admin/layouts/site_view/publishing.php | 2 +- admin/layouts/site_view/publlshing.php | 2 +- admin/layouts/snippet/details_above.php | 2 +- admin/layouts/snippet/details_left.php | 2 +- admin/layouts/snippet/details_right.php | 2 +- admin/layouts/snippet/publishing.php | 2 +- admin/layouts/snippet/publlshing.php | 2 +- .../template/custom_script_fullwidth.php | 2 +- admin/layouts/template/details_fullwidth.php | 2 +- admin/layouts/template/details_left.php | 2 +- admin/layouts/template/details_right.php | 2 +- admin/layouts/template/details_rightside.php | 2 +- admin/layouts/template/details_under.php | 2 +- admin/layouts/template/publishing.php | 2 +- admin/layouts/template/publlshing.php | 2 +- admin/models/admin_fields.php | 2 +- admin/models/admin_fields_conditions.php | 2 +- admin/models/admin_view.php | 103 +++++- admin/models/admin_views.php | 4 +- admin/models/admins_fields.php | 2 +- admin/models/admins_fields_conditions.php | 2 +- admin/models/ajax.php | 333 +++++++++++++++++- admin/models/compiler.php | 4 +- admin/models/componentbuilder.php | 2 +- admin/models/custom_admin_view.php | 25 +- admin/models/custom_admin_views.php | 4 +- admin/models/custom_code.php | 4 +- admin/models/custom_codes.php | 4 +- admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/adminviews.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/component.php | 2 +- admin/models/fields/components.php | 2 +- admin/models/fields/customadminviews.php | 2 +- admin/models/fields/customfilelist.php | 2 +- admin/models/fields/customfolderlist.php | 2 +- admin/models/fields/customgets.php | 2 +- admin/models/fields/dbtables.php | 2 +- admin/models/fields/dynamicget.php | 2 +- admin/models/fields/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldsmulti.php | 2 +- admin/models/fields/fieldtypes.php | 2 +- admin/models/fields/ftps.php | 2 +- admin/models/fields/lang.php | 2 +- admin/models/fields/maingets.php | 2 +- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/fields/siteviews.php | 2 +- admin/models/fields/snippets.php | 2 +- admin/models/fields/viewtabs.php | 2 +- admin/models/fieldtype.php | 24 +- admin/models/fieldtypes.php | 4 +- admin/models/forms/admin_fields.js | 2 +- admin/models/forms/admin_fields_conditions.js | 2 +- admin/models/forms/admin_view.js | 32 +- admin/models/forms/custom_admin_view.js | 4 +- admin/models/forms/custom_code.js | 5 +- admin/models/forms/fieldtype.js | 4 +- admin/models/forms/site_view.js | 4 +- admin/models/import.php | 2 +- admin/models/import_joomla_components.php | 2 +- admin/models/site_view.php | 43 ++- admin/models/site_views.php | 4 +- admin/tables/admin_fields.php | 2 +- admin/tables/admin_fields_conditions.php | 2 +- admin/tables/admin_view.php | 4 +- admin/tables/custom_admin_view.php | 4 +- admin/tables/custom_code.php | 4 +- admin/tables/fieldtype.php | 4 +- admin/tables/site_view.php | 4 +- admin/views/admin_fields/submitbutton.js | 2 +- admin/views/admin_fields/tmpl/edit.php | 2 +- admin/views/admin_fields/view.html.php | 2 +- .../admin_fields_conditions/submitbutton.js | 2 +- .../admin_fields_conditions/tmpl/edit.php | 2 +- .../admin_fields_conditions/view.html.php | 2 +- admin/views/admin_view/submitbutton.js | 4 +- admin/views/admin_view/tmpl/edit.php | 19 +- admin/views/admin_view/view.html.php | 4 +- admin/views/admin_views/tmpl/default.php | 4 +- .../admin_views/tmpl/default_batch_body.php | 4 +- .../admin_views/tmpl/default_batch_footer.php | 4 +- admin/views/admin_views/tmpl/default_body.php | 4 +- admin/views/admin_views/tmpl/default_foot.php | 4 +- admin/views/admin_views/tmpl/default_head.php | 4 +- .../admin_views/tmpl/default_toolbar.php | 4 +- admin/views/admin_views/view.html.php | 4 +- admin/views/admins_fields/tmpl/default.php | 2 +- .../admins_fields/tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../views/admins_fields/tmpl/default_body.php | 2 +- .../views/admins_fields/tmpl/default_foot.php | 2 +- .../views/admins_fields/tmpl/default_head.php | 2 +- .../admins_fields/tmpl/default_toolbar.php | 2 +- admin/views/admins_fields/view.html.php | 2 +- .../admins_fields_conditions/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../tmpl/default_body.php | 2 +- .../tmpl/default_foot.php | 2 +- .../tmpl/default_head.php | 2 +- .../tmpl/default_toolbar.php | 2 +- .../admins_fields_conditions/view.html.php | 2 +- admin/views/compiler/tmpl/default.php | 4 +- admin/views/compiler/view.html.php | 4 +- admin/views/componentbuilder/tmpl/default.php | 2 +- ...ult_issues_the_closed_issues_on_github.php | 2 +- ...fault_issues_the_open_issues_on_github.php | 2 +- .../componentbuilder/tmpl/default_main.php | 2 +- .../tmpl/default_readme_information.php | 2 +- .../tmpl/default_releases_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../componentbuilder/tmpl/default_vdm.php | 2 +- .../tmpl/default_wiki_tutorials.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/custom_admin_view/submitbutton.js | 4 +- admin/views/custom_admin_view/tmpl/edit.php | 4 +- admin/views/custom_admin_view/view.html.php | 4 +- .../views/custom_admin_views/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../custom_admin_views/tmpl/default_body.php | 4 +- .../custom_admin_views/tmpl/default_foot.php | 4 +- .../custom_admin_views/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/custom_admin_views/view.html.php | 4 +- admin/views/custom_code/submitbutton.js | 4 +- admin/views/custom_code/tmpl/edit.php | 4 +- admin/views/custom_code/view.html.php | 4 +- admin/views/custom_codes/tmpl/default.php | 4 +- .../custom_codes/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/custom_codes/tmpl/default_body.php | 4 +- .../views/custom_codes/tmpl/default_foot.php | 4 +- .../views/custom_codes/tmpl/default_head.php | 4 +- .../custom_codes/tmpl/default_toolbar.php | 4 +- admin/views/custom_codes/view.html.php | 4 +- admin/views/fieldtype/submitbutton.js | 4 +- admin/views/fieldtype/tmpl/edit.php | 4 +- admin/views/fieldtype/view.html.php | 4 +- admin/views/fieldtypes/tmpl/default.php | 4 +- .../fieldtypes/tmpl/default_batch_body.php | 4 +- .../fieldtypes/tmpl/default_batch_footer.php | 4 +- admin/views/fieldtypes/tmpl/default_body.php | 4 +- admin/views/fieldtypes/tmpl/default_foot.php | 4 +- admin/views/fieldtypes/tmpl/default_head.php | 4 +- .../views/fieldtypes/tmpl/default_toolbar.php | 4 +- admin/views/fieldtypes/view.html.php | 4 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- .../import_joomla_components/tmpl/default.php | 2 +- .../import_joomla_components/view.html.php | 2 +- admin/views/site_view/submitbutton.js | 4 +- admin/views/site_view/tmpl/edit.php | 4 +- admin/views/site_view/view.html.php | 4 +- admin/views/site_views/tmpl/default.php | 4 +- .../site_views/tmpl/default_batch_body.php | 4 +- .../site_views/tmpl/default_batch_footer.php | 4 +- admin/views/site_views/tmpl/default_body.php | 4 +- admin/views/site_views/tmpl/default_foot.php | 4 +- admin/views/site_views/tmpl/default_head.php | 4 +- .../views/site_views/tmpl/default_toolbar.php | 4 +- admin/views/site_views/view.html.php | 4 +- componentbuilder.xml | 2 +- script.php | 2 +- site/assets/css/site.css | 2 +- site/assets/js/site.js | 2 +- site/componentbuilder.php | 2 +- site/controller.php | 2 +- site/controllers/api.php | 2 +- site/controllers/help.php | 2 +- site/helpers/category.php | 2 +- site/helpers/categoryfields.php | 2 +- site/helpers/categoryfieldtypes.php | 2 +- site/helpers/componentbuilder.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- site/router.php | 2 +- site/views/api/submitbutton.js | 2 +- 361 files changed, 1081 insertions(+), 466 deletions(-) diff --git a/README.md b/README.md index ed38754aa..21205ccc6 100644 --- a/README.md +++ b/README.md @@ -110,11 +110,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 13th October, 2017 ++ *Last Build*: 14th October, 2017 + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **123978** ++ *Line count*: **124593** + *File count*: **742** + *Folder count*: **129** diff --git a/admin/README.txt b/admin/README.txt index ed38754aa..21205ccc6 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -110,11 +110,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 13th October, 2017 ++ *Last Build*: 14th October, 2017 + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **123978** ++ *Line count*: **124593** + *File count*: **742** + *Folder count*: **129** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 3901e6c14..56e05f3ca 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_fields.css b/admin/assets/css/admin_fields.css index b279cb665..09890ee4d 100644 --- a/admin/assets/css/admin_fields.css +++ b/admin/assets/css/admin_fields.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/assets/css/admin_fields_conditions.css b/admin/assets/css/admin_fields_conditions.css index 5dcff7b02..bd0bc47c4 100644 --- a/admin/assets/css/admin_fields_conditions.css +++ b/admin/assets/css/admin_fields_conditions.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index 375ea3ae0..fb2857b63 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.css diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index 8549c050c..128d3c749 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/admins_fields.css b/admin/assets/css/admins_fields.css index 7e7d9af24..c9cb616a3 100644 --- a/admin/assets/css/admins_fields.css +++ b/admin/assets/css/admins_fields.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/assets/css/admins_fields_conditions.css b/admin/assets/css/admins_fields_conditions.css index da6d2813e..71300cba1 100644 --- a/admin/assets/css/admins_fields_conditions.css +++ b/admin/assets/css/admins_fields_conditions.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/assets/css/compiler.css b/admin/assets/css/compiler.css index b549c2665..28b0cf82f 100644 --- a/admin/assets/css/compiler.css +++ b/admin/assets/css/compiler.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 55 of this MVC - @build 13th September, 2017 + @version @update number 57 of this MVC + @build 13th October, 2017 @created 1st February, 2017 @package Component Builder @subpackage compiler.css diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index dea59af2c..1efa3bb96 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.css diff --git a/admin/assets/css/custom_admin_views.css b/admin/assets/css/custom_admin_views.css index a54b973d6..0eba710ae 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.css diff --git a/admin/assets/css/custom_code.css b/admin/assets/css/custom_code.css index 9412cd741..ae473d1e1 100644 --- a/admin/assets/css/custom_code.css +++ b/admin/assets/css/custom_code.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.css diff --git a/admin/assets/css/custom_codes.css b/admin/assets/css/custom_codes.css index 9b6860038..4664ad2be 100644 --- a/admin/assets/css/custom_codes.css +++ b/admin/assets/css/custom_codes.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 6d24cef0c..74ddc1d11 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/fieldtype.css b/admin/assets/css/fieldtype.css index 334a1105b..7d37a18ee 100644 --- a/admin/assets/css/fieldtype.css +++ b/admin/assets/css/fieldtype.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.css diff --git a/admin/assets/css/fieldtypes.css b/admin/assets/css/fieldtypes.css index 57fae74b4..53685eb51 100644 --- a/admin/assets/css/fieldtypes.css +++ b/admin/assets/css/fieldtypes.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.css diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index 43b9c1262..86aa48888 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.css diff --git a/admin/assets/css/site_views.css b/admin/assets/css/site_views.css index bf0995061..a0549fc13 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index d8bb05b56..93b661ae8 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.js diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 281718ff5..ee4c83741 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 5bd961228..135164ba1 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_fields.php b/admin/controllers/admin_fields.php index b0b4ba727..5a2942069 100644 --- a/admin/controllers/admin_fields.php +++ b/admin/controllers/admin_fields.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/controllers/admin_fields_conditions.php b/admin/controllers/admin_fields_conditions.php index 39a9652fa..9d9cda26b 100644 --- a/admin/controllers/admin_fields_conditions.php +++ b/admin/controllers/admin_fields_conditions.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 90838ccd3..100381a8b 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 7ecf068f2..01d80163e 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/controllers/admins_fields.php b/admin/controllers/admins_fields.php index 573620637..6f27ee363 100644 --- a/admin/controllers/admins_fields.php +++ b/admin/controllers/admins_fields.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/controllers/admins_fields_conditions.php b/admin/controllers/admins_fields_conditions.php index f363dd8cf..cb3354175 100644 --- a/admin/controllers/admins_fields_conditions.php +++ b/admin/controllers/admins_fields_conditions.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index d72a54fda..b140cf7a0 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php @@ -51,6 +51,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy $this->registerTask('getImportScripts', 'ajax'); $this->registerTask('getButton', 'ajax'); $this->registerTask('getButtonID', 'ajax'); + $this->registerTask('getFieldsDisplay', 'ajax'); $this->registerTask('templateDetails', 'ajax'); $this->registerTask('getLayoutDetails', 'ajax'); $this->registerTask('dbTableColumns', 'ajax'); @@ -416,6 +417,44 @@ class ComponentbuilderControllerAjax extends JControllerLegacy } } break; + case 'getFieldsDisplay': + try + { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); + $typeValue = $jinput->get('type', NULL, 'WORD'); + if($typeValue && $user->id != 0) + { + $result = $this->getModel('ajax')->getFieldsDisplay($typeValue); + } + else + { + $result = false; + } + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback . "(".json_encode($result).");"; + } + elseif($returnRaw) + { + echo json_encode($result); + } + else + { + echo "(".json_encode($result).");"; + } + } + catch(Exception $e) + { + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback."(".json_encode($e).");"; + } + else + { + echo "(".json_encode($e).");"; + } + } + break; case 'templateDetails': try { diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 8e1b02880..3bc7cc077 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 55 of this MVC - @build 13th September, 2017 + @version @update number 57 of this MVC + @build 13th October, 2017 @created 1st February, 2017 @package Component Builder @subpackage compiler.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 815c6acf9..bd1e023c6 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index 6895119cc..337049115 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index bca5e2b58..3a81b88c0 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/controllers/custom_code.php b/admin/controllers/custom_code.php index 72811145f..698ebb87d 100644 --- a/admin/controllers/custom_code.php +++ b/admin/controllers/custom_code.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.php diff --git a/admin/controllers/custom_codes.php b/admin/controllers/custom_codes.php index 3f6aae561..794b7ea7c 100644 --- a/admin/controllers/custom_codes.php +++ b/admin/controllers/custom_codes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.php diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php index 553fb377c..151ffbe0d 100644 --- a/admin/controllers/fieldtype.php +++ b/admin/controllers/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php index 1612f8b9e..82b2b25f5 100644 --- a/admin/controllers/fieldtypes.php +++ b/admin/controllers/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 84c9e7b93..434709ead 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 223a62e3a..e589b2a49 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index 40b50cd48..99f9543d0 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index 7ecec7054..8357e755f 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index d45ad3412..ca3cd1857 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index dd6d2c6bc..2e91d16c0 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index 12d4dc5d0..6d417e8b4 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilderemail.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 76e526aec..058186eb7 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index c4ea6db0f..53b661f2c 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 6da9b7576..dde49547d 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index 3e6c7f909..1cc6d60d3 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index ce4a6004d..95bd093ec 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 51b712f06..3c67fef73 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -1,4 +1,6 @@ COM_COMPONENTBUILDER="Component Builder" +COM_COMPONENTBUILDER_ABOVE_TABS="Above Tabs" +COM_COMPONENTBUILDER_ACTIVE_ONLY_FOUR_TEXT_FIELD="Active (only 4 text_field)" COM_COMPONENTBUILDER_ADD_CORRESPONDING_LINE_NUMBERS_TO_THE_DYNAMIC_COMMENTS_SO_TO_SEE_WHERE_IN_THE_COMPILER_THE_LINES_OF_CODE_WAS_BUILD_THIS_WILL_HELP_IF_YOU_NEED_TO_GET_MORE_TECHNICAL_WITH_AN_ISSUE_ON_GITHUB_OR_EVEN_FOR_YOUR_OWN_DEBUGGING="Add corresponding line numbers to the dynamic comments, so to see where in the compiler the lines of code was build. This will help if you need to get more technical with an issue on github, or even for your own debugging." COM_COMPONENTBUILDER_ADD_CUSTOM_CODE_PLACEHOLDERS="Add Custom Code Placeholders" COM_COMPONENTBUILDER_ADD_TO_BACKUP_FOLDER_AMP_SALES_SERVER_LTSMALLGTIF_SETLTSMALLGT="Add to Backup Folder & Sales Server <small>(if set)</small>" @@ -578,7 +580,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL="Advanced notice." COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION="

Please do not change this area unless you would like to add special import to this view that goes beyond the default import concept that Component Builder already does automatic if this view is set to have import & export in the component area where this view is linked to the component.

" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL="Beginners notice." COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION="
" -COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION="
Display of the fields will load here!
" +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION="

Linked Fields

Display of the fields will load here!

Field Conditions

Display of the fields conditions will load here!
" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION="Here we can add some description to explain how things now work." COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL="Fields & Conditions" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION="Only if you add permissions here will this view have permissions." @@ -841,6 +843,7 @@ COM_COMPONENTBUILDER_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATTER="All is good, please COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IN_NO_NOTICE_AT_THIS_TIME="All is good, there in no notice at this time." COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE="All unsaved work will be lost, are you sure you want to continue?" COM_COMPONENTBUILDER_ALWAYS_INSURE_THAT_YOU_HAVE_YOUR_LOCAL_COMPONENTS_BACKED_UP_BY_MAKING_AN_EXPORT_OF_ALL_YOUR_LOCAL_COMPONENTS_BEFORE_IMPORTING_ANY_NEW_COMPONENTS_SMALLMAKE_BSUREB_TO_MOVE_THIS_ZIPPED_BACKUP_PACKAGE_OUT_OF_THE_TMP_FOLDER_BEFORE_DOING_AN_IMPORTSMALLBR_IF_YOU_ARE_IMPORTING_A_PACKAGE_OF_A_THREERD_PARTY_JCB_PACKAGE_DEVELOPER_BMAKE_SURE_IT_IS_A_REPUTABLE_JCB_PACKAGE_DEVELOPERSB="Always insure that you have your local components backed up, by making an export of all your local components before importing any new components. (Make SURE to move this zipped backup package out of the tmp folder before doing an import)
If you are importing a package of a 3rd party JCB package developer, make sure it is a reputable JCB package developers!" +COM_COMPONENTBUILDER_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_LIST="Any Selection (only 4 list/radio/checkboxes/dynamic_list)" COM_COMPONENTBUILDER_AUTHOR="Author" COM_COMPONENTBUILDER_A_FEW_CLOSED_ISSUES_FROM_GITHUB_IS_LOADING="A few closed issues from Github is loading" COM_COMPONENTBUILDER_A_FEW_OPEN_ISSUES_FROM_GITHUB_IS_LOADING="A few open issues from Github is loading" @@ -875,6 +878,7 @@ COM_COMPONENTBUILDER_BSITE_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BSITE_VIEWB_SO COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB="Snippet id:%s mismatch in %s." COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED="Button to create %s will show once %s is saved." COM_COMPONENTBUILDER_BVIEW_TABLE_MAINB_IDS_MISMATCH_IN_BSB="View table main id:%s mismatch in %s." +COM_COMPONENTBUILDER_CHAIN="Chain" COM_COMPONENTBUILDER_CHECK_YOUR_OWNER_DETAILS_IT_HAS_NOT_BEEN_SET_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="Check your owner details, it has not been set. Open the JCB Global Options, go to the Company tab and add the correct company details there." COM_COMPONENTBUILDER_CLEAR_TMP="Clear tmp" COM_COMPONENTBUILDER_COMPANY="Company" @@ -2127,6 +2131,7 @@ COM_COMPONENTBUILDER_EMEMAILEM_BSB="Email: %s" COM_COMPONENTBUILDER_EMLICENSEEM_BSB="License: %s" COM_COMPONENTBUILDER_EMOWNEREM_BSB="Owner: %s" COM_COMPONENTBUILDER_EMWEBSITEEM_BSB="Website: %s" +COM_COMPONENTBUILDER_EXACT_LENGTH_ONLY_FOUR_TEXT_FIELD="Exact Length (only 4 text_field)" COM_COMPONENTBUILDER_EXPORT_COMPLETED="Export Completed!" COM_COMPONENTBUILDER_EXPORT_COMPONENTS="Export Components" COM_COMPONENTBUILDER_EXPORT_DATA="Export Data" @@ -2516,6 +2521,7 @@ COM_COMPONENTBUILDER_FTP_SIGNATURE_LABEL="FTP Server (Signature)
(en COM_COMPONENTBUILDER_FTP_STATUS="Status" COM_COMPONENTBUILDER_FTP_VERSION_DESC="A count of the number of times this FTP has been revised." COM_COMPONENTBUILDER_FTP_VERSION_LABEL="Revision" +COM_COMPONENTBUILDER_FULL_WIDTH_IN_TAB="Full Width in Tab" COM_COMPONENTBUILDER_GET_THE_KEY_FROM_BSB_FOR_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA="Get the key from %s for %s" COM_COMPONENTBUILDER_GLOBAL="Global" COM_COMPONENTBUILDER_GREAT_THIS_FUNCTION_NAME_WILL_WORK="Great, this function name will work!" @@ -2629,6 +2635,7 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_VERSION_DESC="A count of the number of times COM_COMPONENTBUILDER_HELP_DOCUMENT_VERSION_LABEL="Revision" COM_COMPONENTBUILDER_HELP_MANAGER="Help" COM_COMPONENTBUILDER_HI="Hi" +COM_COMPONENTBUILDER_HIDE="Hide" COM_COMPONENTBUILDER_HTWODATA_IS_CORRUPTHTWOTHIS_COULD_BE_DUE_TO_BROKEN_PACKAGE="

Data is corrupt!

This could be due to broken package!" COM_COMPONENTBUILDER_HTWODATA_IS_CORRUPTHTWOTHIS_COULD_BE_DUE_TO_KEY_ERROR_OR_BROKEN_PACKAGE="

Data is corrupt!

This could be due to key error, or broken package!" COM_COMPONENTBUILDER_IMPORT_COMPONENTS="Import Components" @@ -2683,7 +2690,10 @@ COM_COMPONENTBUILDER_IMPORT_TITLE="Data Importer" COM_COMPONENTBUILDER_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE="Package to import not found." COM_COMPONENTBUILDER_IMPORT_UPDATE_DATA="Import Data" COM_COMPONENTBUILDER_IMPORT_UPLOAD_BOTTON="Upload File" +COM_COMPONENTBUILDER_ISOLATE="Isolate" COM_COMPONENTBUILDER_ISSUE="issue" +COM_COMPONENTBUILDER_IS_NOT_ONLY_FOUR_LISTRADIOCHECKBOXES="Is Not (only 4 list/radio/checkboxes)" +COM_COMPONENTBUILDER_IS_ONLY_FOUR_LISTRADIOCHECKBOXES="Is (only 4 list/radio/checkboxes)" COM_COMPONENTBUILDER_JOOMLA_COMPONENT="Joomla Component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS="Joomla Components" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS="Joomla Components Access" @@ -3431,6 +3441,10 @@ COM_COMPONENTBUILDER_KEEP_ORIGINAL_CATEGORY="- Keep Original Category -" COM_COMPONENTBUILDER_KEEP_ORIGINAL_STATE="- Keep Original State -" COM_COMPONENTBUILDER_KEY="Key" COM_COMPONENTBUILDER_KEY_HAS_NOT_CHANGED="Key has not changed" +COM_COMPONENTBUILDER_KEY_WORD_ALL_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word All case-insensitive (only 4 text_field)" +COM_COMPONENTBUILDER_KEY_WORD_ALL_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word All case-sensitive (only 4 text_field)" +COM_COMPONENTBUILDER_KEY_WORD_ANY_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word Any case-insensitive (only 4 text_field)" +COM_COMPONENTBUILDER_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word Any case-sensitive (only 4 text_field)" COM_COMPONENTBUILDER_LANGUAGE="Language" COM_COMPONENTBUILDER_LANGUAGES="Languages" COM_COMPONENTBUILDER_LANGUAGES_ACCESS="Languages Access" @@ -3683,19 +3697,26 @@ COM_COMPONENTBUILDER_LAYOUT_STATUS="Status" COM_COMPONENTBUILDER_LAYOUT_VERSION_DESC="A count of the number of times this Layout has been revised." COM_COMPONENTBUILDER_LAYOUT_VERSION_LABEL="Revision" COM_COMPONENTBUILDER_LAYOUT_YES="Yes" +COM_COMPONENTBUILDER_LEFT_IN_TAB="Left in Tab" +COM_COMPONENTBUILDER_LEFT_OF_TABS="Left of Tabs" COM_COMPONENTBUILDER_LICENSE="License" COM_COMPONENTBUILDER_LICENSE_S="License: %s" +COM_COMPONENTBUILDER_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD="Max Length (only 4 text_field)" +COM_COMPONENTBUILDER_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD="Min Length (only 4 text_field)" COM_COMPONENTBUILDER_NEW="New" COM_COMPONENTBUILDER_NEW_ISSUE="New Issue" COM_COMPONENTBUILDER_NEW_NOTICE="New Notice" COM_COMPONENTBUILDER_NO="No" COM_COMPONENTBUILDER_NOTRANSLATION="no-translation" COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found, or access denied." +COM_COMPONENTBUILDER_NOT_SET="not set" COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!" COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN="No components were selected, please make a selection and try again!" COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_FOR_S="No cronjob path found for (%s)" COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_SINCE_INCORRECT_TYPE_REQUESTED="No cronjob path found since incorrect type requested." +COM_COMPONENTBUILDER_NO_FIELD_FOUND="No Field Found" COM_COMPONENTBUILDER_NO_KEYS_WERE_FOUND_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY="No keys were found. To add an export key simply open the component, go to the tab called settings, bottom right there is a field called Export Key." +COM_COMPONENTBUILDER_NO_S_HAVE_BEEN_LINKED_TO_THIS_VIEW_SOON_AS_THIS_IS_DONE_IT_WILL_BE_DISPLAYED_HERE="No %s have been linked to this view. Soon as this is done it will be displayed here." COM_COMPONENTBUILDER_ON_GITHUB="on Github" COM_COMPONENTBUILDER_OPEN="Open" COM_COMPONENTBUILDER_OPENED="opened" @@ -3717,6 +3738,8 @@ COM_COMPONENTBUILDER_READY_TO_COMPILE_A_COMPONENT="Ready to compile a component" COM_COMPONENTBUILDER_RELEASED_THIS="released this" COM_COMPONENTBUILDER_RESPOND_TO_THIS_ISSUE_ON_GITHUB="Respond to this issue on Github" COM_COMPONENTBUILDER_REVIEW_THIS_ISSUE_ON_GITHUB="Review this issue on Github" +COM_COMPONENTBUILDER_RIGHT_IN_TAB="Right in Tab" +COM_COMPONENTBUILDER_RIGHT_OF_TABS="Right of Tabs" COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved." COM_COMPONENTBUILDER_SAVE_WARNING="The value already existed so please select another." COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_TO_COMPILE="Select the component to compile" @@ -3724,6 +3747,7 @@ COM_COMPONENTBUILDER_SHOULD_JCB_INSERT_THE_CUSTOM_CODE_PLACEHOLDERS_THIS_IS_ONLY COM_COMPONENTBUILDER_SHOULD_THE_COMPONENT_BE_MOVED_TO_YOUR_LOCAL_REPOSITORY_FOLDER="Should the component be moved to your local repository folder?" COM_COMPONENTBUILDER_SHOULD_THE_ZIPPED_PACKAGE_OF_THE_COMPONENT_BE_MOVED_TO_THE_LOCAL_BACKUP_AND_REMOTE_SALES_SERVER_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_THOSE_VALUES_SET="Should the zipped package of the component be moved to the local backup and remote sales server? This is only applicable if this component has those values set." COM_COMPONENTBUILDER_SHOULD_WE_FORCE_THE_UPDATE_OF_ALL_LOCAL_DATA_EVEN_IF_IT_IS_NEWER_THEN_THE_DATA_BEING_IMPORTED="Should we force the update of all local data, even if it is newer then the data being imported." +COM_COMPONENTBUILDER_SHOW="Show" COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_BIMPORT_PROCESSB_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_BDOES_NOTB_HAVE_THE_KEY_THEY_CAN_SEE_BWHERE_TO_GET_ITB="Since the owner details are displayed during import process before adding the key, this way if the user/dev does not have the key they can see where to get it." COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_IMPORT_PROCESS_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_DOES_NOT_HAVE_THE_KEY_THEY_CAN_SEE_WHERE_TO_GET_IT="Since the owner details are displayed during import process before adding the key, this way if the user/dev does not have the key they can see where to get it." COM_COMPONENTBUILDER_SITE_VIEW="Site View" @@ -4387,6 +4411,7 @@ COM_COMPONENTBUILDER_TEMPLATE_VERSION_LABEL="Revision" COM_COMPONENTBUILDER_TEMPLATE_YES="Yes" COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_BSETTINGSB_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_BEXPORT_KEYB="That means anyone who has this package can install it into JCB. To add an export key simply open the component, go to the tab called settings, bottom right there is a field called Export Key." COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY="That means anyone who has this package can install it into JCB. To add an export key simply open the component, go to the tab called settings, bottom right there is a field called Export Key." +COM_COMPONENTBUILDER_THERE_HAS_BEEN_AN_ERROR_IF_THIS_CONTINUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR_OF_A_TYPE_ERROR_IN_THE_FIELDS_DISPLAY_REQUEST="There has been an error, if this continues please inform your system administrator of a type error in the fields display request!" COM_COMPONENTBUILDER_THE_KEY_OF_THIS_PACKAGE="The key of this package." COM_COMPONENTBUILDER_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading" COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_CODESCODE="The package key is: %s" @@ -4397,6 +4422,9 @@ COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key." COM_COMPONENTBUILDER_TOTAL_DOWNLOADS="total downloads" COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_BJCB_GLOBAL_OPTIONSB_GO_TO_THE_BCOMPANYB_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the JCB Global Options, go to the Company tab and add the correct company details there." COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the JCB Global Options, go to the Company tab and add the correct company details there." +COM_COMPONENTBUILDER_TYPE_ERROR="Type Error" +COM_COMPONENTBUILDER_UNACTIVE_ONLY_FOUR_TEXT_FIELD="Unactive (only 4 text_field)" +COM_COMPONENTBUILDER_UNDERNEATH_TABS="Underneath Tabs" COM_COMPONENTBUILDER_UP_TO_DATE="Up to date" COM_COMPONENTBUILDER_USED_IN="used in" COM_COMPONENTBUILDER_USE_BATCH="Use Batch" diff --git a/admin/layouts/admin_fields/fields_above.php b/admin/layouts/admin_fields/fields_above.php index 0c596d8d3..20e540ae5 100644 --- a/admin/layouts/admin_fields/fields_above.php +++ b/admin/layouts/admin_fields/fields_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_above.php diff --git a/admin/layouts/admin_fields/fields_fullwidth.php b/admin/layouts/admin_fields/fields_fullwidth.php index 550fba1c1..19d39659e 100644 --- a/admin/layouts/admin_fields/fields_fullwidth.php +++ b/admin/layouts/admin_fields/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_fields/publishing.php b/admin/layouts/admin_fields/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/admin_fields/publishing.php +++ b/admin/layouts/admin_fields/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields/publlshing.php b/admin/layouts/admin_fields/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/admin_fields/publlshing.php +++ b/admin/layouts/admin_fields/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_fields_conditions/conditions_above.php b/admin/layouts/admin_fields_conditions/conditions_above.php index 7171f3638..7af36149a 100644 --- a/admin/layouts/admin_fields_conditions/conditions_above.php +++ b/admin/layouts/admin_fields_conditions/conditions_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_above.php diff --git a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php index a6043c13f..86bf9ce80 100644 --- a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php +++ b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_fullwidth.php diff --git a/admin/layouts/admin_fields_conditions/publishing.php b/admin/layouts/admin_fields_conditions/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/admin_fields_conditions/publishing.php +++ b/admin/layouts/admin_fields_conditions/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields_conditions/publlshing.php b/admin/layouts/admin_fields_conditions/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/admin_fields_conditions/publlshing.php +++ b/admin/layouts/admin_fields_conditions/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index e0820f63b..4af960c6a 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php index 682d05925..6aa342765 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index 2fae75522..56a91fab1 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index cc59ec308..02be53983 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/details_above.php b/admin/layouts/admin_view/details_above.php index f05c54994..bf64d3d3a 100644 --- a/admin/layouts/admin_view/details_above.php +++ b/admin/layouts/admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/admin_view/details_left.php b/admin/layouts/admin_view/details_left.php index 7d814163f..7cc9b390d 100644 --- a/admin/layouts/admin_view/details_left.php +++ b/admin/layouts/admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/admin_view/details_right.php b/admin/layouts/admin_view/details_right.php index e3e792a3a..05a41a76c 100644 --- a/admin/layouts/admin_view/details_right.php +++ b/admin/layouts/admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/admin_view/details_under.php b/admin/layouts/admin_view/details_under.php index 1d11bc093..c43e96321 100644 --- a/admin/layouts/admin_view/details_under.php +++ b/admin/layouts/admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/admin_view/fields_conditions_fullwidth.php b/admin/layouts/admin_view/fields_conditions_fullwidth.php index 76ef39b14..a1bc0bccc 100644 --- a/admin/layouts/admin_view/fields_conditions_fullwidth.php +++ b/admin/layouts/admin_view/fields_conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_fullwidth.php diff --git a/admin/layouts/admin_view/fields_conditions_left.php b/admin/layouts/admin_view/fields_conditions_left.php index 0623ce25c..6b5119059 100644 --- a/admin/layouts/admin_view/fields_conditions_left.php +++ b/admin/layouts/admin_view/fields_conditions_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_left.php diff --git a/admin/layouts/admin_view/fields_conditions_right.php b/admin/layouts/admin_view/fields_conditions_right.php index f757aa767..9987d3c7a 100644 --- a/admin/layouts/admin_view/fields_conditions_right.php +++ b/admin/layouts/admin_view/fields_conditions_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_right.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index baad275f9..a0cc8e5cc 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php index 7a64979a0..c5469c3be 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index f4fd388fe..c5625a575 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index 8e577d2e0..129e603b3 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index 829fbc5fa..53006f293 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_fullwidth.php b/admin/layouts/admin_view/settings_fullwidth.php index ede1fbae3..dfc4e8171 100644 --- a/admin/layouts/admin_view/settings_fullwidth.php +++ b/admin/layouts/admin_view/settings_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_fullwidth.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 5bb9604fc..6424893a7 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index e88926942..637b7fce6 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index 2fae75522..56a91fab1 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index b9ccfada6..9dc39ea6f 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index f05c54994..bf64d3d3a 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index 6b7444ac5..4fd544d07 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index 3bdbc32ad..f038697a9 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index 6749a9fa8..1706d8ee9 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index a7487da57..5d2d742e8 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index 1d11bc093..c43e96321 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index c14d1301d..4e84f492d 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index fcf66fd67..7af54be1b 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index f332ac07c..1bddbc872 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index e1a4bee7f..0f8f5fffd 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index c6a616685..948e882b4 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php index 1d11bc093..c43e96321 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index e3bbeb30e..7e94e2326 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index 8277f6571..9f9e2c45d 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index d23e216f8..56f42b867 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/joint_fullwidth.php b/admin/layouts/dynamic_get/joint_fullwidth.php index d59fd3b93..e8d892b4f 100644 --- a/admin/layouts/dynamic_get/joint_fullwidth.php +++ b/admin/layouts/dynamic_get/joint_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage joint_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_above.php b/admin/layouts/dynamic_get/main_above.php index 981debe49..9abe1b1b8 100644 --- a/admin/layouts/dynamic_get/main_above.php +++ b/admin/layouts/dynamic_get/main_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_above.php diff --git a/admin/layouts/dynamic_get/main_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php index 423e52c05..48a15c9ad 100644 --- a/admin/layouts/dynamic_get/main_fullwidth.php +++ b/admin/layouts/dynamic_get/main_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_left.php b/admin/layouts/dynamic_get/main_left.php index fa8ffeca0..eeb2bfaee 100644 --- a/admin/layouts/dynamic_get/main_left.php +++ b/admin/layouts/dynamic_get/main_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_left.php diff --git a/admin/layouts/dynamic_get/main_right.php b/admin/layouts/dynamic_get/main_right.php index 8d3351c6d..6f54003b2 100644 --- a/admin/layouts/dynamic_get/main_right.php +++ b/admin/layouts/dynamic_get/main_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_right.php diff --git a/admin/layouts/dynamic_get/main_under.php b/admin/layouts/dynamic_get/main_under.php index 4cafe4bff..37a0f3c2a 100644 --- a/admin/layouts/dynamic_get/main_under.php +++ b/admin/layouts/dynamic_get/main_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index c7d2d67b6..f26602a59 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index f96100401..621a91f3d 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index ae5271306..82387fe96 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index 1d11bc093..c43e96321 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php index 603b5ce38..d1600e6dd 100644 --- a/admin/layouts/field/linked_admin_views_fullwidth.php +++ b/admin/layouts/field/linked_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_admin_views_fullwidth.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index 5279e2a2c..82ddbbda0 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index b3f145e2d..4ca188fc7 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_fullwidth.php b/admin/layouts/fieldtype/details_fullwidth.php index f3215fdce..7f5054e50 100644 --- a/admin/layouts/fieldtype/details_fullwidth.php +++ b/admin/layouts/fieldtype/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 67bb31889..7fe886314 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index f2b1a1189..1d6f3d572 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index bbd9a31d0..6f58722cc 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/ftp/details_above.php b/admin/layouts/ftp/details_above.php index 04e15b13c..003fade3d 100644 --- a/admin/layouts/ftp/details_above.php +++ b/admin/layouts/ftp/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/ftp/details_fullwidth.php b/admin/layouts/ftp/details_fullwidth.php index 1a8d925ce..90c7aeee5 100644 --- a/admin/layouts/ftp/details_fullwidth.php +++ b/admin/layouts/ftp/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index 209e61fb6..82b6fbcfe 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/ftp/publishing.php b/admin/layouts/ftp/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/ftp/publishing.php +++ b/admin/layouts/ftp/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/ftp/publlshing.php b/admin/layouts/ftp/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/ftp/publlshing.php +++ b/admin/layouts/ftp/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 29dd1599a..b085242eb 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 3c71d469f..c01bc6ce7 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 8b4538841..e296d7565 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 3746e8497..7b63932f6 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 1d11bc093..c43e96321 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php index b9f5657a6..81ff0f148 100644 --- a/admin/layouts/joomla_component/admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index a72ba8cbd..b84b06129 100644 --- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index f05c54994..bf64d3d3a 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index 2a8282eea..07151bc33 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index ebd7d7f84..81f83f452 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php index 1d11bc093..c43e96321 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php index f79f0247d..43046e4fe 100644 --- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index 9cf159784..0b049fc4c 100644 --- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php index 25db77e86..b2f1380f0 100644 --- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php +++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/metadata.php b/admin/layouts/joomla_component/metadata.php index feacbbe9e..aa7007742 100644 --- a/admin/layouts/joomla_component/metadata.php +++ b/admin/layouts/joomla_component/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage metadata.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index 30ad472d0..7254c75af 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php index acb709273..9c11732d3 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php index b48e51357..a4aa7b20d 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index 5272dfcae..1104b5e49 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php index 636e40a43..ee2db1a6a 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php index 04b6946c0..07677acb6 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index 93a2558e2..0040b2d9f 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index 650dca686..496cd7087 100644 --- a/admin/layouts/joomla_component/site_views_fullwidth.php +++ b/admin/layouts/joomla_component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php index fb613ac6d..c9c06c5cb 100644 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ b/admin/layouts/joomla_component/translation_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage translation_fullwidth.php diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index 4c09bab1a..5aaff5586 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php index ec59fd56f..cf75de15c 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/language_translation/details_above.php b/admin/layouts/language_translation/details_above.php index b25a2cc83..3e0b05134 100644 --- a/admin/layouts/language_translation/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php index 64acb9121..cc661f992 100644 --- a/admin/layouts/language_translation/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/language_translation/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/language_translation/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index 4fb14add5..ced9da293 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index 16a2d5dca..f4018b66d 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index d761d08cf..fdc1855b4 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index f5696cacd..aea33ea85 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index 9cfff0555..3a84a1569 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index 1d11bc093..c43e96321 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index 8fb1b677f..363fabb8d 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php index 5e761dd58..ff72d51c4 100644 --- a/admin/layouts/site_view/custom_buttons_left.php +++ b/admin/layouts/site_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php index 60f066d6a..bb64eb6c4 100644 --- a/admin/layouts/site_view/custom_buttons_right.php +++ b/admin/layouts/site_view/custom_buttons_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_right.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index f05c54994..bf64d3d3a 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index 6b7444ac5..4fd544d07 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index 3bdbc32ad..f038697a9 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index f5696cacd..aea33ea85 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index a7487da57..5d2d742e8 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index 1d11bc093..c43e96321 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index e2879e9ad..5b9f39200 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index 836b25b8b..2ed0a9540 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index ab45d3b36..0f415f298 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index 0f2766aa2..e600703d9 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index f37672112..f9c626a6e 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index 38f0d35f0..6514b5d53 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index 4fb14add5..ced9da293 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index d0e0f82fc..9efc58ef3 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index d761d08cf..fdc1855b4 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index f5696cacd..aea33ea85 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index 9cfff0555..3a84a1569 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index 1d11bc093..c43e96321 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index 3d87e360d..a73d367f0 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index 727b044ff..043e2bbf5 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php index 146b0fc58..ad1f4e755 100644 --- a/admin/models/admin_fields.php +++ b/admin/models/admin_fields.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php index 05609d174..291ed47b3 100644 --- a/admin/models/admin_fields_conditions.php +++ b/admin/models/admin_fields_conditions.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 85b2da546..9c853f0af 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -366,6 +366,105 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin ComponentbuilderHelper::set($this->vastDevMod, 'admin_view__'.$id); ComponentbuilderHelper::set('admin_view__'.$id, $this->vastDevMod); } + + // update the fields + $objectUpdate = new stdClass(); + $objectUpdate->id = (int) $item->id; + // check what type of linked_views array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->addlinked_views) && isset($item->addlinked_views['adminview'])) + { + $bucket = array(); + foreach($item->addlinked_views as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addlinked_views'.$nr][$option] = $value; + } + } + $item->addlinked_views = $bucket; + $objectUpdate->addconditions = json_encode($bucket); + } + // check what type of ajax_input array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->ajax_input) && isset($item->ajax_input['value_name'])) + { + $bucket = array(); + foreach($item->ajax_input as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['ajax_input'.$nr][$option] = $value; + } + } + $item->ajax_input = $bucket; + $objectUpdate->ajax_input = json_encode($bucket); + } + // check what type of custom_button array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->custom_button) && isset($item->custom_button['name'])) + { + $bucket = array(); + foreach($item->custom_button as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['custom_button'.$nr][$option] = $value; + } + } + $item->custom_button = $bucket; + $objectUpdate->custom_button = json_encode($bucket); + } + // check what type of permissions array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->addpermissions) && isset($item->addpermissions['action'])) + { + $bucket = array(); + foreach($item->addpermissions as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addpermissions'.$nr][$option] = $value; + } + } + $item->addpermissions = $bucket; + $objectUpdate->addpermissions = json_encode($bucket); + } + // check what type of table array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->addtables) && isset($item->addtables['table'])) + { + $bucket = array(); + foreach($item->addtables as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addtables'.$nr][$option] = $value; + } + } + $item->addtables = $bucket; + $objectUpdate->addtables = json_encode($bucket); + } + // check what type of tabs array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->addtabs) && isset($item->addtabs['name'])) + { + $bucket = array(); + foreach($item->addtabs as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addtabs'.$nr][$option] = $value; + } + } + $item->addtabs = $bucket; + $objectUpdate->addtabs = json_encode($bucket); + } + // be sure to update the table if we found repeatable fields that are still not converted + if (count((array) $objectUpdate) > 1) + { + $this->_db->updateObject('#__componentbuilder_admin_view', $objectUpdate, 'id'); + } if (!empty($item->id)) { diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 8ab537601..d48d39a3d 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/models/admins_fields.php b/admin/models/admins_fields.php index 8af1845df..b3407df28 100644 --- a/admin/models/admins_fields.php +++ b/admin/models/admins_fields.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/models/admins_fields_conditions.php b/admin/models/admins_fields_conditions.php index 4883cf0c8..026524ba8 100644 --- a/admin/models/admins_fields_conditions.php +++ b/admin/models/admins_fields_conditions.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 2c2435f15..2fedc95cd 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -308,6 +308,335 @@ class ComponentbuilderModelAjax extends JModelList return ComponentbuilderHelper::getImportScripts($type); } + protected $functionArray = array( + 'field' => 'setFieldsNames', + 'list' => 'setYesNo', + 'title' => 'setYesNo', + 'alias' => 'setYesNo', + 'sort' => 'setYesNo', + 'search' => 'setYesNo', + 'filter' => 'setYesNo', + 'link' => 'setYesNo', + 'permission' => 'setYesNo', + 'tab' => 'setTabName', + 'alignment' => 'setAlignmentName', + 'target_field' => 'setFieldsNames', + 'target_behavior' => 'setTargetBehavior', + 'target_relation' => 'setTargetRelation', + 'match_field' => 'setFieldsNames', + 'match_behavior' => 'setMatchBehavior', + 'match_options' => 'setMatchOptions'); + + protected function getSubformTable($idName, $oject) + { + if (ComponentbuilderHelper::checkJson($oject) && ComponentbuilderHelper::checkString($idName)) + { + $array = json_decode($oject, true); + if (ComponentbuilderHelper::checkArray($array)) + { + // Build heading + $head = array(); + foreach ($array as $headers) + { + foreach ($headers as $header => $value) + { + $head[$header] = '' . ComponentbuilderHelper::safeString($header, 'Ww'); + } + } + // build the rows + $rows = array(); + if (ComponentbuilderHelper::checkArray($array) && ComponentbuilderHelper::checkArray($head)) + { + foreach ($array as $nr => $values) + { + foreach ($head as $key => $t) + { + // set the value for the row + if (isset($values[$key])) + { + $this->setSubformRows($nr, $this->setSubformValue($key, $values[$key]), $rows); + } + else + { + $this->setSubformRows($nr, $this->setSubformValue($key, ''), $rows); + } + } + } + } + // build table + if (ComponentbuilderHelper::checkArray($rows) && ComponentbuilderHelper::checkArray($head)) + { + // return the table + return $this->setSubformTable($head, $rows); + } + } + } + return false; + } + + protected function setSubformTable($head, $rows) + { + $table[] = "
"; + $table[] = "\t
"; + $table[] = "\t\t
"; + $table[] = "\t\t\t"; + $table[] = "\t\t\t\t"; + $table[] = "\t\t\t\t\t"; + $table[] = "\t\t\t\t\t\t". implode("", $head); + $table[] = "\t\t\t\t\t"; + $table[] = "\t\t\t\t"; + $table[] = "\t\t\t\t"; + foreach ($rows as $row) + { + $table[] = "\t\t\t\t\t"; + $table[] = "\t\t\t\t\t\t" . $row; + $table[] = "\t\t\t\t\t"; + } + $table[] = "\t\t\t\t"; + $table[] = "\t\t\t
"; + $table[] = "\t\t
"; + $table[] = "\t
"; + $table[] = "
"; + // return the table + return implode("\n", $table); + } + + protected function setSubformValue($header, $value) + { + if (array_key_exists($header, $this->functionArray) && method_exists($this, $this->functionArray[$header])) + { + $value = $this->{$this->functionArray[$header]}($header, $value); + } + // if no value are set + if (!ComponentbuilderHelper::checkString($value)) + { + $value = '-'; + } + return $value; + } + + protected function setSubformRows($nr, $value, &$rows) + { + // build rows + if (!isset($rows[$nr])) + { + $rows[$nr] = ''.$value.''; + } + else + { + $rows[$nr] .= ''.$value.''; + } + } + + protected $fieldsArray = array( + 'admin_fields' => 'addfields', + 'admin_fields_conditions' => 'addconditions'); + + public function getFieldsDisplay($type) + { + if (isset($this->fieldsArray[$type])) + { + // get the view name & id + $values = $this->getViewID(); + // check if we are in the correct view. + if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view']) && $values['a_view'] === 'admin_view') + { + // get the field data + if ($fieldsData = ComponentbuilderHelper::getVar($type, (int) $values['a_id'], 'admin_view', $this->fieldsArray[$type])) + { + // decode the fields + return $this->getSubformTable($type, $fieldsData); + } + } + return '
' . JText::sprintf('COM_COMPONENTBUILDER_NO_S_HAVE_BEEN_LINKED_TO_THIS_VIEW_SOON_AS_THIS_IS_DONE_IT_WILL_BE_DISPLAYED_HERE', ComponentbuilderHelper::safeString($type, 'w')) . '
'; + } + return '

' . JText::_('COM_COMPONENTBUILDER_TYPE_ERROR') . '

' . JText::_('COM_COMPONENTBUILDER_THERE_HAS_BEEN_AN_ERROR_IF_THIS_CONTINUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR_OF_A_TYPE_ERROR_IN_THE_FIELDS_DISPLAY_REQUEST') . '

'; + } + + protected function setAlignmentName($header, $value) + { + switch ($value) + { + case 1: + return JText::_('COM_COMPONENTBUILDER_LEFT_IN_TAB'); + break; + case 2: + return JText::_('COM_COMPONENTBUILDER_RIGHT_IN_TAB'); + break; + case 3: + return JText::_('COM_COMPONENTBUILDER_FULL_WIDTH_IN_TAB'); + break; + case 4: + return JText::_('COM_COMPONENTBUILDER_ABOVE_TABS'); + break; + case 5: + return JText::_('COM_COMPONENTBUILDER_UNDERNEATH_TABS'); + break; + case 6: + return JText::_('COM_COMPONENTBUILDER_LEFT_OF_TABS'); + break; + case 7: + return JText::_('COM_COMPONENTBUILDER_RIGHT_OF_TABS'); + break; + } + return JText::_('COM_COMPONENTBUILDER_NOT_SET'); + } + + protected $fieldNames = array(); + + protected function setFieldsNames($header, $value) + { + $bucket = array(); + if (ComponentbuilderHelper::checkArray($value)) + { + foreach ($value as $field) + { + if (!isset($this->fieldNames[$field])) + { + if (!$this->fieldNames[$field] = ComponentbuilderHelper::getVar('field', (int) $field, 'id', 'name')) + { + $this->fieldNames[$field] = JText::_('COM_COMPONENTBUILDER_NO_FIELD_FOUND'); + } + } + $bucket[] = $this->fieldNames[$field]; + } + } + elseif (is_numeric($value)) + { + if (!isset($this->fieldNames[$value])) + { + if (!$this->fieldNames[$value] = ComponentbuilderHelper::getVar('field', (int) $value, 'id', 'name')) + { + $this->fieldNames[$value] = JText::_('COM_COMPONENTBUILDER_NO_FIELD_FOUND'); + } + } + $bucket[] = $this->fieldNames[$value]; + } + // return found fields + if (ComponentbuilderHelper::checkArray($bucket)) + { + return implode('
', $bucket); + } + return JText::_('COM_COMPONENTBUILDER_NO_FIELD_FOUND'); + } + + protected $tabNames = array(); + + protected function setTabName($header, $value) + { + if (ComponentbuilderHelper::checkArray($this->tabNames)) + { + // get the view name & id + $values = $this->getViewID(); + if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view']) && $values['a_view'] === 'admin_view') + { + if ($tabs = ComponentbuilderHelper::getVar('admin_view', $values['a_id'], 'id', 'addtabs')) + { + $tabs = json_decode($tabs, true); + if (ComponentbuilderHelper::checkArray($tabs)) + { + $nr = 1; + foreach ($tabs as $tab) + { + if (ComponentbuilderHelper::checkArray($tab) && isset($tab['name'])) + { + $this->tabNames[$nr] = $tab['name']; + $nr++; + } + } + } + } + } + } + // has it been set + if (ComponentbuilderHelper::checkArray($this->tabNames) && isset($this->tabNames[$value])) + { + return $this->tabNames[$value]; + } + return JText::_('COM_COMPONENTBUILDER_DETAILS'); + } + + protected function setYesNo($header, $value) + { + if (1 == $value) + { + return JText::_('COM_COMPONENTBUILDER_YES'); + } + return JText::_('COM_COMPONENTBUILDER_NO'); + } + + protected function setTargetBehavior($header, $value) + { + if (1 == $value) + { + return JText::_('COM_COMPONENTBUILDER_SHOW'); + } + return JText::_('COM_COMPONENTBUILDER_HIDE'); + } + + protected function setTargetRelation($header, $value) + { + switch ($value) + { + case 0: + return JText::_('COM_COMPONENTBUILDER_ISOLATE'); + break; + case 1: + return JText::_('COM_COMPONENTBUILDER_CHAIN'); + break; + } + return JText::_('COM_COMPONENTBUILDER_NOT_SET'); + } + + protected function setMatchBehavior($header, $value) + { + switch ($value) + { + case 1: + return JText::_('COM_COMPONENTBUILDER_IS_ONLY_FOUR_LISTRADIOCHECKBOXES'); + break; + case 2: + return JText::_('COM_COMPONENTBUILDER_IS_NOT_ONLY_FOUR_LISTRADIOCHECKBOXES'); + break; + case 3: + return JText::_('COM_COMPONENTBUILDER_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_LIST'); + break; + case 4: + return JText::_('COM_COMPONENTBUILDER_ACTIVE_ONLY_FOUR_TEXT_FIELD'); + break; + case 5: + return JText::_('COM_COMPONENTBUILDER_UNACTIVE_ONLY_FOUR_TEXT_FIELD'); + break; + case 6: + return JText::_('COM_COMPONENTBUILDER_KEY_WORD_ALL_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD'); + break; + case 7: + return JText::_('COM_COMPONENTBUILDER_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD'); + break; + case 8: + return JText::_('COM_COMPONENTBUILDER_KEY_WORD_ALL_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD'); + break; + case 9: + return JText::_('COM_COMPONENTBUILDER_KEY_WORD_ANY_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD'); + break; + case 10: + return JText::_('COM_COMPONENTBUILDER_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD'); + break; + case 11: + return JText::_('COM_COMPONENTBUILDER_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD'); + break; + case 12: + return JText::_('COM_COMPONENTBUILDER_EXACT_LENGTH_ONLY_FOUR_TEXT_FIELD'); + break; + } + return JText::_('COM_COMPONENTBUILDER_NOT_SET'); + } + + protected function setMatchOptions($header, $value) + { + return str_replace("\n", "
", $value); + } + public function getFieldSelectOptions($id) { // Get a db connection. @@ -1010,7 +1339,7 @@ class ComponentbuilderModelAjax extends JModelList $query['a']['select'] = array('id', 'system_name', 'php_preflight_install','php_postflight_install', 'php_preflight_update','php_postflight_update','php_method_uninstall', 'php_helper_admin','php_admin_event','php_helper_both','php_helper_site', - 'php_site_event','php_dashboard_methods','dashboard_tab'); + 'php_site_event','php_dashboard_methods','dashboard_tab','javascript'); $query['a']['not_base64'] = array('dashboard_tab' => 'json'); $query['a']['name'] = 'system_name'; diff --git a/admin/models/compiler.php b/admin/models/compiler.php index 434ac8f16..8210c6aea 100644 --- a/admin/models/compiler.php +++ b/admin/models/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 55 of this MVC - @build 13th September, 2017 + @version @update number 57 of this MVC + @build 13th October, 2017 @created 1st February, 2017 @package Component Builder @subpackage compiler.php diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index b540dc7ff..dc0c84fac 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 35c8650dd..cd558abed 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php @@ -169,6 +169,27 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin { // base64 Decode css. $item->css = base64_decode($item->css); + } + + // check what type of custom_button array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->custom_button) && isset($item->custom_button['name'])) + { + $bucket = array(); + foreach($item->custom_button as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['custom_button'.$nr][$option] = $value; + } + } + $item->custom_button = $bucket; + // update the fields + $objectUpdate = new stdClass(); + $objectUpdate->id = (int) $item->id; + $objectUpdate->custom_button = json_encode($bucket); + // be sure to update the table if we found repeatable fields that are still not converted + $this->_db->updateObject('#__componentbuilder_custom_admin_view ', $objectUpdate, 'id'); } if (!empty($item->id)) diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index 26b6ae595..fdc27b510 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php index 854277316..ff8535e42 100644 --- a/admin/models/custom_code.php +++ b/admin/models/custom_code.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.php diff --git a/admin/models/custom_codes.php b/admin/models/custom_codes.php index 82d9221be..3d8129746 100644 --- a/admin/models/custom_codes.php +++ b/admin/models/custom_codes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.php diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 995749d30..bb681b800 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 042704d80..4ce18de81 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 07238581b..ad3acba95 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index e8a915b16..7896ae864 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php index 7d6b9a6ae..ea5c032d1 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 415eebcb4..a90956325 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index b007a9ef5..210b95264 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 51418843b..fe1b5ff8c 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index e1eda63ec..3331f8d48 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index a727528f3..a9d438622 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php index cbb6ee87b..6e6b6991f 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicget.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 4cd91a92f..a4128b7e3 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 772ce5fb2..97fd13b5e 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index 5c6ac133b..6be05b287 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index a70833672..e3c913985 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/ftps.php b/admin/models/fields/ftps.php index 805bcd530..9b15f8b77 100644 --- a/admin/models/fields/ftps.php +++ b/admin/models/fields/ftps.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ftps.php diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php index 5fea9c660..56ec5bdf7 100644 --- a/admin/models/fields/lang.php +++ b/admin/models/fields/lang.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage lang.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 8b6718eb8..10eb9154d 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index b155075ab..721c66176 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index b69a51766..7b5d79015 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index 3eb187395..0e25105cb 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fields/viewtabs.php b/admin/models/fields/viewtabs.php index 39b441769..114daea25 100644 --- a/admin/models/fields/viewtabs.php +++ b/admin/models/fields/viewtabs.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage viewtabs.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 11677cf67..07b5797db 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php @@ -101,6 +101,26 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $properties = new Registry; $properties->loadString($item->properties); $item->properties = $properties->toArray(); + } + + // check what type of properties array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->properties) && isset($item->properties['name'])) + { + $bucket = array(); + foreach($item->properties as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addfields'.$nr][$option] = $value; + } + } + $item->properties = $bucket; + // be sure to update the value in the db + $objectUpdate = new stdClass(); + $objectUpdate->id = (int) $item->id; + $objectUpdate->properties = json_encode($bucket); + $this->db->updateObject('#__componentbuilder_fieldtype', $objectUpdate, 'id'); } if (!empty($item->id)) diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php index 48c35adf6..405093912 100644 --- a/admin/models/fieldtypes.php +++ b/admin/models/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/forms/admin_fields.js b/admin/models/forms/admin_fields.js index 928ed138a..4555b4d53 100644 --- a/admin/models/forms/admin_fields.js +++ b/admin/models/forms/admin_fields.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/models/forms/admin_fields_conditions.js b/admin/models/forms/admin_fields_conditions.js index 3c8108173..544de03a5 100644 --- a/admin/models/forms/admin_fields_conditions.js +++ b/admin/models/forms/admin_fields_conditions.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 6ed7119c5..147d54b42 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js @@ -1183,8 +1183,34 @@ jQuery(document).ready(function() var valueSwitch = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); getImportScripts(valueSwitch); addButtonID('admin_fields_conditions','create_edit_buttons'); // <-- second + + // now load the fields + getFieldsDisplay('admin_fields'); + getFieldsDisplay('admin_fields_conditions'); }); +function getFieldsDisplay(type){ + getFieldsDisplay_server(type).done(function(result) { + if(result){ + jQuery('#display_'+type).html(result); + } + }); +} + +function getFieldsDisplay_server(type){ + var getUrl = "index.php?option=com_componentbuilder&task=ajax.getFieldsDisplay&format=json&vdm="+vastDevMod; + if(token.length > 0 && type.length > 0){ + var request = 'token='+token+'&type=' + type; + } + return jQuery.ajax({ + type: 'GET', + url: getUrl, + dataType: 'jsonp', + data: request, + jsonp: 'callback' + }); +} + function addData(result,where){ jQuery(where).closest('.control-group').parent().append(result); } @@ -1207,7 +1233,7 @@ function addButtonID(type,where){ if(result){ addData(result,'#jform_'+where); } - }) + }); } function getTableColumns_server(tableName){ diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js index fc9723a03..3a8ba2f25 100644 --- a/admin/models/forms/custom_admin_view.js +++ b/admin/models/forms/custom_admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.js diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js index e1f953dab..cce93ceea 100644 --- a/admin/models/forms/custom_code.js +++ b/admin/models/forms/custom_code.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.js @@ -325,6 +325,7 @@ function usedin(functioName, ide) { if (used.in) { jQuery('#usedin-'+used.id).show(); jQuery('#area-'+used.id).html(used.in); + jQuery.UIkit.notify({message: used.in, timeout: 5000, status: 'success', pos: 'top-right'}); found = true; } else { jQuery('#usedin-'+target).hide(); diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js index a5de3c5c4..ef060e03c 100644 --- a/admin/models/forms/fieldtype.js +++ b/admin/models/forms/fieldtype.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.js diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js index cafaa73af..bf18c52b9 100644 --- a/admin/models/forms/site_view.js +++ b/admin/models/forms/site_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.js diff --git a/admin/models/import.php b/admin/models/import.php index a11f63144..88bc24be6 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index 97f39f12a..c64df7244 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/models/site_view.php b/admin/models/site_view.php index ee7b49671..951fb39a8 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.php @@ -183,6 +183,45 @@ class ComponentbuilderModelSite_view extends JModelAdmin { // base64 Decode php_jview. $item->php_jview = base64_decode($item->php_jview); + } + + // update the fields + $objectUpdate = new stdClass(); + $objectUpdate->id = (int) $item->id; + // check what type of custom_button array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->custom_button) && isset($item->custom_button['name'])) + { + $bucket = array(); + foreach($item->custom_button as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['custom_button'.$nr][$option] = $value; + } + } + $item->custom_button = $bucket; + $objectUpdate->custom_button = json_encode($bucket); + } + // check what type of ajax_input array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->ajax_input) && isset($item->ajax_input['value_name'])) + { + $bucket = array(); + foreach($item->ajax_input as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['ajax_input'.$nr][$option] = $value; + } + } + $item->ajax_input = $bucket; + $objectUpdate->ajax_input = json_encode($bucket); + } + // be sure to update the table if we found repeatable fields that are still not converted + if (count((array) $objectUpdate) > 1) + { + $this->_db->updateObject('#__componentbuilder_site_view', $objectUpdate, 'id'); } if (!empty($item->id)) diff --git a/admin/models/site_views.php b/admin/models/site_views.php index fff1fe0b7..49f59f450 100644 --- a/admin/models/site_views.php +++ b/admin/models/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/tables/admin_fields.php b/admin/tables/admin_fields.php index be7966ad2..346ba6adf 100644 --- a/admin/tables/admin_fields.php +++ b/admin/tables/admin_fields.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/tables/admin_fields_conditions.php b/admin/tables/admin_fields_conditions.php index 2e9a91d8e..2bd255fb4 100644 --- a/admin/tables/admin_fields_conditions.php +++ b/admin/tables/admin_fields_conditions.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index 11ec3bec8..9104618ac 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/tables/custom_admin_view.php b/admin/tables/custom_admin_view.php index ebaf461d9..3c1d33609 100644 --- a/admin/tables/custom_admin_view.php +++ b/admin/tables/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/tables/custom_code.php b/admin/tables/custom_code.php index e0e5181e4..b5f4a14fa 100644 --- a/admin/tables/custom_code.php +++ b/admin/tables/custom_code.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.php diff --git a/admin/tables/fieldtype.php b/admin/tables/fieldtype.php index 60c0e6bee..a9e180577 100644 --- a/admin/tables/fieldtype.php +++ b/admin/tables/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php diff --git a/admin/tables/site_view.php b/admin/tables/site_view.php index 84c938c93..716580355 100644 --- a/admin/tables/site_view.php +++ b/admin/tables/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/views/admin_fields/submitbutton.js b/admin/views/admin_fields/submitbutton.js index c21683f90..b5b05df98 100644 --- a/admin/views/admin_fields/submitbutton.js +++ b/admin/views/admin_fields/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admin_fields/tmpl/edit.php b/admin/views/admin_fields/tmpl/edit.php index 36dccbac8..3dabdb396 100644 --- a/admin/views/admin_fields/tmpl/edit.php +++ b/admin/views/admin_fields/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php index 97ea09447..a116235e6 100644 --- a/admin/views/admin_fields/view.html.php +++ b/admin/views/admin_fields/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admin_fields_conditions/submitbutton.js b/admin/views/admin_fields_conditions/submitbutton.js index ffe514063..ff036a727 100644 --- a/admin/views/admin_fields_conditions/submitbutton.js +++ b/admin/views/admin_fields_conditions/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admin_fields_conditions/tmpl/edit.php b/admin/views/admin_fields_conditions/tmpl/edit.php index 901a67fbb..7b2b650f6 100644 --- a/admin/views/admin_fields_conditions/tmpl/edit.php +++ b/admin/views/admin_fields_conditions/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php index a680033b8..a13dd08ce 100644 --- a/admin/views/admin_fields_conditions/view.html.php +++ b/admin/views/admin_fields_conditions/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index a574d91eb..88ba5de8c 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index 4cda93677..3a0a98b5d 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -755,5 +755,18 @@ function JRouter(link) { } ?> return url+link; -} +} + +// nice little dot trick :) +jQuery(document).ready( function($) { + var x=0; + setInterval(function() { + var dots = ""; + x++; + for (var y=0; y < x%8; y++) { + dots+="."; + } + $(".loading-dots").text(dots); + } , 500); +}); diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index 8ebd9e7d1..94b655861 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 333dd2903..42356d1ec 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index 1637f9576..ddbbeb0a2 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index ad0df7a3f..81c7e249a 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 7d20fdeec..cc1815feb 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index 7b0a81b90..dd7daf81b 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index 1ac0764a6..77d1311ad 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index e34e2f285..7294b10ad 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index a762b480e..f5a4d357d 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 141 of this MVC - @build 13th October, 2017 + @version @update number 166 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/admins_fields/tmpl/default.php b/admin/views/admins_fields/tmpl/default.php index 8c10e71a0..ea1e39e44 100644 --- a/admin/views/admins_fields/tmpl/default.php +++ b/admin/views/admins_fields/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields/tmpl/default_batch_body.php b/admin/views/admins_fields/tmpl/default_batch_body.php index 7d50c139c..d3df5c824 100644 --- a/admin/views/admins_fields/tmpl/default_batch_body.php +++ b/admin/views/admins_fields/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields/tmpl/default_batch_footer.php b/admin/views/admins_fields/tmpl/default_batch_footer.php index 519b8f44a..ff95adda8 100644 --- a/admin/views/admins_fields/tmpl/default_batch_footer.php +++ b/admin/views/admins_fields/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields/tmpl/default_body.php b/admin/views/admins_fields/tmpl/default_body.php index af9016d1f..4331b4e66 100644 --- a/admin/views/admins_fields/tmpl/default_body.php +++ b/admin/views/admins_fields/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields/tmpl/default_foot.php b/admin/views/admins_fields/tmpl/default_foot.php index 22c4ae8e9..02ebf14c3 100644 --- a/admin/views/admins_fields/tmpl/default_foot.php +++ b/admin/views/admins_fields/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields/tmpl/default_head.php b/admin/views/admins_fields/tmpl/default_head.php index 598a73fab..f61bf874d 100644 --- a/admin/views/admins_fields/tmpl/default_head.php +++ b/admin/views/admins_fields/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields/tmpl/default_toolbar.php b/admin/views/admins_fields/tmpl/default_toolbar.php index ef18d1197..a77900f0a 100644 --- a/admin/views/admins_fields/tmpl/default_toolbar.php +++ b/admin/views/admins_fields/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php index abde65254..10f76ee33 100644 --- a/admin/views/admins_fields/view.html.php +++ b/admin/views/admins_fields/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 21 of this MVC + @version @update number 22 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default.php b/admin/views/admins_fields_conditions/tmpl/default.php index 5b018810f..d3677325d 100644 --- a/admin/views/admins_fields_conditions/tmpl/default.php +++ b/admin/views/admins_fields_conditions/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_batch_body.php b/admin/views/admins_fields_conditions/tmpl/default_batch_body.php index 081525861..dadef5f3a 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_batch_body.php +++ b/admin/views/admins_fields_conditions/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php b/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php index 3e187df90..10ee94af6 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php +++ b/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_body.php b/admin/views/admins_fields_conditions/tmpl/default_body.php index db4781076..c6a4079e7 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_body.php +++ b/admin/views/admins_fields_conditions/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_foot.php b/admin/views/admins_fields_conditions/tmpl/default_foot.php index 9f7ea8e35..5e430745c 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_foot.php +++ b/admin/views/admins_fields_conditions/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_head.php b/admin/views/admins_fields_conditions/tmpl/default_head.php index 8d7da6e5f..7d6a3915e 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_head.php +++ b/admin/views/admins_fields_conditions/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_toolbar.php b/admin/views/admins_fields_conditions/tmpl/default_toolbar.php index a66f9806a..0a6ca311a 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_toolbar.php +++ b/admin/views/admins_fields_conditions/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php index cc52def31..8d0b6f9bf 100644 --- a/admin/views/admins_fields_conditions/view.html.php +++ b/admin/views/admins_fields_conditions/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 14 of this MVC + @version @update number 15 of this MVC @build 13th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php index 61710e5f2..5aea4f179 100644 --- a/admin/views/compiler/tmpl/default.php +++ b/admin/views/compiler/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 55 of this MVC - @build 13th September, 2017 + @version @update number 57 of this MVC + @build 13th October, 2017 @created 1st February, 2017 @package Component Builder @subpackage default.php diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index 4e5642537..3c3f66bea 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 55 of this MVC - @build 13th September, 2017 + @version @update number 57 of this MVC + @build 13th October, 2017 @created 1st February, 2017 @package Component Builder @subpackage view.html.php diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index ea070e90c..9c2b7c873 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php index b95e59c67..8e3e94e90 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php index ffd5587c8..3430f9b92 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index 600e5e1c8..0712d876f 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index 855e2ccf1..1ce95218c 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_releases_information.php b/admin/views/componentbuilder/tmpl/default_releases_information.php index 56f13c84a..31438fba8 100644 --- a/admin/views/componentbuilder/tmpl/default_releases_information.php +++ b/admin/views/componentbuilder/tmpl/default_releases_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_releases_information.php diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index 8fa32700c..9cbd66462 100644 --- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index cda38364f..bdfcfdcdb 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php index 4ea6d51aa..ca0a1f107 100644 --- a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php +++ b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_wiki_tutorials.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 7657436b0..5f72d5eb9 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_admin_view/submitbutton.js b/admin/views/custom_admin_view/submitbutton.js index 5a11965df..62940aa62 100644 --- a/admin/views/custom_admin_view/submitbutton.js +++ b/admin/views/custom_admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php index 1d823c9f3..5480e5d49 100644 --- a/admin/views/custom_admin_view/tmpl/edit.php +++ b/admin/views/custom_admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index 37a282202..be0b00f23 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_admin_views/tmpl/default.php b/admin/views/custom_admin_views/tmpl/default.php index e41b5b492..88d23cb66 100644 --- a/admin/views/custom_admin_views/tmpl/default.php +++ b/admin/views/custom_admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/custom_admin_views/tmpl/default_batch_body.php b/admin/views/custom_admin_views/tmpl/default_batch_body.php index 0b70688e5..39ca7c3cf 100644 --- a/admin/views/custom_admin_views/tmpl/default_batch_body.php +++ b/admin/views/custom_admin_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/custom_admin_views/tmpl/default_batch_footer.php b/admin/views/custom_admin_views/tmpl/default_batch_footer.php index b8628422d..c3cdab3e9 100644 --- a/admin/views/custom_admin_views/tmpl/default_batch_footer.php +++ b/admin/views/custom_admin_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/custom_admin_views/tmpl/default_body.php b/admin/views/custom_admin_views/tmpl/default_body.php index 3e0641ec5..f6ec5d735 100644 --- a/admin/views/custom_admin_views/tmpl/default_body.php +++ b/admin/views/custom_admin_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/custom_admin_views/tmpl/default_foot.php b/admin/views/custom_admin_views/tmpl/default_foot.php index 247b4938e..f5213c7a0 100644 --- a/admin/views/custom_admin_views/tmpl/default_foot.php +++ b/admin/views/custom_admin_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/custom_admin_views/tmpl/default_head.php b/admin/views/custom_admin_views/tmpl/default_head.php index 30cadcfe2..7957238dc 100644 --- a/admin/views/custom_admin_views/tmpl/default_head.php +++ b/admin/views/custom_admin_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/custom_admin_views/tmpl/default_toolbar.php b/admin/views/custom_admin_views/tmpl/default_toolbar.php index 95b2c8b28..ff763b151 100644 --- a/admin/views/custom_admin_views/tmpl/default_toolbar.php +++ b/admin/views/custom_admin_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index 1b9d29daa..02b92937b 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 27 of this MVC - @build 9th October, 2017 + @version @update number 31 of this MVC + @build 13th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_code/submitbutton.js b/admin/views/custom_code/submitbutton.js index d8f73ff20..07a4eec7b 100644 --- a/admin/views/custom_code/submitbutton.js +++ b/admin/views/custom_code/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/custom_code/tmpl/edit.php b/admin/views/custom_code/tmpl/edit.php index 41f6d4808..ac614175b 100644 --- a/admin/views/custom_code/tmpl/edit.php +++ b/admin/views/custom_code/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage edit.php diff --git a/admin/views/custom_code/view.html.php b/admin/views/custom_code/view.html.php index 72e2e2a5d..c97c9064a 100644 --- a/admin/views/custom_code/view.html.php +++ b/admin/views/custom_code/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_codes/tmpl/default.php b/admin/views/custom_codes/tmpl/default.php index c7da169e4..8f673cd45 100644 --- a/admin/views/custom_codes/tmpl/default.php +++ b/admin/views/custom_codes/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage default.php diff --git a/admin/views/custom_codes/tmpl/default_batch_body.php b/admin/views/custom_codes/tmpl/default_batch_body.php index 258781e1f..9b5727d55 100644 --- a/admin/views/custom_codes/tmpl/default_batch_body.php +++ b/admin/views/custom_codes/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/custom_codes/tmpl/default_batch_footer.php b/admin/views/custom_codes/tmpl/default_batch_footer.php index 2fd279234..78d6cedc5 100644 --- a/admin/views/custom_codes/tmpl/default_batch_footer.php +++ b/admin/views/custom_codes/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/custom_codes/tmpl/default_body.php b/admin/views/custom_codes/tmpl/default_body.php index 7f374fd16..808df0f6f 100644 --- a/admin/views/custom_codes/tmpl/default_body.php +++ b/admin/views/custom_codes/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_body.php diff --git a/admin/views/custom_codes/tmpl/default_foot.php b/admin/views/custom_codes/tmpl/default_foot.php index 732adb7ef..95ac8696e 100644 --- a/admin/views/custom_codes/tmpl/default_foot.php +++ b/admin/views/custom_codes/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/custom_codes/tmpl/default_head.php b/admin/views/custom_codes/tmpl/default_head.php index 689e4547d..0e54138c3 100644 --- a/admin/views/custom_codes/tmpl/default_head.php +++ b/admin/views/custom_codes/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_head.php diff --git a/admin/views/custom_codes/tmpl/default_toolbar.php b/admin/views/custom_codes/tmpl/default_toolbar.php index a0a40efcd..b844b7522 100644 --- a/admin/views/custom_codes/tmpl/default_toolbar.php +++ b/admin/views/custom_codes/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php index db30d63c3..67fb18a75 100644 --- a/admin/views/custom_codes/view.html.php +++ b/admin/views/custom_codes/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 82 of this MVC - @build 4th October, 2017 + @version @update number 84 of this MVC + @build 13th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage view.html.php diff --git a/admin/views/fieldtype/submitbutton.js b/admin/views/fieldtype/submitbutton.js index d8b53d6ed..dbaab7579 100644 --- a/admin/views/fieldtype/submitbutton.js +++ b/admin/views/fieldtype/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/fieldtype/tmpl/edit.php b/admin/views/fieldtype/tmpl/edit.php index d2aad1a08..626839d9e 100644 --- a/admin/views/fieldtype/tmpl/edit.php +++ b/admin/views/fieldtype/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php index dbcce86bf..a5f891d7d 100644 --- a/admin/views/fieldtype/view.html.php +++ b/admin/views/fieldtype/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/fieldtypes/tmpl/default.php b/admin/views/fieldtypes/tmpl/default.php index 5eb5553ab..d9c45f1ec 100644 --- a/admin/views/fieldtypes/tmpl/default.php +++ b/admin/views/fieldtypes/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/fieldtypes/tmpl/default_batch_body.php b/admin/views/fieldtypes/tmpl/default_batch_body.php index d71b78962..dbe229d30 100644 --- a/admin/views/fieldtypes/tmpl/default_batch_body.php +++ b/admin/views/fieldtypes/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/fieldtypes/tmpl/default_batch_footer.php b/admin/views/fieldtypes/tmpl/default_batch_footer.php index 6fc4bce06..5e39fa3dc 100644 --- a/admin/views/fieldtypes/tmpl/default_batch_footer.php +++ b/admin/views/fieldtypes/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/fieldtypes/tmpl/default_body.php b/admin/views/fieldtypes/tmpl/default_body.php index 454da88c0..2566bd3b2 100644 --- a/admin/views/fieldtypes/tmpl/default_body.php +++ b/admin/views/fieldtypes/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/fieldtypes/tmpl/default_foot.php b/admin/views/fieldtypes/tmpl/default_foot.php index f171fda29..f5a14e8fc 100644 --- a/admin/views/fieldtypes/tmpl/default_foot.php +++ b/admin/views/fieldtypes/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/fieldtypes/tmpl/default_head.php b/admin/views/fieldtypes/tmpl/default_head.php index 3b6288d3b..cf420ccdc 100644 --- a/admin/views/fieldtypes/tmpl/default_head.php +++ b/admin/views/fieldtypes/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/fieldtypes/tmpl/default_toolbar.php b/admin/views/fieldtypes/tmpl/default_toolbar.php index ca66be9a6..d79c72aec 100644 --- a/admin/views/fieldtypes/tmpl/default_toolbar.php +++ b/admin/views/fieldtypes/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php index 3eecfab69..a468df1e1 100644 --- a/admin/views/fieldtypes/view.html.php +++ b/admin/views/fieldtypes/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC - @build 17th September, 2017 + @version @update number 16 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 20c58b4c1..be5d5249e 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 4ddeb7717..fd95617c7 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php index 895080f85..4cb4af4fa 100644 --- a/admin/views/import_joomla_components/tmpl/default.php +++ b/admin/views/import_joomla_components/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index 3ebffdcae..f7189c379 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/site_view/submitbutton.js b/admin/views/site_view/submitbutton.js index 021cc12e5..5b3f02d4a 100644 --- a/admin/views/site_view/submitbutton.js +++ b/admin/views/site_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php index baa0518eb..20fc5a94b 100644 --- a/admin/views/site_view/tmpl/edit.php +++ b/admin/views/site_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php index f9b688488..b0abe5551 100644 --- a/admin/views/site_view/view.html.php +++ b/admin/views/site_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/site_views/tmpl/default.php b/admin/views/site_views/tmpl/default.php index fa157fdab..4de8e9a93 100644 --- a/admin/views/site_views/tmpl/default.php +++ b/admin/views/site_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/site_views/tmpl/default_batch_body.php b/admin/views/site_views/tmpl/default_batch_body.php index 27ad810b8..570ec83af 100644 --- a/admin/views/site_views/tmpl/default_batch_body.php +++ b/admin/views/site_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/site_views/tmpl/default_batch_footer.php b/admin/views/site_views/tmpl/default_batch_footer.php index b68620abc..26f293d1e 100644 --- a/admin/views/site_views/tmpl/default_batch_footer.php +++ b/admin/views/site_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/site_views/tmpl/default_body.php b/admin/views/site_views/tmpl/default_body.php index 46d8e27b5..15850ca39 100644 --- a/admin/views/site_views/tmpl/default_body.php +++ b/admin/views/site_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/site_views/tmpl/default_foot.php b/admin/views/site_views/tmpl/default_foot.php index ce4e3b09e..89b52d8f1 100644 --- a/admin/views/site_views/tmpl/default_foot.php +++ b/admin/views/site_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/site_views/tmpl/default_head.php b/admin/views/site_views/tmpl/default_head.php index b9df1be95..b366f1abb 100644 --- a/admin/views/site_views/tmpl/default_head.php +++ b/admin/views/site_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/site_views/tmpl/default_toolbar.php b/admin/views/site_views/tmpl/default_toolbar.php index ec0f66a33..8671ade63 100644 --- a/admin/views/site_views/tmpl/default_toolbar.php +++ b/admin/views/site_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php index febe4e091..64c56c4ef 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 58 of this MVC - @build 9th October, 2017 + @version @update number 63 of this MVC + @build 14th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/componentbuilder.xml b/componentbuilder.xml index 2488816da..ee549e991 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 13th October, 2017 + 14th October, 2017 Llewellyn van der Merwe joomla@vdm.io http://vdm.bz/component-builder diff --git a/script.php b/script.php index 50c0e6097..3f8e8fe54 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage script.php diff --git a/site/assets/css/site.css b/site/assets/css/site.css index 5d0859fa0..c865d6498 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index f66ccb8ce..99e9aa115 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.js diff --git a/site/componentbuilder.php b/site/componentbuilder.php index 1f077c663..e199fab64 100644 --- a/site/componentbuilder.php +++ b/site/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/controller.php b/site/controller.php index ba6492d71..bc5ab61c0 100644 --- a/site/controller.php +++ b/site/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/site/controllers/api.php b/site/controllers/api.php index 45b94e69d..59d55cbbb 100644 --- a/site/controllers/api.php +++ b/site/controllers/api.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage api.php diff --git a/site/controllers/help.php b/site/controllers/help.php index f2940c85d..4bafd5ffb 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/site/helpers/category.php b/site/helpers/category.php index 20e0b527d..da1b229e2 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage category.php diff --git a/site/helpers/categoryfields.php b/site/helpers/categoryfields.php index 4a25e651e..02d2569b5 100644 --- a/site/helpers/categoryfields.php +++ b/site/helpers/categoryfields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfields.php diff --git a/site/helpers/categoryfieldtypes.php b/site/helpers/categoryfieldtypes.php index 6af242d73..27dad0118 100644 --- a/site/helpers/categoryfieldtypes.php +++ b/site/helpers/categoryfieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfieldtypes.php diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index 4719eda6c..3a2a6930c 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 76e526aec..058186eb7 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 7ee4a1519..9d863658e 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage route.php diff --git a/site/router.php b/site/router.php index d48ae9abc..66ea0fe98 100644 --- a/site/router.php +++ b/site/router.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage router.php diff --git a/site/views/api/submitbutton.js b/site/views/api/submitbutton.js index b3aa700e5..99d75bf26 100644 --- a/site/views/api/submitbutton.js +++ b/site/views/api/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 13th October, 2017 + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js -- 2.40.1 From fbfeef5353ceba8d727a5727fb94df4d6301509f Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sat, 14 Oct 2017 05:41:14 +0200 Subject: [PATCH 07/14] fixed bug in custom admin view, due to incorrect space in table name --- admin/assets/css/custom_admin_view.css | 4 ++-- admin/assets/css/custom_admin_views.css | 4 ++-- admin/controllers/custom_admin_view.php | 4 ++-- admin/controllers/custom_admin_views.php | 4 ++-- admin/models/custom_admin_view.php | 6 +++--- admin/models/custom_admin_views.php | 4 ++-- admin/models/forms/custom_admin_view.js | 4 ++-- admin/tables/custom_admin_view.php | 4 ++-- admin/views/custom_admin_view/submitbutton.js | 4 ++-- admin/views/custom_admin_view/tmpl/edit.php | 4 ++-- admin/views/custom_admin_view/view.html.php | 4 ++-- admin/views/custom_admin_views/tmpl/default.php | 4 ++-- admin/views/custom_admin_views/tmpl/default_batch_body.php | 4 ++-- .../views/custom_admin_views/tmpl/default_batch_footer.php | 4 ++-- admin/views/custom_admin_views/tmpl/default_body.php | 4 ++-- admin/views/custom_admin_views/tmpl/default_foot.php | 4 ++-- admin/views/custom_admin_views/tmpl/default_head.php | 4 ++-- admin/views/custom_admin_views/tmpl/default_toolbar.php | 4 ++-- admin/views/custom_admin_views/view.html.php | 4 ++-- 19 files changed, 39 insertions(+), 39 deletions(-) diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index 1efa3bb96..626d5b601 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.css diff --git a/admin/assets/css/custom_admin_views.css b/admin/assets/css/custom_admin_views.css index 0eba710ae..50da3947f 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.css diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index 337049115..8ba87a505 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index 3a81b88c0..353cf2c82 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index cd558abed..f2dcafa6a 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php @@ -189,7 +189,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $objectUpdate->id = (int) $item->id; $objectUpdate->custom_button = json_encode($bucket); // be sure to update the table if we found repeatable fields that are still not converted - $this->_db->updateObject('#__componentbuilder_custom_admin_view ', $objectUpdate, 'id'); + $this->_db->updateObject('#__componentbuilder_custom_admin_view', $objectUpdate, 'id'); } if (!empty($item->id)) diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index fdc27b510..7fba5bc30 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js index 3a8ba2f25..9eaa7515d 100644 --- a/admin/models/forms/custom_admin_view.js +++ b/admin/models/forms/custom_admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.js diff --git a/admin/tables/custom_admin_view.php b/admin/tables/custom_admin_view.php index 3c1d33609..a9a55ed01 100644 --- a/admin/tables/custom_admin_view.php +++ b/admin/tables/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/views/custom_admin_view/submitbutton.js b/admin/views/custom_admin_view/submitbutton.js index 62940aa62..891e291bb 100644 --- a/admin/views/custom_admin_view/submitbutton.js +++ b/admin/views/custom_admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php index 5480e5d49..67dfd1aed 100644 --- a/admin/views/custom_admin_view/tmpl/edit.php +++ b/admin/views/custom_admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index be0b00f23..07c006c3c 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_admin_views/tmpl/default.php b/admin/views/custom_admin_views/tmpl/default.php index 88d23cb66..bb7078318 100644 --- a/admin/views/custom_admin_views/tmpl/default.php +++ b/admin/views/custom_admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/custom_admin_views/tmpl/default_batch_body.php b/admin/views/custom_admin_views/tmpl/default_batch_body.php index 39ca7c3cf..1590608c2 100644 --- a/admin/views/custom_admin_views/tmpl/default_batch_body.php +++ b/admin/views/custom_admin_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/custom_admin_views/tmpl/default_batch_footer.php b/admin/views/custom_admin_views/tmpl/default_batch_footer.php index c3cdab3e9..62b8df28c 100644 --- a/admin/views/custom_admin_views/tmpl/default_batch_footer.php +++ b/admin/views/custom_admin_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/custom_admin_views/tmpl/default_body.php b/admin/views/custom_admin_views/tmpl/default_body.php index f6ec5d735..59787b3c2 100644 --- a/admin/views/custom_admin_views/tmpl/default_body.php +++ b/admin/views/custom_admin_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/custom_admin_views/tmpl/default_foot.php b/admin/views/custom_admin_views/tmpl/default_foot.php index f5213c7a0..80bad7182 100644 --- a/admin/views/custom_admin_views/tmpl/default_foot.php +++ b/admin/views/custom_admin_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/custom_admin_views/tmpl/default_head.php b/admin/views/custom_admin_views/tmpl/default_head.php index 7957238dc..249f5b7d6 100644 --- a/admin/views/custom_admin_views/tmpl/default_head.php +++ b/admin/views/custom_admin_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/custom_admin_views/tmpl/default_toolbar.php b/admin/views/custom_admin_views/tmpl/default_toolbar.php index ff763b151..79cfa975d 100644 --- a/admin/views/custom_admin_views/tmpl/default_toolbar.php +++ b/admin/views/custom_admin_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index 02b92937b..fa9ad4b2a 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 31 of this MVC - @build 13th October, 2017 + @version @update number 32 of this MVC + @build 14th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage view.html.php -- 2.40.1 From 30574857bfa7205676558ef2a65e3d140c3aaa98 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sat, 14 Oct 2017 17:56:04 +0200 Subject: [PATCH 08/14] Added shortcut buttons to the admin views list view to quickly access admin fields. Imporved the upgrade script to insure beter conversion of fields from repeatable to subform fields. --- README.md | 2 +- admin/README.txt | 2 +- admin/assets/css/admin_view.css | 2 +- admin/assets/css/admin_views.css | 2 +- admin/controllers/admin_view.php | 2 +- admin/controllers/admin_views.php | 2 +- admin/controllers/ajax.json.php | 5 +- .../en-GB/en-GB.com_componentbuilder.ini | 17 +- .../layouts/admin_view/settings_fullwidth.php | 1 + admin/models/admin_view.php | 39 +-- admin/models/admin_views.php | 10 +- admin/models/ajax.php | 69 +++- admin/models/forms/admin_view.js | 28 +- admin/models/forms/admin_view.xml | 320 +++++++++--------- admin/sql/install.mysql.utf8.sql | 12 +- admin/tables/admin_view.php | 2 +- admin/views/admin_view/submitbutton.js | 2 +- admin/views/admin_view/tmpl/edit.php | 2 +- admin/views/admin_view/view.html.php | 2 +- admin/views/admin_views/tmpl/default.php | 2 +- .../admin_views/tmpl/default_batch_body.php | 2 +- .../admin_views/tmpl/default_batch_footer.php | 2 +- admin/views/admin_views/tmpl/default_body.php | 12 +- admin/views/admin_views/tmpl/default_foot.php | 2 +- admin/views/admin_views/tmpl/default_head.php | 2 +- .../admin_views/tmpl/default_toolbar.php | 2 +- admin/views/admin_views/view.html.php | 2 +- script.php | 44 +-- 28 files changed, 327 insertions(+), 264 deletions(-) diff --git a/README.md b/README.md index 21205ccc6..cd61d5e1a 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **124593** ++ *Line count*: **124646** + *File count*: **742** + *Folder count*: **129** diff --git a/admin/README.txt b/admin/README.txt index 21205ccc6..cd61d5e1a 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -114,7 +114,7 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **124593** ++ *Line count*: **124646** + *File count*: **742** + *Folder count*: **129** diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index fb2857b63..4e25e2269 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 166 of this MVC + @version @update number 178 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index 128d3c749..c2c4821f7 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 166 of this MVC + @version @update number 178 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 100381a8b..89fc2e0e6 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 166 of this MVC + @version @update number 178 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 01d80163e..3b8885d15 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 166 of this MVC + @version @update number 178 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index b140cf7a0..7896e87ed 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -384,9 +384,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy { $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); $typeValue = $jinput->get('type', NULL, 'WORD'); - if($typeValue && $user->id != 0) + $sizeValue = $jinput->get('size', NULL, 'INT'); + if($typeValue && $sizeValue && $user->id != 0) { - $result = $this->getModel('ajax')->getButtonID($typeValue); + $result = $this->getModel('ajax')->getButtonID($typeValue, $sizeValue); } else { diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 3c67fef73..7ae372b1c 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -579,13 +579,15 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION="

The scripts COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL="Advanced notice." COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION="

Please do not change this area unless you would like to add special import to this view that goes beyond the default import concept that Component Builder already does automatic if this view is set to have import & export in the component area where this view is linked to the component.

" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL="Beginners notice." -COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION="
" -COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION="

Linked Fields

Display of the fields will load here!

Field Conditions

Display of the fields conditions will load here!
" +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION="Some Shortcut Buttons
" +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION="

Linked Fields

Display of the fields will load here!

Field Conditions

Display of the fields conditions will load here!
" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION="Here we can add some description to explain how things now work." COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL="Fields & Conditions" -COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION="Only if you add permissions here will this view have permissions." +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION="You can link other views that has relationship with this view. Please watch this tutorial for more info. " +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL="Linked Views Options" +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION="Only if you add permissions here will this view have permissions. Please watch this tutorial for more info." COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL="Permission Implementation" -COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION="If no tabs has been set all fields will be displayed together in one tab." +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION="If no tabs has been set all fields will be displayed together in one tab. Please watch this tutorial for more info." COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL="Tab Setup Options" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION="Notification" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION_CIRCLE="Notification Circle" @@ -876,7 +878,7 @@ COM_COMPONENTBUILDER_BSB_EMCOMPONENT_DETAILSEM="%s component details< COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMOVED="%s has id mismatch of selected field. So the id:%s was removed!" COM_COMPONENTBUILDER_BSITE_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BSITE_VIEWB_SO_THE_IDS_WAS_REMOVED="Site view in %s has id mismatch of selected site view. So the id:%s was removed!" COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB="Snippet id:%s mismatch in %s." -COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED="Button to create %s will show once %s is saved." +COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED_FOR_THE_FIRST_TIME="Button to create %s will show once %s is saved for the first time." COM_COMPONENTBUILDER_BVIEW_TABLE_MAINB_IDS_MISMATCH_IN_BSB="View table main id:%s mismatch in %s." COM_COMPONENTBUILDER_CHAIN="Chain" COM_COMPONENTBUILDER_CHECK_YOUR_OWNER_DETAILS_IT_HAS_NOT_BEEN_SET_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="Check your owner details, it has not been set. Open the JCB Global Options, go to the Company tab and add the correct company details there." @@ -1169,6 +1171,7 @@ COM_COMPONENTBUILDER_CONTRIBUTOR="Contributor" COM_COMPONENTBUILDER_CONTRIBUTORS="Contributors" COM_COMPONENTBUILDER_COPYRIGHT="Copyright" COM_COMPONENTBUILDER_COPYRIGHT_S="Copyright: %s" +COM_COMPONENTBUILDER_CREATE="Create" COM_COMPONENTBUILDER_CREATE_NEW_S="Create New %s" COM_COMPONENTBUILDER_CREATE_S_FOR_THIS_S="Create %s for this %s" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW="Custom Admin View" @@ -2118,6 +2121,8 @@ COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date" COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date." COM_COMPONENTBUILDER_EDIT_S="Edit %s" COM_COMPONENTBUILDER_EDIT_S_FOR_THIS_S="Edit %s for this %s" +COM_COMPONENTBUILDER_EDIT_THE_ADMIN_FIELDS="Edit the admin fields" +COM_COMPONENTBUILDER_EDIT_THE_ADMIN_FIELDS_CONDITIONS="Edit the admin fields conditions" COM_COMPONENTBUILDER_EDIT_VERSIONS="Edit Version" COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions." COM_COMPONENTBUILDER_EMAIL="Email" @@ -4441,6 +4446,8 @@ COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EI COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EIGHT_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEY_WITHOUT_THIS_KEY_IT_WILL_TAKE_THE_CURRENT_TECHNOLOGY_WITH_A_BRUTE_FORCE_ATTACK_METHOD_MORE_THEN_A_HREFHTTPRANDOMIZECOMHOWLONGTOHACKPASS_TARGET_BLANK_TITLEHOW_LONG_TO_HACK_PASSSEVEN_HUNDRED_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZEROA_YEARS_TO_CRACK_THEORETICALLY_UNLESS_THEY_HAVE_THIS_KEY_ABOVE_SO_DO_KEEP_IT_SAFE="Your data is encrypted with a AES 128 bit encryption using the above 32 character key. Without this key it will take the current technology with a brute force attack method more then 700 000 000 000 000 000 000 000 000 000 000 years to crack theoretically. Unless they have this key above, so do keep it safe." COM_COMPONENTBUILDER_YOU_CAN_NOW_SELECT_THE_COMPONENT_BZIPB_PACKAGE_YOU_WOULD_LIKE_TO_IMPORTBR_SMALLPLEASE_NOTE_THAT_SMART_COMPONENT_IMPORT_ONLY_WORKS_WITH_THE_FOLLOWING_FORMAT_BZIPBSMALL="You can now select the component zip package you would like to import.
Please note that smart component import only works with the following format: (.zip)" COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to import a component, please contact your system administrator for more help." +COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE="You have %s %s. Adding more then 50 %s is considered bad practice." +COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S="You have %s %s. Adding more then 50 %s is considered bad practice. Your %s page load in JCB will slowdown. You should consider decoupling some of these %s." COM_COMPONENTBUILDER_YOU_MUST_SELECT_A_COMPONENT="You must select a component!" COM_COMPONENTBUILDER_YOU_SHOULD_ADD_THE_CORRECT_OWNER_DETAILS="You should add the correct owner details." COM_COMPONENTBUILDER_YOU_SHOULD_ONLY_CONTINUE_THIS_IMPORT_IF_YOU_HAVE_BACKUP_YOUR_COMPONENTS_AND_INSURED_THAT_THE_PACKAGE_OWNER_IS_REPUTABLE="You should only continue this import if you have backup your components, and insured that the package owner is reputable." diff --git a/admin/layouts/admin_view/settings_fullwidth.php b/admin/layouts/admin_view/settings_fullwidth.php index dfc4e8171..918939310 100644 --- a/admin/layouts/admin_view/settings_fullwidth.php +++ b/admin/layouts/admin_view/settings_fullwidth.php @@ -34,6 +34,7 @@ $fields = $displayData->get('fields') ?: array( 'addpermissions', 'note_on_tabs', 'addtabs', + 'note_on_linked_views', 'addlinked_views' ); diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 9c853f0af..8574b2c82 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 166 of this MVC + @version @update number 178 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @@ -250,10 +250,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_import_display = base64_decode($item->php_import_display); } - if (!empty($item->css_view)) + if (!empty($item->php_getitem)) { - // base64 Decode css_view. - $item->css_view = base64_decode($item->css_view); + // base64 Decode php_getitem. + $item->php_getitem = base64_decode($item->php_getitem); } if (!empty($item->php_import_save)) @@ -262,6 +262,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_import_save = base64_decode($item->php_import_save); } + if (!empty($item->css_view)) + { + // base64 Decode css_view. + $item->css_view = base64_decode($item->css_view); + } + if (!empty($item->css_views)) { // base64 Decode css_views. @@ -334,12 +340,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_import_setdata = base64_decode($item->php_import_setdata); } - if (!empty($item->php_getitem)) - { - // base64 Decode php_getitem. - $item->php_getitem = base64_decode($item->php_getitem); - } - if (!empty($item->php_import_ext)) { // base64 Decode php_import_ext. @@ -465,6 +465,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin { $this->_db->updateObject('#__componentbuilder_admin_view', $objectUpdate, 'id'); } + // also update the fields and conditions if (!empty($item->id)) { @@ -1445,10 +1446,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_import_display'] = base64_encode($data['php_import_display']); } - // Set the css_view string to base64 string. - if (isset($data['css_view'])) + // Set the php_getitem string to base64 string. + if (isset($data['php_getitem'])) { - $data['css_view'] = base64_encode($data['css_view']); + $data['php_getitem'] = base64_encode($data['php_getitem']); } // Set the php_import_save string to base64 string. @@ -1457,6 +1458,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_import_save'] = base64_encode($data['php_import_save']); } + // Set the css_view string to base64 string. + if (isset($data['css_view'])) + { + $data['css_view'] = base64_encode($data['css_view']); + } + // Set the css_views string to base64 string. if (isset($data['css_views'])) { @@ -1529,12 +1536,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_import_setdata'] = base64_encode($data['php_import_setdata']); } - // Set the php_getitem string to base64 string. - if (isset($data['php_getitem'])) - { - $data['php_getitem'] = base64_encode($data['php_getitem']); - } - // Set the php_import_ext string to base64 string. if (isset($data['php_import_ext'])) { diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index d48d39a3d..cb5a0580a 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 166 of this MVC + @version @update number 178 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @@ -275,10 +275,12 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->sql = base64_decode($item->sql); // decode php_import_display $item->php_import_display = base64_decode($item->php_import_display); - // decode css_view - $item->css_view = base64_decode($item->css_view); + // decode php_getitem + $item->php_getitem = base64_decode($item->php_getitem); // decode php_import_save $item->php_import_save = base64_decode($item->php_import_save); + // decode css_view + $item->css_view = base64_decode($item->css_view); // decode css_views $item->css_views = base64_decode($item->css_views); // decode javascript_view_file @@ -303,8 +305,6 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->html_import_view = base64_decode($item->html_import_view); // decode php_import_setdata $item->php_import_setdata = base64_decode($item->php_import_setdata); - // decode php_getitem - $item->php_getitem = base64_decode($item->php_getitem); // decode php_import_ext $item->php_import_ext = base64_decode($item->php_import_ext); // unset the values we don't want exported. diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 2fedc95cd..9a06f749d 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -252,7 +252,7 @@ class ComponentbuilderModelAjax extends JModelList return false; } - public function getButtonID($type) + public function getButtonID($type, $size) { if (isset($this->buttonArray[$type])) { @@ -272,31 +272,50 @@ class ComponentbuilderModelAjax extends JModelList if ($id = ComponentbuilderHelper::getVar($type, $values['a_id'], $values['a_view'], 'id')) { $buttonText = JText::sprintf('COM_COMPONENTBUILDER_EDIT_S_FOR_THIS_S', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w')); + $buttonTextSmall = JText::_('COM_COMPONENTBUILDER_EDIT'); $editThis = 'index.php?option=com_componentbuilder&view='.$this->buttonArray[$type].'&task='.$type.'.edit&id='.$id; $icon = 'icon-apply'; } else { $buttonText = JText::sprintf('COM_COMPONENTBUILDER_CREATE_S_FOR_THIS_S', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w')); + $buttonTextSmall = JText::_('COM_COMPONENTBUILDER_CREATE'); $editThis = 'index.php?option=com_componentbuilder&view='.$type.'&layout=edit'; $icon = 'icon-new'; } // build the button - $button = '
-
- -
-
- - - ' . $buttonText . ' - -
-
'; + $button = array(); + if (1 == $size) + { + $button[] = '
'; + $button[] = '
'; + $button[] = ''; + $button[] = '
'; + $button[] = '
'; + } + $button[] = ''; + if (1 == $size) + { + $button[] = ''; + $button[] = $buttonText; + $button[] = ''; + $button[] = '
'; + $button[] = '
'; + } + elseif (2 == $size) + { + $button[] = ''; + $button[] = $buttonTextSmall; + $button[] = ''; + } // return the button attached to input field - return $button; + return implode("\n", $button); + } + // only return notice if big button + if (1 == $size) + { + return '
' . JText::sprintf('COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED_FOR_THE_FIRST_TIME', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w')) . '
'; } - return '
' . JText::sprintf('COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w')) . '
'; } } return ''; @@ -366,6 +385,8 @@ class ComponentbuilderModelAjax extends JModelList // build table if (ComponentbuilderHelper::checkArray($rows) && ComponentbuilderHelper::checkArray($head)) { + // set the number of rows + $this->rowNumber = count($rows); // return the table return $this->setSubformTable($head, $rows); } @@ -436,6 +457,8 @@ class ComponentbuilderModelAjax extends JModelList { if (isset($this->fieldsArray[$type])) { + // set type name + $typeName = ComponentbuilderHelper::safeString($type, 'w'); // get the view name & id $values = $this->getViewID(); // check if we are in the correct view. @@ -444,11 +467,23 @@ class ComponentbuilderModelAjax extends JModelList // get the field data if ($fieldsData = ComponentbuilderHelper::getVar($type, (int) $values['a_id'], 'admin_view', $this->fieldsArray[$type])) { - // decode the fields - return $this->getSubformTable($type, $fieldsData); + // get the table + $table = $this->getSubformTable($type, $fieldsData); + // set notice of bad practice + $notice = ''; + if (isset($this->rowNumber) && $this->rowNumber > 50) + { + $notice = '
' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S', $this->rowNumber, $typeName, $typeName, $typeName, $typeName) . '
'; + } + elseif (isset($this->rowNumber)) + { + $notice = '
' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE', $this->rowNumber, $typeName, $typeName) . '
'; + } + // return table + return $notice.$table; } } - return '
' . JText::sprintf('COM_COMPONENTBUILDER_NO_S_HAVE_BEEN_LINKED_TO_THIS_VIEW_SOON_AS_THIS_IS_DONE_IT_WILL_BE_DISPLAYED_HERE', ComponentbuilderHelper::safeString($type, 'w')) . '
'; + return '
' . JText::sprintf('COM_COMPONENTBUILDER_NO_S_HAVE_BEEN_LINKED_TO_THIS_VIEW_SOON_AS_THIS_IS_DONE_IT_WILL_BE_DISPLAYED_HERE', $typeName) . '
'; } return '

' . JText::_('COM_COMPONENTBUILDER_TYPE_ERROR') . '

' . JText::_('COM_COMPONENTBUILDER_THERE_HAS_BEEN_AN_ERROR_IF_THIS_CONTINUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR_OF_A_TYPE_ERROR_IN_THE_FIELDS_DISPLAY_REQUEST') . '

'; } diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 147d54b42..c5975ab03 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 166 of this MVC + @version @update number 178 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @@ -1177,16 +1177,16 @@ function isSet(val) } jQuery(document).ready(function() -{ +{ // set button - addButtonID('admin_fields','create_edit_buttons'); // <-- first + addButtonID('admin_fields','create_edit_buttons', 1); // <-- first var valueSwitch = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); getImportScripts(valueSwitch); - addButtonID('admin_fields_conditions','create_edit_buttons'); // <-- second - // now load the fields getFieldsDisplay('admin_fields'); getFieldsDisplay('admin_fields_conditions'); + // set button + addButtonID('admin_fields_conditions','create_edit_buttons', 1); // <-- second }); function getFieldsDisplay(type){ @@ -1194,6 +1194,8 @@ function getFieldsDisplay(type){ if(result){ jQuery('#display_'+type).html(result); } + // set button + addButtonID(type,'header_'+type+'_buttons', 2); // <-- little edit button }); } @@ -1215,10 +1217,10 @@ function addData(result,where){ jQuery(where).closest('.control-group').parent().append(result); } -function addButtonID_server(type){ +function addButtonID_server(type, size){ var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&vdm="+vastDevMod); - if(token.length > 0 && type.length > 0){ - var request = 'token='+token+'&type='+type; + if(token.length > 0 && type.length > 0 && size > 0){ + var request = 'token='+token+'&type='+type+'&size='+size; } return jQuery.ajax({ type: 'GET', @@ -1228,10 +1230,14 @@ function addButtonID_server(type){ jsonp: 'callback' }); } -function addButtonID(type,where){ - addButtonID_server(type).done(function(result) { +function addButtonID(type, where, size){ + addButtonID_server(type, size).done(function(result) { if(result){ - addData(result,'#jform_'+where); + if (1 == size) { + addData(result, '#jform_'+where); + } else if (2 == size) { + jQuery('#'+where).html(result); + } } }); } diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index 92b12974c..e8690252d 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -489,6 +489,21 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_HINT" required="true" /> + + + + - - - - - - + + - - + + + + + + + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_NO - - - + + type="radio" + name="add_php_getitems" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_NO - + @@ -720,11 +749,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_HINT" required="true" /> - + @@ -748,11 +777,11 @@ - + @@ -775,11 +804,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FILE_HINT" required="true" /> - + @@ -803,11 +832,11 @@ - + @@ -830,11 +859,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_HINT" required="true" /> - + @@ -858,11 +887,11 @@ - + @@ -885,11 +914,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FILE_HINT" required="true" /> - + @@ -913,11 +942,11 @@ - + @@ -940,11 +969,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FOOTER_HINT" required="true" /> - + @@ -968,11 +997,11 @@ - + @@ -1491,11 +1520,11 @@ - + @@ -1518,11 +1547,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_HINT" required="false" /> - + @@ -1545,11 +1574,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_HINT" required="false" /> - + @@ -1572,33 +1601,6 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_HINT" required="false" /> - - - - - - - - + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_NO - - - - COM_COMPONENTBUILDER_ADMIN_VIEW_NO + + + + - + @@ -1838,32 +1866,6 @@ - - - - escape($item->system_name); ?> + +
+ get('admin_view.edit') && $admin_field_id = ComponentbuilderHelper::getVar('admin_fields', $item->id, 'admin_view', 'id')): ?> + + + get('admin_view.edit') && $admin_condition_id = ComponentbuilderHelper::getVar('admin_fields_conditions', $item->id, 'admin_view', 'id')): ?> + + +
+ escape($item->name_single); ?> diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index dd7daf81b..4c4825635 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 166 of this MVC + @version @update number 178 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index 77d1311ad..8ff9c1289 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 166 of this MVC + @version @update number 178 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index 7294b10ad..14dda9851 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 166 of this MVC + @version @update number 178 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index f5a4d357d..f7a14180c 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 166 of this MVC + @version @update number 178 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/script.php b/script.php index 3f8e8fe54..23f4d5d2d 100644 --- a/script.php +++ b/script.php @@ -1929,9 +1929,9 @@ class com_componentbuilderInstallerScript if (count($version) == 3 && $version[0] <= 2 && $version[1] <= 5 && (($version[1] == 5 && $version[2] <= 4) || ($version[1] < 5))) { // do some conversions in the translations table - $convertRepeatable($db, 'language_translation', array('id', 'translation'), array('translation' => array('check' => array('translation','language'), 'key' => 'translation'))); + $convertRepeatable($db, 'language_translation', array('id', 'translation'), array('translation' => array('check' => array('translation'), 'key' => 'translation'))); // do some conversions in the fieldtype table - $convertRepeatable($db, 'fieldtype', array('id', 'properties'), array('properties' => array('check' => array('name','mandatory'), 'key' => 'properties'))); + $convertRepeatable($db, 'fieldtype', array('id', 'properties'), array('properties' => array('check' => array('name'), 'key' => 'properties'))); } // target version less then 2.5.6 if (count($version) == 3 && $version[0] <= 2 && $version[1] <= 5 && (($version[1] == 5 && $version[2] <= 5) || ($version[1] < 5))) @@ -1939,12 +1939,12 @@ class com_componentbuilderInstallerScript // do some conversions in the dynamic get table $convertRepeatable($db, 'dynamic_get', array('id', 'join_view_table', 'join_db_table', 'filter', 'where', 'order', 'global'), array( - 'join_view_table' => array('check' => array('view_table','row_type','as','type'), 'key' => 'join_view_table'), - 'join_db_table' => array('check' => array('db_table','row_type','as','type'), 'key' => 'join_db_table'), - 'filter' => array('check' => array('filter_type', 'state_key', 'operator'), 'key' => 'filter'), - 'where' => array('check' => array('table_key', 'operator', 'value_key'), 'key' => 'where'), - 'order' => array('check' => array('table_key', 'direction'), 'key' => 'order'), - 'global' => array('check' => array('name', 'key', 'as', 'type'), 'key' => 'global') + 'join_view_table' => array('check' => array('view_table'), 'key' => 'join_view_table'), + 'join_db_table' => array('check' => array('db_table'), 'key' => 'join_db_table'), + 'filter' => array('check' => array('filter_type'), 'key' => 'filter'), + 'where' => array('check' => array('table_key'), 'key' => 'where'), + 'order' => array('check' => array('table_key'), 'key' => 'order'), + 'global' => array('check' => array('name'), 'key' => 'global') ) ); } @@ -1954,29 +1954,29 @@ class com_componentbuilderInstallerScript // do some conversions in the admin_view table $convertRepeatable($db, 'admin_view', array('id', 'ajax_input', 'custom_button', 'addtables', 'addlinked_views', 'addconditions', 'addfields', 'addtabs', 'addpermissions'), array( - 'ajax_input' => array('check' => array('value_name','task_name','input_default','input_filter','method_name', 'user_check'), 'key' => 'ajax_input'), - 'custom_button' => array('check' => array('icomoon', 'name', 'method', 'target', 'type'), 'key' => 'custom_button'), - 'addtables' => array('check' => array('dbtables', 'sourcemap'), 'key' => 'addtables'), - 'addlinked_views' => array('check' => array('adminview', 'tab', 'key', 'parentkey', 'addnew'), 'key' => 'addlinked_views'), - 'addconditions' => array('check' => array('target_field', 'target_behavior', 'target_relation', 'match_field', 'match_behavior', 'match_options'), 'key' => 'addconditions'), - 'addfields' => array('check' => array('field', 'list', 'order_list', 'title', 'alias', 'sort', 'search', 'filter', 'link', 'tab', 'alignment', 'order_edit', 'permission'), 'key' => 'addfields'), + 'ajax_input' => array('check' => array('value_name'), 'key' => 'ajax_input'), + 'custom_button' => array('check' => array('name'), 'key' => 'custom_button'), + 'addtables' => array('check' => array('table'), 'key' => 'addtables'), + 'addlinked_views' => array('check' => array('adminview'), 'key' => 'addlinked_views'), + 'addconditions' => array('check' => array('target_field'), 'key' => 'addconditions'), + 'addfields' => array('check' => array('field'), 'key' => 'addfields'), 'addtabs' => array('check' => array('name'), 'key' => 'addtabs'), - 'addpermissions' => array('check' => array('action', 'implementation'), 'key' => 'addpermissions') + 'addpermissions' => array('check' => array('action'), 'key' => 'addpermissions') ) ); // do some conversions in the site_view table $convertRepeatable($db, 'site_view', array('id', 'ajax_input', 'custom_button'), array( - 'ajax_input' => array('check' => array('value_name','task_name','input_default','input_filter','method_name', 'user_check'), 'key' => 'ajax_input'), - 'custom_button' => array('check' => array('icomoon', 'name', 'method', 'target', 'type'), 'key' => 'custom_button') + 'ajax_input' => array('check' => array('value_name'), 'key' => 'ajax_input'), + 'custom_button' => array('check' => array('name'), 'key' => 'custom_button') ) ); // do some conversions in the custom_admin_view table $convertRepeatable($db, 'custom_admin_view', array('id', 'custom_button'), array( - 'custom_button' => array('check' => array('icomoon', 'name', 'method', 'target', 'type'), 'key' => 'custom_button') + 'custom_button' => array('check' => array('name'), 'key' => 'custom_button') ) ); } @@ -2045,9 +2045,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $admin_view_Inserted = $db->insertObject('#__content_types', $admin_view); @@ -2316,9 +2316,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Check if admin_view type is already in content_type DB. $admin_view_id = null; -- 2.40.1 From 5a14049afd09bba17e2d330122e29cb99db1c16d Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sat, 14 Oct 2017 19:18:29 +0200 Subject: [PATCH 09/14] Removed JError from admin views, and compiler. Added edit link to each field in admin view. Removed linked to admin view from fields view --- README.md | 4 +- admin/README.txt | 4 +- admin/assets/css/admin_view.css | 2 +- admin/assets/css/admin_views.css | 2 +- admin/assets/css/field.css | 4 +- admin/assets/css/fields.css | 4 +- admin/assets/css/joomla_component.css | 4 +- admin/assets/css/joomla_components.css | 4 +- admin/compiler/joomla_3/DASHJViewLagacy.php | 12 +- admin/compiler/joomla_3/JViewLegacy_edit.php | 13 +- .../joomla_3/JViewLegacy_edit_site.php | 13 +- .../compiler/joomla_3/JViewLegacy_import.php | 15 +-- admin/compiler/joomla_3/JViewLegacy_list.php | 13 +- .../joomla_3/JViewLegacy_list_site.php | 2 +- admin/compiler/joomla_3/JViewLegacy_site.php | 2 +- admin/controllers/admin_view.php | 2 +- admin/controllers/admin_views.php | 2 +- admin/controllers/field.php | 4 +- admin/controllers/fields.php | 4 +- admin/controllers/joomla_component.php | 4 +- admin/controllers/joomla_components.php | 4 +- admin/helpers/compiler/e_Interpretation.php | 14 +- .../en-GB/en-GB.com_componentbuilder.ini | 1 - .../field/linked_admin_views_fullwidth.php | 126 ------------------ admin/layouts/fieldtype/fields_fullwidth.php | 2 +- .../ftp/linked_components_fullwidth.php | 2 +- admin/models/admin_view.php | 2 +- admin/models/admin_views.php | 2 +- admin/models/ajax.php | 30 ++++- admin/models/field.php | 84 +----------- admin/models/fields.php | 4 +- admin/models/fieldtype.php | 26 ++-- admin/models/forms/admin_view.js | 2 +- admin/models/forms/field.js | 4 +- admin/models/forms/help_document.js | 60 ++++----- admin/models/forms/joomla_component.js | 4 +- admin/models/ftp.php | 16 +-- admin/models/joomla_component.php | 4 +- admin/models/joomla_components.php | 4 +- admin/tables/admin_view.php | 2 +- admin/tables/field.php | 4 +- admin/tables/joomla_component.php | 4 +- admin/views/admin_fields/view.html.php | 13 +- .../admin_fields_conditions/view.html.php | 13 +- admin/views/admin_view/submitbutton.js | 2 +- admin/views/admin_view/tmpl/edit.php | 2 +- admin/views/admin_view/view.html.php | 15 +-- admin/views/admin_views/tmpl/default.php | 2 +- .../admin_views/tmpl/default_batch_body.php | 2 +- .../admin_views/tmpl/default_batch_footer.php | 2 +- admin/views/admin_views/tmpl/default_body.php | 2 +- admin/views/admin_views/tmpl/default_foot.php | 2 +- admin/views/admin_views/tmpl/default_head.php | 2 +- .../admin_views/tmpl/default_toolbar.php | 2 +- admin/views/admin_views/view.html.php | 15 +-- admin/views/admins_fields/view.html.php | 13 +- .../admins_fields_conditions/view.html.php | 13 +- admin/views/compiler/view.html.php | 14 +- admin/views/componentbuilder/view.html.php | 12 +- admin/views/custom_admin_view/view.html.php | 13 +- admin/views/custom_admin_views/view.html.php | 13 +- admin/views/custom_code/view.html.php | 13 +- admin/views/custom_codes/view.html.php | 13 +- admin/views/dynamic_get/view.html.php | 13 +- admin/views/dynamic_gets/view.html.php | 13 +- admin/views/field/submitbutton.js | 4 +- admin/views/field/tmpl/edit.php | 16 +-- admin/views/field/view.html.php | 34 ++--- admin/views/fields/tmpl/default.php | 4 +- .../views/fields/tmpl/default_batch_body.php | 4 +- .../fields/tmpl/default_batch_footer.php | 4 +- admin/views/fields/tmpl/default_body.php | 4 +- admin/views/fields/tmpl/default_foot.php | 4 +- admin/views/fields/tmpl/default_head.php | 4 +- admin/views/fields/tmpl/default_toolbar.php | 4 +- admin/views/fields/view.html.php | 17 ++- admin/views/fieldtype/view.html.php | 15 +-- admin/views/fieldtypes/view.html.php | 13 +- admin/views/ftp/view.html.php | 15 +-- admin/views/ftps/view.html.php | 13 +- admin/views/help_document/view.html.php | 13 +- admin/views/help_documents/view.html.php | 13 +- admin/views/import/view.html.php | 15 +-- .../import_joomla_components/view.html.php | 13 +- admin/views/joomla_component/submitbutton.js | 4 +- admin/views/joomla_component/tmpl/edit.php | 4 +- admin/views/joomla_component/view.html.php | 17 ++- .../views/joomla_components/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../joomla_components/tmpl/default_body.php | 4 +- .../joomla_components/tmpl/default_foot.php | 4 +- .../joomla_components/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/joomla_components/view.html.php | 17 ++- admin/views/language/view.html.php | 13 +- .../views/language_translation/view.html.php | 13 +- .../views/language_translations/view.html.php | 13 +- admin/views/languages/view.html.php | 13 +- admin/views/layout/view.html.php | 13 +- admin/views/layouts/view.html.php | 13 +- admin/views/site_view/view.html.php | 13 +- admin/views/site_views/view.html.php | 13 +- admin/views/snippet/view.html.php | 13 +- admin/views/snippets/view.html.php | 13 +- admin/views/template/view.html.php | 13 +- admin/views/templates/view.html.php | 13 +- site/views/api/view.html.php | 16 +-- 108 files changed, 464 insertions(+), 706 deletions(-) delete mode 100644 admin/layouts/field/linked_admin_views_fullwidth.php diff --git a/README.md b/README.md index cd61d5e1a..066ddd6e4 100644 --- a/README.md +++ b/README.md @@ -114,8 +114,8 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **124646** -+ *File count*: **742** ++ *Line count*: **124408** ++ *File count*: **741** + *Folder count*: **129** > 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 cd61d5e1a..066ddd6e4 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -114,8 +114,8 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **124646** -+ *File count*: **742** ++ *Line count*: **124408** ++ *File count*: **741** + *Folder count*: **129** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index 4e25e2269..c15c77917 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index c2c4821f7..90abc7897 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/field.css b/admin/assets/css/field.css index 34e250e11..8d04aefaf 100644 --- a/admin/assets/css/field.css +++ b/admin/assets/css/field.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.css diff --git a/admin/assets/css/fields.css b/admin/assets/css/fields.css index ef91a124a..52ca1ec11 100644 --- a/admin/assets/css/fields.css +++ b/admin/assets/css/fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.css diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index 2027652f6..505c76715 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.css diff --git a/admin/assets/css/joomla_components.css b/admin/assets/css/joomla_components.css index 536d7eb85..674cb60a3 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.css diff --git a/admin/compiler/joomla_3/DASHJViewLagacy.php b/admin/compiler/joomla_3/DASHJViewLagacy.php index aa2a624bd..6e6bc3e7f 100644 --- a/admin/compiler/joomla_3/DASHJViewLagacy.php +++ b/admin/compiler/joomla_3/DASHJViewLagacy.php @@ -43,12 +43,6 @@ class ###Component###View###Component### extends JViewLegacy */ function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - }; // Assign data to the view $this->icons = $this->get('Icons'); $this->contributors = ###Component###Helper::getContributors();###DASH_GET_CUSTOM_DATA### @@ -58,6 +52,12 @@ class ###Component###View###Component### extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/compiler/joomla_3/JViewLegacy_edit.php b/admin/compiler/joomla_3/JViewLegacy_edit.php index c4fc3f474..02c368cea 100644 --- a/admin/compiler/joomla_3/JViewLegacy_edit.php +++ b/admin/compiler/joomla_3/JViewLegacy_edit.php @@ -43,13 +43,6 @@ class ###Component###View###View### extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -75,6 +68,12 @@ class ###Component###View###View### extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/compiler/joomla_3/JViewLegacy_edit_site.php b/admin/compiler/joomla_3/JViewLegacy_edit_site.php index 26c1dcbca..349a82e43 100644 --- a/admin/compiler/joomla_3/JViewLegacy_edit_site.php +++ b/admin/compiler/joomla_3/JViewLegacy_edit_site.php @@ -43,13 +43,6 @@ class ###Component###View###View### extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -75,6 +68,12 @@ class ###Component###View###View### extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/compiler/joomla_3/JViewLegacy_import.php b/admin/compiler/joomla_3/JViewLegacy_import.php index 42ed0f5bd..833072364 100644 --- a/admin/compiler/joomla_3/JViewLegacy_import.php +++ b/admin/compiler/joomla_3/JViewLegacy_import.php @@ -44,20 +44,13 @@ class ###Component###ViewImport extends JViewLegacy protected $dataType; public function display($tpl = null) - { + { if ($this->getLayout() !== 'modal') { // Include helper submenu ###Component###Helper::addSubmenu('import'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - $paths = new stdClass; $paths->first = ''; $state = $this->get('state'); @@ -86,6 +79,12 @@ class ###Component###ViewImport extends JViewLegacy // clear the data type $session->clear('dataType'); } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/compiler/joomla_3/JViewLegacy_list.php b/admin/compiler/joomla_3/JViewLegacy_list.php index e5673e48c..72dd08795 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list.php +++ b/admin/compiler/joomla_3/JViewLegacy_list.php @@ -49,13 +49,6 @@ class ###Component###View###Views### extends JViewLegacy ###Component###Helper::addSubmenu('###views###'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -78,6 +71,12 @@ class ###Component###View###Views### extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/compiler/joomla_3/JViewLegacy_list_site.php b/admin/compiler/joomla_3/JViewLegacy_list_site.php index 8a40e709a..c1e5c7823 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list_site.php +++ b/admin/compiler/joomla_3/JViewLegacy_list_site.php @@ -39,7 +39,7 @@ class ###Component###View###SViews### extends JViewLegacy { // Overwriting JView display method function display($tpl = null) - { + { // get combined params of both component and menu $this->app = JFactory::getApplication(); $this->params = $this->app->getParams(); diff --git a/admin/compiler/joomla_3/JViewLegacy_site.php b/admin/compiler/joomla_3/JViewLegacy_site.php index fd3d54590..851377023 100644 --- a/admin/compiler/joomla_3/JViewLegacy_site.php +++ b/admin/compiler/joomla_3/JViewLegacy_site.php @@ -39,7 +39,7 @@ class ###Component###View###SView### extends JViewLegacy { // Overwriting JView display method function display($tpl = null) - { + { // get combined params of both component and menu $this->app = JFactory::getApplication(); $this->params = $this->app->getParams(); diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 89fc2e0e6..73d40233a 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 3b8885d15..da4e2fa24 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/field.php b/admin/controllers/field.php index 711349549..7a8c3c828 100644 --- a/admin/controllers/field.php +++ b/admin/controllers/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index c3e0de702..e965dde8c 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index 0404fc540..681eaca24 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index 58070de39..00847f20b 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index d53df8225..bd06a8ba1 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -2840,13 +2840,6 @@ class Interpretation extends Fields $method .= PHP_EOL."\t\t\$this->".ComponentbuilderHelper::safeString($custom_get_name)."\t= \$this->get('".$custom_get_name."');"; } } - - $method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Check for errors."; - $method .= PHP_EOL."\t\tif (count(\$errors = \$this->get('Errors')))"; - $method .= PHP_EOL."\t\t{"; - $method .= PHP_EOL."\t\t\tJError::raiseError(500, ".'implode(PHP_EOL, $errors));'; - $method .= PHP_EOL."\t\t\treturn false;"; - $method .= PHP_EOL."\t\t}"; // add custom script if ($view['settings']->add_php_jview_display == 1) { @@ -2875,6 +2868,13 @@ class Interpretation extends Fields $method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." set the document"; $method .= PHP_EOL."\t\t\$this->setDocument();"; } + + $method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Check for errors."; + $method .= PHP_EOL."\t\tif (count(\$errors = \$this->get('Errors')))"; + $method .= PHP_EOL."\t\t{"; + $method .= PHP_EOL."\t\t\tthrow new Exception(implode(\"\n\", \$errors), 500);"; + $method .= PHP_EOL."\t\t}"; + $method .= PHP_EOL.PHP_EOL."\t\tparent::display(\$tpl);"; } return $method; diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 7ae372b1c..da6d3558c 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -2369,7 +2369,6 @@ COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_HINT="// JavaScript for the ed COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL="Javascript" COM_COMPONENTBUILDER_FIELD_JSON="JSON" COM_COMPONENTBUILDER_FIELD_KEY="KEY" -COM_COMPONENTBUILDER_FIELD_LINKED_ADMIN_VIEWS="Linked - Admin Views" COM_COMPONENTBUILDER_FIELD_LONGTEXT="LONGTEXT" COM_COMPONENTBUILDER_FIELD_MEDIUMTEXT="MEDIUMTEXT" COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_DESC="The last user that modified this Field." diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php deleted file mode 100644 index d1600e6dd..000000000 --- a/admin/layouts/field/linked_admin_views_fullwidth.php +++ /dev/null @@ -1,126 +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 - - Builds Complex Joomla Components - -/-----------------------------------------------------------------------------------------------------------------------------*/ - -// No direct access to this file - -defined('_JEXEC') or die('Restricted access'); - -// set the defaults -$items = $displayData->wablinked_admin_views; -$user = JFactory::getUser(); -$id = $displayData->item->id; -$edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit"; - -?> -
- - - - - - - - - - - - - - $item): ?> - authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; - $userChkOut = JFactory::getUser($item->checked_out); - $canDo = ComponentbuilderHelper::getActions('admin_view',$item,'admin_views'); - ?> - - - - - - published == 1):?> - - published == 0):?> - - published == 2):?> - - published == -2):?> - - - - - - -
- - - - - - - - - - - -
- get('admin_view.edit')): ?> - escape($item->system_name); ?> - checked_out): ?> - name, $item->checked_out_time, 'admin_views.', $canCheckin); ?> - - -
escape($item->system_name); ?>
- - 		- escape($item->name_single); ?> - - escape($item->name_list); ?> - - escape($item->short_description); ?> - - - - - - - - - - - - - - - - - - id; ?> -
- -
- -
- -
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 6f58722cc..ca928cbc7 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wacfields; +$items = $displayData->wabfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index 82b6fbcfe..5be0d2cc0 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wadlinked_components; +$items = $displayData->waclinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 8574b2c82..c4659447e 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index cb5a0580a..bffdae389 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 9a06f749d..e9f93893b 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -449,6 +449,7 @@ class ComponentbuilderModelAjax extends JModelList } } + protected $ref; protected $fieldsArray = array( 'admin_fields' => 'addfields', 'admin_fields_conditions' => 'addconditions'); @@ -464,6 +465,7 @@ class ComponentbuilderModelAjax extends JModelList // check if we are in the correct view. if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view']) && $values['a_view'] === 'admin_view') { + $this->ref = '&ref=admin_view&refid=' . $values['a_id']; // get the field data if ($fieldsData = ComponentbuilderHelper::getVar($type, (int) $values['a_id'], 'admin_view', $this->fieldsArray[$type])) { @@ -533,7 +535,7 @@ class ComponentbuilderModelAjax extends JModelList $this->fieldNames[$field] = JText::_('COM_COMPONENTBUILDER_NO_FIELD_FOUND'); } } - $bucket[] = $this->fieldNames[$field]; + $bucket[] = $this->fieldNames[$field] . $this->addEditLink($field, 'field', 'fields'); } } elseif (is_numeric($value)) @@ -545,7 +547,7 @@ class ComponentbuilderModelAjax extends JModelList $this->fieldNames[$value] = JText::_('COM_COMPONENTBUILDER_NO_FIELD_FOUND'); } } - $bucket[] = $this->fieldNames[$value]; + $bucket[] = $this->fieldNames[$value] . $this->addEditLink($value, 'field', 'fields'); } // return found fields if (ComponentbuilderHelper::checkArray($bucket)) @@ -555,6 +557,30 @@ class ComponentbuilderModelAjax extends JModelList return JText::_('COM_COMPONENTBUILDER_NO_FIELD_FOUND'); } + protected function addEditLink($id, $view, $views) + { + // can edit + if ($this->canEdit($id)) + { + $edit = "index.php?option=com_componentbuilder&view=".$views."&task=".$view.".edit&id=".$id.$this->ref; + return ' '; + + } + return ''; + } + + protected $user; + + protected function canEdit($id, $view = 'admin_fields') + { + // load field permission check + if (!ComponentbuilderHelper::checkObject($this->user)) // TODO && $this->user instanceof JUser) + { + $this->user = JFactory::getUser(); + } + return $this->user->authorise($view.'.edit', 'com_componentbuilder.'.$view.'.' . (int) $id); + } + protected $tabNames = array(); protected function setTabName($header, $value) diff --git a/admin/models/field.php b/admin/models/field.php index bff97fa66..f9485479c 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.php @@ -130,87 +130,9 @@ class ComponentbuilderModelField extends JModelAdmin $item->tags = new JHelperTags; $item->tags->getTagIds($item->id, 'com_componentbuilder.field'); } - } - $this->addfieldsvvwc = $item->id; + } return $item; - } - - /** - * Method to get list data. - * - * @return mixed An array of data items on success, false on failure. - */ - public function getWablinked_admin_views() - { - // Get the user object. - $user = JFactory::getUser(); - // Create a new query object. - $db = JFactory::getDBO(); - $query = $db->getQuery(true); - - // Select some fields - $query->select('a.*'); - - // From the componentbuilder_admin_view table - $query->from($db->quoteName('#__componentbuilder_admin_view', 'a')); - - // Order the results by ordering - $query->order('a.published ASC'); - $query->order('a.ordering ASC'); - - // Load the items - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - $items = $db->loadObjectList(); - - // set values to display correctly. - if (ComponentbuilderHelper::checkArray($items)) - { - // get user object. - $user = JFactory::getUser(); - foreach ($items as $nr => &$item) - { - $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); - if (!$access) - { - unset($items[$nr]); - continue; - } - - } - } - - // Filter by addfieldsvvwc in this Repetable Field - if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvwc)) - { - foreach ($items as $nr => &$item) - { - if (isset($item->addfields) && ComponentbuilderHelper::checkJson($item->addfields)) - { - $tmpArray = json_decode($item->addfields,true); - if (!isset($tmpArray['field']) || !ComponentbuilderHelper::checkArray($tmpArray['field']) || !in_array($this->addfieldsvvwc, $tmpArray['field'])) - { - unset($items[$nr]); - continue; - } - } - else - { - unset($items[$nr]); - continue; - } - } - } - else - { - return false; - } - return $items; - } - return false; } /** diff --git a/admin/models/fields.php b/admin/models/fields.php index 8756f7e0d..7f06213d1 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 07b5797db..43e0c2e5a 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -129,7 +129,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.fieldtype'); } } - $this->fieldtypevvwd = $item->id; + $this->fieldtypevvwc = $item->id; return $item; } @@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWacfields() + public function getWabfields() { // Get the user object. $user = JFactory::getUser(); @@ -159,15 +159,15 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $query->select($db->quoteName('g.name','fieldtype_name')); $query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('g.id') . ')'); - // Filter by fieldtypevvwd global. - $fieldtypevvwd = $this->fieldtypevvwd; - if (is_numeric($fieldtypevvwd )) + // Filter by fieldtypevvwc global. + $fieldtypevvwc = $this->fieldtypevvwc; + if (is_numeric($fieldtypevvwc )) { - $query->where('a.fieldtype = ' . (int) $fieldtypevvwd ); + $query->where('a.fieldtype = ' . (int) $fieldtypevvwc ); } - elseif (is_string($fieldtypevvwd)) + elseif (is_string($fieldtypevvwc)) { - $query->where('a.fieldtype = ' . $db->quote($fieldtypevvwd)); + $query->where('a.fieldtype = ' . $db->quote($fieldtypevvwc)); } else { @@ -208,13 +208,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationWacfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationWabfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationWacfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationWabfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationWacfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationWabfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationWacfields($item->store, 'store'); + $item->store = $this->selectionTranslationWabfields($item->store, 'store'); } } @@ -228,7 +228,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationWacfields($value,$name) + public function selectionTranslationWabfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index c5975ab03..9e7fce9ff 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js index 6296ea07e..da75ddc16 100644 --- a/admin/models/forms/field.js +++ b/admin/models/forms/field.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.js diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 381029af4..269d2972d 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -23,12 +23,12 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvwafwae_required = false; -jform_vvvvwagwaf_required = false; -jform_vvvvwahwag_required = false; -jform_vvvvwaiwah_required = false; -jform_vvvvwajwai_required = false; -jform_vvvvwakwaj_required = false; +jform_vvvvwafwad_required = false; +jform_vvvvwagwae_required = false; +jform_vvvvwahwaf_required = false; +jform_vvvvwaiwag_required = false; +jform_vvvvwajwah_required = false; +jform_vvvvwakwai_required = false; // Initial Script jQuery(document).ready(function() @@ -59,26 +59,26 @@ function vvvvwaf(location_vvvvwaf) if (location_vvvvwaf == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); - if (jform_vvvvwafwae_required) + if (jform_vvvvwafwad_required) { updateFieldRequired('admin_view',0); jQuery('#jform_admin_view').prop('required','required'); jQuery('#jform_admin_view').attr('aria-required',true); jQuery('#jform_admin_view').addClass('required'); - jform_vvvvwafwae_required = false; + jform_vvvvwafwad_required = false; } } else { jQuery('#jform_admin_view').closest('.control-group').hide(); - if (!jform_vvvvwafwae_required) + if (!jform_vvvvwafwad_required) { updateFieldRequired('admin_view',1); jQuery('#jform_admin_view').removeAttr('required'); jQuery('#jform_admin_view').removeAttr('aria-required'); jQuery('#jform_admin_view').removeClass('required'); - jform_vvvvwafwae_required = true; + jform_vvvvwafwad_required = true; } } } @@ -90,26 +90,26 @@ function vvvvwag(location_vvvvwag) if (location_vvvvwag == 2) { jQuery('#jform_site_view').closest('.control-group').show(); - if (jform_vvvvwagwaf_required) + if (jform_vvvvwagwae_required) { updateFieldRequired('site_view',0); jQuery('#jform_site_view').prop('required','required'); jQuery('#jform_site_view').attr('aria-required',true); jQuery('#jform_site_view').addClass('required'); - jform_vvvvwagwaf_required = false; + jform_vvvvwagwae_required = false; } } else { jQuery('#jform_site_view').closest('.control-group').hide(); - if (!jform_vvvvwagwaf_required) + if (!jform_vvvvwagwae_required) { updateFieldRequired('site_view',1); jQuery('#jform_site_view').removeAttr('required'); jQuery('#jform_site_view').removeAttr('aria-required'); jQuery('#jform_site_view').removeClass('required'); - jform_vvvvwagwaf_required = true; + jform_vvvvwagwae_required = true; } } } @@ -134,26 +134,26 @@ function vvvvwah(type_vvvvwah) if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_vvvvwahwag_required) + if (jform_vvvvwahwaf_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_vvvvwahwag_required = false; + jform_vvvvwahwaf_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_vvvvwahwag_required) + if (!jform_vvvvwahwaf_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_vvvvwahwag_required = true; + jform_vvvvwahwaf_required = true; } } } @@ -189,26 +189,26 @@ function vvvvwai(type_vvvvwai) if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_vvvvwaiwah_required) + if (jform_vvvvwaiwag_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_vvvvwaiwah_required = false; + jform_vvvvwaiwag_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_vvvvwaiwah_required) + if (!jform_vvvvwaiwag_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_vvvvwaiwah_required = true; + jform_vvvvwaiwag_required = true; } } } @@ -244,26 +244,26 @@ function vvvvwaj(type_vvvvwaj) if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_vvvvwajwai_required) + if (jform_vvvvwajwah_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_vvvvwajwai_required = false; + jform_vvvvwajwah_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_vvvvwajwai_required) + if (!jform_vvvvwajwah_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_vvvvwajwai_required = true; + jform_vvvvwajwah_required = true; } } } @@ -286,26 +286,26 @@ function vvvvwak(target_vvvvwak) if (target_vvvvwak == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_vvvvwakwaj_required) + if (jform_vvvvwakwai_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_vvvvwakwaj_required = false; + jform_vvvvwakwai_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_vvvvwakwaj_required) + if (!jform_vvvvwakwai_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvwakwaj_required = true; + jform_vvvvwakwai_required = true; } } } diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js index 9bb88eca3..b7a9c5371 100644 --- a/admin/models/forms/joomla_component.js +++ b/admin/models/forms/joomla_component.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.js diff --git a/admin/models/ftp.php b/admin/models/ftp.php index 5eae1e7a7..e159f9927 100644 --- a/admin/models/ftp.php +++ b/admin/models/ftp.php @@ -112,7 +112,7 @@ class ComponentbuilderModelFtp extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.ftp'); } } - $this->sales_server_ftpupdate_server_ftp_vvwe = $item->id; + $this->sales_server_ftpupdate_server_ftp_vvwd = $item->id; return $item; } @@ -122,7 +122,7 @@ class ComponentbuilderModelFtp extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWadlinked_components() + public function getWaclinked_components() { // Get the user object. $user = JFactory::getUser(); @@ -136,15 +136,15 @@ class ComponentbuilderModelFtp extends JModelAdmin // From the componentbuilder_joomla_component table $query->from($db->quoteName('#__componentbuilder_joomla_component', 'a')); - // Filter by sales_server_ftpupdate_server_ftp_vvwe global. - $sales_server_ftpupdate_server_ftp_vvwe = $this->sales_server_ftpupdate_server_ftp_vvwe; - if (is_numeric($sales_server_ftpupdate_server_ftp_vvwe )) + // Filter by sales_server_ftpupdate_server_ftp_vvwd global. + $sales_server_ftpupdate_server_ftp_vvwd = $this->sales_server_ftpupdate_server_ftp_vvwd; + if (is_numeric($sales_server_ftpupdate_server_ftp_vvwd )) { - $query->where('a.sales_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvwe . ' OR a.update_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvwe, ' OR'); + $query->where('a.sales_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvwd . ' OR a.update_server_ftp = ' . (int) $sales_server_ftpupdate_server_ftp_vvwd, ' OR'); } - elseif (is_string($sales_server_ftpupdate_server_ftp_vvwe)) + elseif (is_string($sales_server_ftpupdate_server_ftp_vvwd)) { - $query->where('a.sales_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvwe) . ' OR a.update_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvwe), ' OR'); + $query->where('a.sales_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvwd) . ' OR a.update_server_ftp = ' . $db->quote($sales_server_ftpupdate_server_ftp_vvwd), ' OR'); } else { diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index 28fa84730..6c032b573 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index f328bff01..39016e611 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index e01682861..23b0c8e54 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/tables/field.php b/admin/tables/field.php index bce6c81d9..739f6888c 100644 --- a/admin/tables/field.php +++ b/admin/tables/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php index 39b30193c..7d418c718 100644 --- a/admin/tables/joomla_component.php +++ b/admin/tables/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php index a116235e6..2bfdc9878 100644 --- a/admin/views/admin_fields/view.html.php +++ b/admin/views/admin_fields/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -72,6 +65,12 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php index a13dd08ce..eee425ef1 100644 --- a/admin/views/admin_fields_conditions/view.html.php +++ b/admin/views/admin_fields_conditions/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -72,6 +65,12 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index 2cecab9f7..c8048cf6d 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index 2b6b322a2..488816fdc 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index 6106ec583..ed136929e 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @@ -40,13 +40,6 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -75,6 +68,12 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 14f020833..94535d8de 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index cf28b263f..06b04c4c2 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index e48cb0308..354a1732f 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 40835f355..69a929a98 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index 4c4825635..016124a73 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index 8ff9c1289..b46aa2708 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index 14dda9851..3a34a14d5 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index f7a14180c..9496270b7 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 178 of this MVC + @version @update number 184 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @@ -46,13 +46,6 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy ComponentbuilderHelper::addSubmenu('admin_views'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php index 10f76ee33..0dd4e3471 100644 --- a/admin/views/admins_fields/view.html.php +++ b/admin/views/admins_fields/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy ComponentbuilderHelper::addSubmenu('admins_fields'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php index 8d0b6f9bf..ebb724e05 100644 --- a/admin/views/admins_fields_conditions/view.html.php +++ b/admin/views/admins_fields_conditions/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy ComponentbuilderHelper::addSubmenu('admins_fields_conditions'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index 3c3f66bea..5175aada4 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -47,13 +47,6 @@ class ComponentbuilderViewCompiler extends JViewLegacy $this->canDo = ComponentbuilderHelper::getActions('compiler'); // Initialise variables. $this->items = $this->get('Items'); - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode(PHP_EOL, $errors)); - return false; - } if ($this->getLayout() !== 'modal') { // Include helper submenu @@ -74,6 +67,13 @@ class ComponentbuilderViewCompiler extends JViewLegacy // set the document $this->setDocument(); + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode(" +", $errors), 500); + } + parent::display($tpl); } diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 5f72d5eb9..97550a9e6 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -40,12 +40,6 @@ class ComponentbuilderViewComponentbuilder extends JViewLegacy */ function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - }; // Assign data to the view $this->icons = $this->get('Icons'); $this->contributors = ComponentbuilderHelper::getContributors(); @@ -59,6 +53,12 @@ class ComponentbuilderViewComponentbuilder extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index 07c006c3c..a30d018ad 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -75,6 +68,12 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index fa9ad4b2a..442a935b0 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy ComponentbuilderHelper::addSubmenu('custom_admin_views'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/custom_code/view.html.php b/admin/views/custom_code/view.html.php index c97c9064a..045425f9a 100644 --- a/admin/views/custom_code/view.html.php +++ b/admin/views/custom_code/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewCustom_code extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -72,6 +65,12 @@ class ComponentbuilderViewCustom_code extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php index 67fb18a75..f96f3c903 100644 --- a/admin/views/custom_codes/view.html.php +++ b/admin/views/custom_codes/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy ComponentbuilderHelper::addSubmenu('custom_codes'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php index db0e8d87b..35f860f47 100644 --- a/admin/views/dynamic_get/view.html.php +++ b/admin/views/dynamic_get/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewDynamic_get extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -72,6 +65,12 @@ class ComponentbuilderViewDynamic_get extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php index 248ffb940..8eaecfdc7 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy ComponentbuilderHelper::addSubmenu('dynamic_gets'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/field/submitbutton.js b/admin/views/field/submitbutton.js index e0ed9b159..47f6c3de1 100644 --- a/admin/views/field/submitbutton.js +++ b/admin/views/field/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php index ff1cb5057..5c5f0d18b 100644 --- a/admin/views/field/tmpl/edit.php +++ b/admin/views/field/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -89,18 +89,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder'); - canDo->get('admin_view.access')) : ?> - -
-
-
-
- -
-
- - - canDo->get('field.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('field.edit.state') || $this->canDo->get('core.edit.created')) : ?>
diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php index 9b0f1b558..311c9f23c 100644 --- a/admin/views/field/view.html.php +++ b/admin/views/field/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewField extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -68,13 +61,16 @@ class ComponentbuilderViewField extends JViewLegacy { // return to the list view that refered to this item $this->referral = '&ref='.(string)$this->ref; - } - - // Get Linked view data - $this->wablinked_admin_views = $this->get('Wablinked_admin_views'); + } // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); @@ -197,17 +193,7 @@ class ComponentbuilderViewField extends JViewLegacy $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_FIELD_NEW' : 'COM_COMPONENTBUILDER_FIELD_EDIT')); $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/field.css"); // Add Ajax Token - $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); - - // Add the CSS for Footable - $document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css'); - $document->addStyleSheet(JURI::root() .'media/com_componentbuilder/footable/css/footable.standalone.min.css'); - // Add the JavaScript for Footable (adding all funtions) - $document->addScript(JURI::root() .'media/com_componentbuilder/footable/js/footable.min.js'); - - $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});"; - $document->addScriptDeclaration($footable); - + $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); $document->addScript(JURI::root() . $this->script); $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/field/submitbutton.js"); JText::script('view not acceptable. Error'); diff --git a/admin/views/fields/tmpl/default.php b/admin/views/fields/tmpl/default.php index 54748cfdb..aa6702791 100644 --- a/admin/views/fields/tmpl/default.php +++ b/admin/views/fields/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/fields/tmpl/default_batch_body.php b/admin/views/fields/tmpl/default_batch_body.php index cdfed4528..84cf5fd81 100644 --- a/admin/views/fields/tmpl/default_batch_body.php +++ b/admin/views/fields/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/fields/tmpl/default_batch_footer.php b/admin/views/fields/tmpl/default_batch_footer.php index 513bb158f..236493c37 100644 --- a/admin/views/fields/tmpl/default_batch_footer.php +++ b/admin/views/fields/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/fields/tmpl/default_body.php b/admin/views/fields/tmpl/default_body.php index 99554fedd..9b0d0c30c 100644 --- a/admin/views/fields/tmpl/default_body.php +++ b/admin/views/fields/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/fields/tmpl/default_foot.php b/admin/views/fields/tmpl/default_foot.php index 89481e81c..f408f79bc 100644 --- a/admin/views/fields/tmpl/default_foot.php +++ b/admin/views/fields/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/fields/tmpl/default_head.php b/admin/views/fields/tmpl/default_head.php index 429813e39..6cc62bafa 100644 --- a/admin/views/fields/tmpl/default_head.php +++ b/admin/views/fields/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/fields/tmpl/default_toolbar.php b/admin/views/fields/tmpl/default_toolbar.php index 1a66e90af..15916ef80 100644 --- a/admin/views/fields/tmpl/default_toolbar.php +++ b/admin/views/fields/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php index cb2fd8a2d..3e348e1a4 100644 --- a/admin/views/fields/view.html.php +++ b/admin/views/fields/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 38 of this MVC - @build 28th May, 2017 + @version @update number 39 of this MVC + @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewFields extends JViewLegacy ComponentbuilderHelper::addSubmenu('fields'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewFields extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php index a5f891d7d..1ce02ccc2 100644 --- a/admin/views/fieldtype/view.html.php +++ b/admin/views/fieldtype/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewFieldtype extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -71,10 +64,16 @@ class ComponentbuilderViewFieldtype extends JViewLegacy } // Get Linked view data - $this->wacfields = $this->get('Wacfields'); + $this->wabfields = $this->get('Wabfields'); // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php index a468df1e1..441a4a3eb 100644 --- a/admin/views/fieldtypes/view.html.php +++ b/admin/views/fieldtypes/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy ComponentbuilderHelper::addSubmenu('fieldtypes'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/ftp/view.html.php b/admin/views/ftp/view.html.php index a925c155e..ec6d80f2b 100644 --- a/admin/views/ftp/view.html.php +++ b/admin/views/ftp/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewFtp extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -71,10 +64,16 @@ class ComponentbuilderViewFtp extends JViewLegacy } // Get Linked view data - $this->wadlinked_components = $this->get('Wadlinked_components'); + $this->waclinked_components = $this->get('Waclinked_components'); // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/ftps/view.html.php b/admin/views/ftps/view.html.php index 0cc018990..1aa11b01e 100644 --- a/admin/views/ftps/view.html.php +++ b/admin/views/ftps/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewFtps extends JViewLegacy ComponentbuilderHelper::addSubmenu('ftps'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewFtps extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 950cf867f..a8af0fdd2 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewHelp_document extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -72,6 +65,12 @@ class ComponentbuilderViewHelp_document extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 2d0783c42..fb534a326 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy ComponentbuilderHelper::addSubmenu('help_documents'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index fd95617c7..cda6301be 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -41,20 +41,13 @@ class ComponentbuilderViewImport extends JViewLegacy protected $dataType; public function display($tpl = null) - { + { if ($this->getLayout() !== 'modal') { // Include helper submenu ComponentbuilderHelper::addSubmenu('import'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - $paths = new stdClass; $paths->first = ''; $state = $this->get('state'); @@ -83,6 +76,12 @@ class ComponentbuilderViewImport extends JViewLegacy // clear the data type $session->clear('dataType'); } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index f7189c379..3d4674d6a 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -50,12 +50,6 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy ComponentbuilderHelper::addSubmenu('import'); } - // Check for errors. - if (count($errors = $this->get('Errors'))){ - JError::raiseError(500, implode('
', $errors)); - return false; - } - $paths = new stdClass; $paths->first = ''; $state = $this->get('state'); @@ -95,6 +89,13 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy $this->packageInfo = json_decode($session->get('smart_package_info', false), true); $this->formPackage = $this->getForm(); } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } + // Display the template parent::display($tpl); } diff --git a/admin/views/joomla_component/submitbutton.js b/admin/views/joomla_component/submitbutton.js index b4206bdbb..7d588e846 100644 --- a/admin/views/joomla_component/submitbutton.js +++ b/admin/views/joomla_component/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php index 790781657..078e7bc94 100644 --- a/admin/views/joomla_component/tmpl/edit.php +++ b/admin/views/joomla_component/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php index 940bba320..7d3aeb65a 100644 --- a/admin/views/joomla_component/view.html.php +++ b/admin/views/joomla_component/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -84,6 +77,12 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/joomla_components/tmpl/default.php b/admin/views/joomla_components/tmpl/default.php index 81a7c65f1..f1ac9bbf3 100644 --- a/admin/views/joomla_components/tmpl/default.php +++ b/admin/views/joomla_components/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/joomla_components/tmpl/default_batch_body.php b/admin/views/joomla_components/tmpl/default_batch_body.php index f4f47a741..4abaca76c 100644 --- a/admin/views/joomla_components/tmpl/default_batch_body.php +++ b/admin/views/joomla_components/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/joomla_components/tmpl/default_batch_footer.php b/admin/views/joomla_components/tmpl/default_batch_footer.php index cfb93da6b..0f6242e74 100644 --- a/admin/views/joomla_components/tmpl/default_batch_footer.php +++ b/admin/views/joomla_components/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/joomla_components/tmpl/default_body.php b/admin/views/joomla_components/tmpl/default_body.php index 853794f12..27d6db2b5 100644 --- a/admin/views/joomla_components/tmpl/default_body.php +++ b/admin/views/joomla_components/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/joomla_components/tmpl/default_foot.php b/admin/views/joomla_components/tmpl/default_foot.php index 36f3d2c6a..7adb4d8c6 100644 --- a/admin/views/joomla_components/tmpl/default_foot.php +++ b/admin/views/joomla_components/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/joomla_components/tmpl/default_head.php b/admin/views/joomla_components/tmpl/default_head.php index 247a20419..75a47de72 100644 --- a/admin/views/joomla_components/tmpl/default_head.php +++ b/admin/views/joomla_components/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/joomla_components/tmpl/default_toolbar.php b/admin/views/joomla_components/tmpl/default_toolbar.php index c81dd8172..2fc355800 100644 --- a/admin/views/joomla_components/tmpl/default_toolbar.php +++ b/admin/views/joomla_components/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index 3547116a0..ed0c85051 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 387 of this MVC - @build 11th October, 2017 + @version @update number 388 of this MVC + @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy ComponentbuilderHelper::addSubmenu('joomla_components'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/language/view.html.php b/admin/views/language/view.html.php index 374949377..0729bd219 100644 --- a/admin/views/language/view.html.php +++ b/admin/views/language/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewLanguage extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -72,6 +65,12 @@ class ComponentbuilderViewLanguage extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/language_translation/view.html.php b/admin/views/language_translation/view.html.php index 413310057..094ee24d3 100644 --- a/admin/views/language_translation/view.html.php +++ b/admin/views/language_translation/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewLanguage_translation extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -72,6 +65,12 @@ class ComponentbuilderViewLanguage_translation extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php index 6d15377c8..a1147e032 100644 --- a/admin/views/language_translations/view.html.php +++ b/admin/views/language_translations/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy ComponentbuilderHelper::addSubmenu('language_translations'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/languages/view.html.php b/admin/views/languages/view.html.php index 598b931ec..ac223cef4 100644 --- a/admin/views/languages/view.html.php +++ b/admin/views/languages/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewLanguages extends JViewLegacy ComponentbuilderHelper::addSubmenu('languages'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewLanguages extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/layout/view.html.php b/admin/views/layout/view.html.php index 74d6c3cdf..af3836724 100644 --- a/admin/views/layout/view.html.php +++ b/admin/views/layout/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewLayout extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -72,6 +65,12 @@ class ComponentbuilderViewLayout extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php index 8007b112f..0f6517bb4 100644 --- a/admin/views/layouts/view.html.php +++ b/admin/views/layouts/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewLayouts extends JViewLegacy ComponentbuilderHelper::addSubmenu('layouts'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewLayouts extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php index b0abe5551..2d10b8179 100644 --- a/admin/views/site_view/view.html.php +++ b/admin/views/site_view/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewSite_view extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -75,6 +68,12 @@ class ComponentbuilderViewSite_view extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php index 64c56c4ef..46c2e8acd 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewSite_views extends JViewLegacy ComponentbuilderHelper::addSubmenu('site_views'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewSite_views extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/snippet/view.html.php b/admin/views/snippet/view.html.php index d0be913b7..124e205dd 100644 --- a/admin/views/snippet/view.html.php +++ b/admin/views/snippet/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewSnippet extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -72,6 +65,12 @@ class ComponentbuilderViewSnippet extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php index 05ab30fad..72929b273 100644 --- a/admin/views/snippets/view.html.php +++ b/admin/views/snippets/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewSnippets extends JViewLegacy ComponentbuilderHelper::addSubmenu('snippets'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewSnippets extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/template/view.html.php b/admin/views/template/view.html.php index 627df2a75..f3d28e466 100644 --- a/admin/views/template/view.html.php +++ b/admin/views/template/view.html.php @@ -40,13 +40,6 @@ class ComponentbuilderViewTemplate extends JViewLegacy */ public function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -72,6 +65,12 @@ class ComponentbuilderViewTemplate extends JViewLegacy // Set the toolbar $this->addToolBar(); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php index 787693eb8..4512692ea 100644 --- a/admin/views/templates/view.html.php +++ b/admin/views/templates/view.html.php @@ -46,13 +46,6 @@ class ComponentbuilderViewTemplates extends JViewLegacy ComponentbuilderHelper::addSubmenu('templates'); } - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode('
', $errors)); - return false; - } - // Assign data to the view $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -80,6 +73,12 @@ class ComponentbuilderViewTemplates extends JViewLegacy $this->batchDisplay = JHtmlBatch_::render(); } } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } // Display the template parent::display($tpl); diff --git a/site/views/api/view.html.php b/site/views/api/view.html.php index e91eeff6d..33d7212b2 100644 --- a/site/views/api/view.html.php +++ b/site/views/api/view.html.php @@ -36,7 +36,7 @@ class ComponentbuilderViewApi extends JViewLegacy { // Overwriting JView display method function display($tpl = null) - { + { // get combined params of both component and menu $this->app = JFactory::getApplication(); $this->params = $this->app->getParams(); @@ -46,19 +46,19 @@ class ComponentbuilderViewApi extends JViewLegacy // Initialise variables. $this->item = $this->get('Item'); - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode(PHP_EOL, $errors)); - return false; - } - // Set the toolbar $this->addToolBar(); // set the document $this->_prepareDocument(); + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode(" +", $errors), 500); + } + parent::display($tpl); } -- 2.40.1 From c2972c3e17477e57352b653935c52b82d1a98a0b Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sat, 14 Oct 2017 20:07:23 +0200 Subject: [PATCH 10/14] fixed a line break incorrectly escaped, added better description to new fields layout --- README.md | 2 +- admin/README.txt | 2 +- admin/access.xml | 15 +++++++++ admin/assets/css/admin_view.css | 2 +- admin/assets/css/admin_views.css | 2 +- admin/assets/css/joomla_component.css | 2 +- admin/assets/css/joomla_components.css | 2 +- admin/controllers/admin_view.php | 2 +- admin/controllers/admin_views.php | 2 +- admin/controllers/joomla_component.php | 19 +++++++---- admin/controllers/joomla_components.php | 2 +- admin/helpers/compiler/e_Interpretation.php | 2 +- admin/helpers/componentbuilder.php | 9 +++-- .../en-GB/en-GB.com_componentbuilder.ini | 18 ++++++++-- .../en-GB/en-GB.com_componentbuilder.sys.ini | 14 ++++++++ .../linked_components_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 2 +- .../ftp/linked_components_fullwidth.php | 2 +- .../site_view/linked_components_fullwidth.php | 2 +- admin/models/admin_view.php | 19 ++++++++++- admin/models/admin_views.php | 2 +- admin/models/ajax.php | 6 ++-- admin/models/componentbuilder.php | 1 + admin/models/custom_admin_view.php | 17 ++++++++++ admin/models/fields/component.php | 4 +-- admin/models/fields/components.php | 4 +-- admin/models/forms/admin_view.js | 2 +- admin/models/forms/joomla_component.js | 2 +- admin/models/ftp.php | 17 ++++++++++ admin/models/joomla_component.php | 33 ++++++++++--------- admin/models/joomla_components.php | 30 +++++++++++++++-- admin/models/site_view.php | 17 ++++++++++ admin/tables/admin_view.php | 2 +- admin/tables/joomla_component.php | 2 +- admin/views/admin_view/submitbutton.js | 2 +- admin/views/admin_view/tmpl/edit.php | 2 +- admin/views/admin_view/view.html.php | 2 +- admin/views/admin_views/tmpl/default.php | 2 +- .../admin_views/tmpl/default_batch_body.php | 2 +- .../admin_views/tmpl/default_batch_footer.php | 2 +- admin/views/admin_views/tmpl/default_body.php | 2 +- admin/views/admin_views/tmpl/default_foot.php | 2 +- admin/views/admin_views/tmpl/default_head.php | 2 +- .../admin_views/tmpl/default_toolbar.php | 2 +- admin/views/admin_views/view.html.php | 2 +- admin/views/compiler/view.html.php | 3 +- admin/views/joomla_component/submitbutton.js | 2 +- admin/views/joomla_component/tmpl/edit.php | 4 +-- admin/views/joomla_component/view.html.php | 16 ++++----- .../views/joomla_components/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../joomla_components/tmpl/default_body.php | 10 +++--- .../joomla_components/tmpl/default_foot.php | 2 +- .../joomla_components/tmpl/default_head.php | 2 +- .../tmpl/default_toolbar.php | 2 +- admin/views/joomla_components/view.html.php | 10 +++--- site/helpers/componentbuilder.php | 9 +++-- site/views/api/view.html.php | 3 +- 59 files changed, 248 insertions(+), 104 deletions(-) diff --git a/README.md b/README.md index 066ddd6e4..57184ca93 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **124408** ++ *Line count*: **124552** + *File count*: **741** + *Folder count*: **129** diff --git a/admin/README.txt b/admin/README.txt index 066ddd6e4..57184ca93 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -114,7 +114,7 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **124408** ++ *Line count*: **124552** + *File count*: **741** + *Folder count*: **129** diff --git a/admin/access.xml b/admin/access.xml index 744012ee6..20bd779a2 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -153,8 +153,15 @@ + + + + + + + @@ -216,6 +223,14 @@
+ + + + + + + +
diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index c15c77917..632ba6c4f 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index 90abc7897..f09e3b965 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index 505c76715..fd1f1e74a 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/assets/css/joomla_components.css b/admin/assets/css/joomla_components.css index 674cb60a3..ffd5f4a86 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 73d40233a..84bea94e8 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index da4e2fa24..4304b9191 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index 681eaca24..2474ffe52 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @@ -67,7 +67,7 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm return false; } // In the absense of better information, revert to the component permissions. - return parent::allowAdd($data); + return JFactory::getUser()->authorise('joomla_component.create', $this->option); } /** @@ -88,13 +88,20 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + // Access check. + $access = ($user->authorise('joomla_component.access', 'com_componentbuilder.joomla_component.' . (int) $recordId) && $user->authorise('joomla_component.access', 'com_componentbuilder')); + if (!$access) + { + return false; + } + if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit', 'com_componentbuilder.joomla_component.' . (int) $recordId); + $permission = $user->authorise('joomla_component.edit', 'com_componentbuilder.joomla_component.' . (int) $recordId); if (!$permission) { - if ($user->authorise('core.edit.own', 'com_componentbuilder.joomla_component.' . $recordId)) + if ($user->authorise('joomla_component.edit.own', 'com_componentbuilder.joomla_component.' . $recordId)) { // Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; @@ -113,7 +120,7 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm // If the owner matches 'me' then allow. if ($ownerId == $user->id) { - if ($user->authorise('core.edit.own', 'com_componentbuilder')) + if ($user->authorise('joomla_component.edit.own', 'com_componentbuilder')) { return true; } @@ -123,7 +130,7 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm } } // Since there is no permission, revert to the component permissions. - return parent::allowEdit($data, $key); + return $user->authorise('joomla_component.edit', $this->option); } /** diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index 00847f20b..e072a8ed3 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index bd06a8ba1..4bed05d35 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -2872,7 +2872,7 @@ class Interpretation extends Fields $method .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Check for errors."; $method .= PHP_EOL."\t\tif (count(\$errors = \$this->get('Errors')))"; $method .= PHP_EOL."\t\t{"; - $method .= PHP_EOL."\t\t\tthrow new Exception(implode(\"\n\", \$errors), 500);"; + $method .= PHP_EOL."\t\t\tthrow new Exception(implode(".'"\n", $errors), 500);'; $method .= PHP_EOL."\t\t}"; $method .= PHP_EOL.PHP_EOL."\t\tparent::display(\$tpl);"; diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 2e91d16c0..c3e496543 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -477,11 +477,6 @@ abstract class ComponentbuilderHelper $script['display'][] = "\t\t\t// Include helper submenu"; $script['display'][] = "\t\t\t###-#-#-Component###Helper::addSubmenu('import');"; $script['display'][] = "\t\t}"; - $script['display'][] = "\n\t\t// Check for errors."; - $script['display'][] = "\t\tif (count(\$errors = \$this->get('Errors'))){"; - $script['display'][] = "\t\t\tJError::raiseError(500, implode('
', \$errors));"; - $script['display'][] = "\t\t\treturn false;"; - $script['display'][] = "\t\t}"; $script['display'][] = "\n\t\t\$paths = new stdClass;"; $script['display'][] = "\t\t\$paths->first = '';"; $script['display'][] = "\t\t\$state = \$this->get('state');"; @@ -507,6 +502,10 @@ abstract class ComponentbuilderHelper $script['display'][] = "\t\t\t// clear the data type"; $script['display'][] = "\t\t\t\$session->clear('dataType');"; $script['display'][] = "\t\t}"; + $script['display'][] = "\n\t\t// Check for errors."; + $script['display'][] = "\t\tif (count(\$errors = \$this->get('Errors'))){"; + $script['display'][] = "\t\t\tthrow new Exception(implode(".'"\n", $errors), 500);'; + $script['display'][] = "\t\t}"; $script['display'][] = "\n\t\t// Display the template"; $script['display'][] = "\t\tparent::display(\$tpl);"; $script['display'][] = "\t}"; diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index da6d3558c..88ae1d0eb 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -581,7 +581,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION="

Please do n COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL="Beginners notice." COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION="Some Shortcut Buttons

" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION="

Linked Fields

Display of the fields will load here!

Field Conditions

Display of the fields conditions will load here!
" -COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION="Here we can add some description to explain how things now work." +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION="
Welcome to the new improved fields and conditions layout.

We had to remove the repeatable fields layouts since Joomla has depreciated it. With this new improved layout we trust your experience will be better then ever before.

You can still watch the tutorials, and though it was made during the time repeatable fields were still being used, the various concepts and layouts still look mostly the same.

" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL="Fields & Conditions" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION="You can link other views that has relationship with this view. Please watch this tutorial for more info. " COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL="Linked Views Options" @@ -843,7 +843,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_IN="Zoom In" COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_OUT="Zoom Out" COM_COMPONENTBUILDER_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATTER="All is good, please check again latter." COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IN_NO_NOTICE_AT_THIS_TIME="All is good, there in no notice at this time." -COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE="All unsaved work will be lost, are you sure you want to continue?" +COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_ON_THIS_PAGE_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE="All unsaved work on this page will be lost, are you sure you want to continue?" COM_COMPONENTBUILDER_ALWAYS_INSURE_THAT_YOU_HAVE_YOUR_LOCAL_COMPONENTS_BACKED_UP_BY_MAKING_AN_EXPORT_OF_ALL_YOUR_LOCAL_COMPONENTS_BEFORE_IMPORTING_ANY_NEW_COMPONENTS_SMALLMAKE_BSUREB_TO_MOVE_THIS_ZIPPED_BACKUP_PACKAGE_OUT_OF_THE_TMP_FOLDER_BEFORE_DOING_AN_IMPORTSMALLBR_IF_YOU_ARE_IMPORTING_A_PACKAGE_OF_A_THREERD_PARTY_JCB_PACKAGE_DEVELOPER_BMAKE_SURE_IT_IS_A_REPUTABLE_JCB_PACKAGE_DEVELOPERSB="Always insure that you have your local components backed up, by making an export of all your local components before importing any new components. (Make SURE to move this zipped backup package out of the tmp folder before doing an import)
If you are importing a package of a 3rd party JCB package developer, make sure it is a reputable JCB package developers!" COM_COMPONENTBUILDER_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_LIST="Any Selection (only 4 list/radio/checkboxes/dynamic_list)" COM_COMPONENTBUILDER_AUTHOR="Author" @@ -2706,10 +2706,24 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_OPTIONS="Batch process the selected COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_TIP="All changes will be applied to all selected Joomla Components" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE="Joomla Components Batch Use" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch joomla components" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE="Joomla Components Create" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE_DESC="Allows the users in this group to create create joomla components" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD="Joomla Components Dashboard Add" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST="Joomla Components Dashboard List" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DELETE="Joomla Components Delete" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DELETE_DESC="Allows the users in this group to delete delete joomla components" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT="Joomla Components Edit" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATED_BY="Joomla Components Edit Created By" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by joomla components" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATED_DATE="Joomla Components Edit Created Date" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created joomla components" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DESC="Allows the users in this group to edit the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_OWN="Joomla Components Edit Own" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_OWN_DESC="Allows the users in this group to edit edit own joomla components created by them" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_STATE="Joomla Components Edit State" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION="Joomla Components Edit Version" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version joomla components" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT="Joomla Components Export" diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini index f3c9677cb..2a16ad8a9 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini @@ -290,10 +290,24 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS="Joomla Components Access" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS_DESC="Allows the users in this group to access access joomla components" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE="Joomla Components Batch Use" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch joomla components" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE="Joomla Components Create" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE_DESC="Allows the users in this group to create create joomla components" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD="Joomla Components Dashboard Add" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST="Joomla Components Dashboard List" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DELETE="Joomla Components Delete" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DELETE_DESC="Allows the users in this group to delete delete joomla components" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT="Joomla Components Edit" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATED_BY="Joomla Components Edit Created By" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by joomla components" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATED_DATE="Joomla Components Edit Created Date" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created joomla components" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DESC="Allows the users in this group to edit the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_OWN="Joomla Components Edit Own" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_OWN_DESC="Allows the users in this group to edit edit own joomla components created by them" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_STATE="Joomla Components Edit State" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION="Joomla Components Edit Version" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version joomla components" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT="Joomla Components Export" diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php index c5469c3be..2b7ce7757 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -74,7 +74,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml ?> - get('core.edit')): ?> + get('joomla_component.edit')): ?> escape($item->system_name); ?> checked_out): ?> name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index 4e84f492d..8d6cdc617 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -74,7 +74,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml ?> - get('core.edit')): ?> + get('joomla_component.edit')): ?> escape($item->system_name); ?> checked_out): ?> name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index 5be0d2cc0..c7bd96824 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -74,7 +74,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml ?> - get('core.edit')): ?> + get('joomla_component.edit')): ?> escape($item->system_name); ?> checked_out): ?> name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index 2ed0a9540..904b9e110 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -74,7 +74,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml ?> - get('core.edit')): ?> + get('joomla_component.edit')): ?> escape($item->system_name); ?> checked_out): ?> name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index c4659447e..56961ff12 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder @@ -523,6 +523,23 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin { $items = $db->loadObjectList(); + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('joomla_component.access', 'com_componentbuilder.joomla_component.' . (int) $item->id) && $user->authorise('joomla_component.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } + // Filter by addadmin_viewsvvvz in this Repetable Field if (ComponentbuilderHelper::checkArray($items) && isset($this->addadmin_viewsvvvz)) { diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index bffdae389..2950b851f 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/ajax.php b/admin/models/ajax.php index e9f93893b..b1b4c4f6e 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -238,7 +238,7 @@ class ComponentbuilderModelAjax extends JModelList
- + ' . JText::_('COM_COMPONENTBUILDER_NEW') . ' @@ -293,7 +293,7 @@ class ComponentbuilderModelAjax extends JModelList $button[] = '
'; $button[] = '
'; } - $button[] = ''; + $button[] = ''; if (1 == $size) { $button[] = ''; @@ -563,7 +563,7 @@ class ComponentbuilderModelAjax extends JModelList if ($this->canEdit($id)) { $edit = "index.php?option=com_componentbuilder&view=".$views."&task=".$view.".edit&id=".$id.$this->ref; - return ' '; + return ' '; } return ''; diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index dc0c84fac..6b0e4f697 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -49,6 +49,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList $viewAccess = array( 'compiler.submenu' => 'compiler.submenu', 'compiler.dashboard_list' => 'compiler.dashboard_list', + 'joomla_component.create' => 'joomla_component.create', 'joomla_components.access' => 'joomla_component.access', 'joomla_component.access' => 'joomla_component.access', 'joomla_components.submenu' => 'joomla_component.submenu', diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index f2dcafa6a..a91c9f59d 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -248,6 +248,23 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin { $items = $db->loadObjectList(); + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('joomla_component.access', 'com_componentbuilder.joomla_component.' . (int) $item->id) && $user->authorise('joomla_component.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } + // Filter by addcustom_admin_viewsvvwa in this Repetable Field if (ComponentbuilderHelper::checkArray($items) && isset($this->addcustom_admin_viewsvvwa)) { diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index 7896ae864..d460b9d1c 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -79,7 +79,7 @@ class JFormFieldComponent extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create joomla_component - if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + if ($user->authorise('joomla_component.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -92,7 +92,7 @@ class JFormFieldComponent extends JFormFieldList '; } // only add if user allowed to edit joomla_component - if (($buttonName === 'joomla_component' || $buttonName === 'joomla_components') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + if (($buttonName === 'joomla_component' || $buttonName === 'joomla_components') && $user->authorise('joomla_component.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php index ea5c032d1..0590e7b82 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -79,7 +79,7 @@ class JFormFieldComponents extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create joomla_component - if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + if ($user->authorise('joomla_component.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -92,7 +92,7 @@ class JFormFieldComponents extends JFormFieldList '; } // only add if user allowed to edit joomla_component - if (($buttonName === 'joomla_component' || $buttonName === 'joomla_components') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + if (($buttonName === 'joomla_component' || $buttonName === 'joomla_components') && $user->authorise('joomla_component.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 9e7fce9ff..ba83e4ef1 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js index b7a9c5371..bb63a056e 100644 --- a/admin/models/forms/joomla_component.js +++ b/admin/models/forms/joomla_component.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/models/ftp.php b/admin/models/ftp.php index e159f9927..b50d284cc 100644 --- a/admin/models/ftp.php +++ b/admin/models/ftp.php @@ -176,6 +176,23 @@ class ComponentbuilderModelFtp extends JModelAdmin if ($db->getNumRows()) { $items = $db->loadObjectList(); + + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('joomla_component.access', 'com_componentbuilder.joomla_component.' . (int) $item->id) && $user->authorise('joomla_component.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } return $items; } return false; diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index 6c032b573..e99310e76 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @@ -619,8 +619,8 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin // Check for existing item. // Modify the form based on Edit State access controls. - if ($id != 0 && (!$user->authorise('core.edit.state', 'com_componentbuilder.joomla_component.' . (int) $id)) - || ($id == 0 && !$user->authorise('core.edit.state', 'com_componentbuilder'))) + if ($id != 0 && (!$user->authorise('joomla_component.edit.state', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.state', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); @@ -636,7 +636,8 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $form->setValue('created_by', null, $user->id); } // Modify the form based on Edit Creaded By access controls. - if (!$user->authorise('core.edit.created_by', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('joomla_component.edit.created_by', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.created_by', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); @@ -646,7 +647,8 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $form->setFieldAttribute('created_by', 'filter', 'unset'); } // Modify the form based on Edit Creaded Date access controls. - if (!$user->authorise('core.edit.created', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('joomla_component.edit.created', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.created', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); @@ -700,7 +702,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $user = JFactory::getUser(); // The record has been set. Check the record permissions. - return $user->authorise('core.delete', 'com_componentbuilder.joomla_component.' . (int) $record->id); + return $user->authorise('joomla_component.delete', 'com_componentbuilder.joomla_component.' . (int) $record->id); } return false; } @@ -722,14 +724,14 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit.state', 'com_componentbuilder.joomla_component.' . (int) $recordId); + $permission = $user->authorise('joomla_component.edit.state', 'com_componentbuilder.joomla_component.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } // In the absense of better information, revert to the component permissions. - return parent::canEditState($record); + return $user->authorise('joomla_component.edit.state', 'com_componentbuilder'); } /** @@ -744,8 +746,9 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin protected function allowEdit($data = array(), $key = 'id') { // Check specific edit permission then general edit permission. + $user = JFactory::getUser(); - return JFactory::getUser()->authorise('core.edit', 'com_componentbuilder.joomla_component.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or parent::allowEdit($data, $key); + return $user->authorise('joomla_component.edit', 'com_componentbuilder.joomla_component.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('joomla_component.edit', 'com_componentbuilder'); } /** @@ -1033,7 +1036,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('joomla_component'); } - if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch')) + if (!$this->canDo->get('joomla_component.create') && !$this->canDo->get('joomla_component.batch')) { return false; } @@ -1048,7 +1051,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin { $values['published'] = 0; } - elseif (isset($values['published']) && !$this->canDo->get('core.edit.state')) + elseif (isset($values['published']) && !$this->canDo->get('joomla_component.edit.state')) { $values['published'] = 0; } @@ -1065,7 +1068,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin // only allow copy if user may edit this item. - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('joomla_component.edit', $contexts[$pk])) { @@ -1182,14 +1185,14 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('joomla_component'); } - if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch')) + if (!$this->canDo->get('joomla_component.edit') && !$this->canDo->get('joomla_component.batch')) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); return false; } // make sure published only updates if user has the permission. - if (isset($values['published']) && !$this->canDo->get('core.edit.state')) + if (isset($values['published']) && !$this->canDo->get('joomla_component.edit.state')) { unset($values['published']); } @@ -1199,7 +1202,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin // Parent exists so we proceed foreach ($pks as $pk) { - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('joomla_component.edit', $contexts[$pk])) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index 39016e611..09569b74d 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @@ -1212,7 +1212,24 @@ class ComponentbuilderModelJoomla_components extends JModelList $this->checkInNow(); // load parent items - $items = parent::getItems(); + $items = parent::getItems(); + + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('joomla_component.access', 'com_componentbuilder.joomla_component.' . (int) $item->id) && $user->authorise('joomla_component.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } // return items return $items; @@ -1348,8 +1365,17 @@ class ComponentbuilderModelJoomla_components extends JModelList // set values to display correctly. if (ComponentbuilderHelper::checkArray($items)) { + // get user object. + $user = JFactory::getUser(); foreach ($items as $nr => &$item) { + $access = ($user->authorise('joomla_component.access', 'com_componentbuilder.joomla_component.' . (int) $item->id) && $user->authorise('joomla_component.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + // decode sql $item->sql = base64_decode($item->sql); // decode php_preflight_update diff --git a/admin/models/site_view.php b/admin/models/site_view.php index 951fb39a8..9b5ddddcd 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -280,6 +280,23 @@ class ComponentbuilderModelSite_view extends JModelAdmin { $items = $db->loadObjectList(); + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('joomla_component.access', 'com_componentbuilder.joomla_component.' . (int) $item->id) && $user->authorise('joomla_component.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } + // Filter by addsite_viewsvvwb in this Repetable Field if (ComponentbuilderHelper::checkArray($items) && isset($this->addsite_viewsvvwb)) { diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index 23b0c8e54..9b79b4e68 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php index 7d418c718..e16c10e3f 100644 --- a/admin/tables/joomla_component.php +++ b/admin/tables/joomla_component.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index c8048cf6d..1f6498f9f 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index 488816fdc..f68a425b7 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index ed136929e..b2b4f7b26 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 94535d8de..7a5937aa5 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index 06b04c4c2..fc5d46eea 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index 354a1732f..546eb9bd6 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 69a929a98..154119810 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index 016124a73..0713c344a 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index b46aa2708..ad468e54a 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index 3a34a14d5..7d4445773 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 9496270b7..690e85072 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 184 of this MVC + @version @update number 185 of this MVC @build 14th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index 5175aada4..45c041f7a 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -70,8 +70,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy // Check for errors. if (count($errors = $this->get('Errors'))) { - throw new Exception(implode(" -", $errors), 500); + throw new Exception(implode("\n", $errors), 500); } parent::display($tpl); diff --git a/admin/views/joomla_component/submitbutton.js b/admin/views/joomla_component/submitbutton.js index 7d588e846..085e88f04 100644 --- a/admin/views/joomla_component/submitbutton.js +++ b/admin/views/joomla_component/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php index 078e7bc94..bbf300ea4 100644 --- a/admin/views/joomla_component/tmpl/edit.php +++ b/admin/views/joomla_component/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @@ -194,7 +194,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder'); - canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?> + canDo->get('joomla_component.delete') || $this->canDo->get('joomla_component.edit.created_by') || $this->canDo->get('joomla_component.edit.state') || $this->canDo->get('joomla_component.edit.created')) : ?>
diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php index 7d3aeb65a..6958c5176 100644 --- a/admin/views/joomla_component/view.html.php +++ b/admin/views/joomla_component/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @@ -106,12 +106,12 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy // Built the actions for new and existing records. if ($this->refid || $this->ref) { - if ($this->canDo->get('core.create') && $isNew) + if ($this->canDo->get('joomla_component.create') && $isNew) { // We can create the record. JToolBarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE'); } - elseif ($this->canDo->get('core.edit')) + elseif ($this->canDo->get('joomla_component.edit')) { // We can save the record. JToolBarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE'); @@ -132,7 +132,7 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy if ($isNew) { // For new records, check the create permission. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('joomla_component.create')) { JToolBarHelper::apply('joomla_component.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE'); @@ -142,24 +142,24 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy } else { - if ($this->canDo->get('core.edit')) + if ($this->canDo->get('joomla_component.edit')) { // We can save the new record JToolBarHelper::apply('joomla_component.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('joomla_component.save', 'JTOOLBAR_SAVE'); // We can save this record, but check the create permission to see // if we can return to make a new one. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('joomla_component.create')) { JToolBarHelper::custom('joomla_component.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false); } } $canVersion = ($this->canDo->get('core.version') && $this->canDo->get('joomla_component.version')); - if ($this->state->params->get('save_history', 1) && $this->canDo->get('core.edit') && $canVersion) + if ($this->state->params->get('save_history', 1) && $this->canDo->get('joomla_component.edit') && $canVersion) { JToolbarHelper::versions('com_componentbuilder.joomla_component', $this->item->id); } - if ($this->canDo->get('core.create')) + if ($this->canDo->get('joomla_component.create')) { JToolBarHelper::custom('joomla_component.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false); } diff --git a/admin/views/joomla_components/tmpl/default.php b/admin/views/joomla_components/tmpl/default.php index f1ac9bbf3..3878eb34b 100644 --- a/admin/views/joomla_components/tmpl/default.php +++ b/admin/views/joomla_components/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/views/joomla_components/tmpl/default_batch_body.php b/admin/views/joomla_components/tmpl/default_batch_body.php index 4abaca76c..33efe3611 100644 --- a/admin/views/joomla_components/tmpl/default_batch_body.php +++ b/admin/views/joomla_components/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/views/joomla_components/tmpl/default_batch_footer.php b/admin/views/joomla_components/tmpl/default_batch_footer.php index 0f6242e74..a2db00a40 100644 --- a/admin/views/joomla_components/tmpl/default_batch_footer.php +++ b/admin/views/joomla_components/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/views/joomla_components/tmpl/default_body.php b/admin/views/joomla_components/tmpl/default_body.php index 27d6db2b5..090b9d4c5 100644 --- a/admin/views/joomla_components/tmpl/default_body.php +++ b/admin/views/joomla_components/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @@ -37,7 +37,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml ?> - get('core.edit.state')): ?> + get('joomla_component.edit.state')): ?> saveOrder) { @@ -60,7 +60,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml - get('core.edit')): ?> + get('joomla_component.edit')): ?> checked_out) : ?> id); ?> @@ -75,7 +75,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml - get('core.edit')): ?> + get('joomla_component.edit')): ?>
escape($item->system_name); ?> checked_out): ?> @@ -102,7 +102,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml escape($item->author); ?> - get('core.edit.state')) : ?> + get('joomla_component.edit.state')) : ?> checked_out) : ?> published, $i, 'joomla_components.', true, 'cb'); ?> diff --git a/admin/views/joomla_components/tmpl/default_foot.php b/admin/views/joomla_components/tmpl/default_foot.php index 7adb4d8c6..f95be20c1 100644 --- a/admin/views/joomla_components/tmpl/default_foot.php +++ b/admin/views/joomla_components/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/views/joomla_components/tmpl/default_head.php b/admin/views/joomla_components/tmpl/default_head.php index 75a47de72..154c63cd3 100644 --- a/admin/views/joomla_components/tmpl/default_head.php +++ b/admin/views/joomla_components/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/views/joomla_components/tmpl/default_toolbar.php b/admin/views/joomla_components/tmpl/default_toolbar.php index 2fc355800..9e97ef9ab 100644 --- a/admin/views/joomla_components/tmpl/default_toolbar.php +++ b/admin/views/joomla_components/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index ed0c85051..96e76a3bc 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 388 of this MVC + @version @update number 389 of this MVC @build 14th October, 2017 @created 6th May, 2015 @package Component Builder @@ -56,10 +56,10 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('joomla_component'); - $this->canEdit = $this->canDo->get('core.edit'); - $this->canState = $this->canDo->get('core.edit.state'); - $this->canCreate = $this->canDo->get('core.create'); - $this->canDelete = $this->canDo->get('core.delete'); + $this->canEdit = $this->canDo->get('joomla_component.edit'); + $this->canState = $this->canDo->get('joomla_component.edit.state'); + $this->canCreate = $this->canDo->get('joomla_component.create'); + $this->canDelete = $this->canDo->get('joomla_component.delete'); $this->canBatch = $this->canDo->get('core.batch'); // We don't need toolbar in the modal window. diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index 3a2a6930c..2d71dd183 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -468,11 +468,6 @@ abstract class ComponentbuilderHelper $script['display'][] = "\t\t\t// Include helper submenu"; $script['display'][] = "\t\t\t###-#-#-Component###Helper::addSubmenu('import');"; $script['display'][] = "\t\t}"; - $script['display'][] = "\n\t\t// Check for errors."; - $script['display'][] = "\t\tif (count(\$errors = \$this->get('Errors'))){"; - $script['display'][] = "\t\t\tJError::raiseError(500, implode('
', \$errors));"; - $script['display'][] = "\t\t\treturn false;"; - $script['display'][] = "\t\t}"; $script['display'][] = "\n\t\t\$paths = new stdClass;"; $script['display'][] = "\t\t\$paths->first = '';"; $script['display'][] = "\t\t\$state = \$this->get('state');"; @@ -498,6 +493,10 @@ abstract class ComponentbuilderHelper $script['display'][] = "\t\t\t// clear the data type"; $script['display'][] = "\t\t\t\$session->clear('dataType');"; $script['display'][] = "\t\t}"; + $script['display'][] = "\n\t\t// Check for errors."; + $script['display'][] = "\t\tif (count(\$errors = \$this->get('Errors'))){"; + $script['display'][] = "\t\t\tthrow new Exception(implode(".'"\n", $errors), 500);'; + $script['display'][] = "\t\t}"; $script['display'][] = "\n\t\t// Display the template"; $script['display'][] = "\t\tparent::display(\$tpl);"; $script['display'][] = "\t}"; diff --git a/site/views/api/view.html.php b/site/views/api/view.html.php index 33d7212b2..41a9d2cf4 100644 --- a/site/views/api/view.html.php +++ b/site/views/api/view.html.php @@ -55,8 +55,7 @@ class ComponentbuilderViewApi extends JViewLegacy // Check for errors. if (count($errors = $this->get('Errors'))) { - throw new Exception(implode(" -", $errors), 500); + throw new Exception(implode("\n", $errors), 500); } parent::display($tpl); -- 2.40.1 From 6c29a6fca1c40c4a0c03623c8fc4d753d21fd128 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Mon, 16 Oct 2017 19:14:23 +0200 Subject: [PATCH 11/14] Added field filtering to admin fields conditions to only load fields linked to admin view. Updated the component export method to also export the new views and field relationships --- README.md | 6 +- admin/README.txt | 6 +- admin/assets/css/admin.css | 2 +- admin/assets/css/admin_fields.css | 2 +- admin/assets/css/admin_fields_conditions.css | 2 +- admin/assets/css/admin_view.css | 4 +- admin/assets/css/admin_views.css | 4 +- admin/assets/css/admins_fields.css | 2 +- admin/assets/css/admins_fields_conditions.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/joomla_component.css | 4 +- admin/assets/css/joomla_components.css | 4 +- admin/assets/css/language_translation.css | 4 +- admin/assets/css/language_translations.css | 4 +- admin/assets/js/admin.js | 2 +- admin/componentbuilder.php | 2 +- admin/controller.php | 2 +- admin/controllers/admin_fields.php | 2 +- admin/controllers/admin_fields_conditions.php | 2 +- admin/controllers/admin_view.php | 4 +- admin/controllers/admin_views.php | 4 +- admin/controllers/admins_fields.php | 2 +- .../controllers/admins_fields_conditions.php | 2 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/componentbuilder.php | 2 +- admin/controllers/help.php | 2 +- admin/controllers/import.php | 2 +- .../controllers/import_joomla_components.php | 2 +- admin/controllers/joomla_component.php | 4 +- admin/controllers/joomla_components.php | 4 +- admin/controllers/language_translation.php | 4 +- admin/controllers/language_translations.php | 4 +- admin/helpers/componentbuilder.php | 2 +- admin/helpers/componentbuilderemail.php | 2 +- admin/helpers/headercheck.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/indenter.php | 2 +- admin/helpers/js.php | 2 +- admin/helpers/minify.php | 2 +- .../en-GB/en-GB.com_componentbuilder.ini | 4 +- admin/layouts/admin_fields/fields_above.php | 2 +- .../layouts/admin_fields/fields_fullwidth.php | 2 +- admin/layouts/admin_fields/publishing.php | 2 +- admin/layouts/admin_fields/publlshing.php | 2 +- .../conditions_above.php | 2 +- .../conditions_fullwidth.php | 2 +- .../admin_fields_conditions/publishing.php | 2 +- .../admin_fields_conditions/publlshing.php | 2 +- admin/layouts/admin_view/css_fullwidth.php | 2 +- .../admin_view/custom_buttons_fullwidth.php | 2 +- .../admin_view/custom_buttons_left.php | 2 +- .../admin_view/custom_import_fullwidth.php | 2 +- admin/layouts/admin_view/details_above.php | 2 +- admin/layouts/admin_view/details_left.php | 2 +- admin/layouts/admin_view/details_right.php | 2 +- admin/layouts/admin_view/details_under.php | 2 +- .../fields_conditions_fullwidth.php | 2 +- .../admin_view/fields_conditions_left.php | 2 +- .../admin_view/fields_conditions_right.php | 2 +- .../admin_view/javascript_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_left.php | 2 +- admin/layouts/admin_view/php_fullwidth.php | 2 +- admin/layouts/admin_view/publishing.php | 2 +- admin/layouts/admin_view/publlshing.php | 2 +- .../layouts/admin_view/settings_fullwidth.php | 2 +- admin/layouts/batchselection.php | 2 +- .../custom_buttons_fullwidth.php | 2 +- .../custom_admin_view/custom_buttons_left.php | 2 +- .../custom_script_fullwidth.php | 2 +- .../custom_admin_view/details_above.php | 2 +- .../custom_admin_view/details_fullwidth.php | 2 +- .../custom_admin_view/details_left.php | 2 +- .../custom_admin_view/details_right.php | 2 +- .../custom_admin_view/details_rightside.php | 2 +- .../custom_admin_view/details_under.php | 2 +- .../linked_components_fullwidth.php | 2 +- .../layouts/custom_admin_view/publishing.php | 2 +- .../layouts/custom_admin_view/publlshing.php | 2 +- admin/layouts/custom_code/details_above.php | 2 +- .../layouts/custom_code/details_fullwidth.php | 2 +- admin/layouts/custom_code/details_left.php | 2 +- admin/layouts/custom_code/details_right.php | 2 +- admin/layouts/custom_code/details_under.php | 2 +- admin/layouts/custom_code/publishing.php | 2 +- admin/layouts/custom_code/publlshing.php | 2 +- .../layouts/dynamic_get/abacus_fullwidth.php | 2 +- admin/layouts/dynamic_get/abacus_left.php | 2 +- .../dynamic_get/custom_script_fullwidth.php | 2 +- admin/layouts/dynamic_get/joint_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_above.php | 2 +- admin/layouts/dynamic_get/main_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_left.php | 2 +- admin/layouts/dynamic_get/main_right.php | 2 +- admin/layouts/dynamic_get/main_under.php | 2 +- admin/layouts/dynamic_get/publishing.php | 2 +- admin/layouts/dynamic_get/publlshing.php | 2 +- admin/layouts/field/details_fullwidth.php | 2 +- admin/layouts/field/details_left.php | 2 +- admin/layouts/field/details_right.php | 2 +- admin/layouts/field/details_under.php | 2 +- admin/layouts/field/publishing.php | 2 +- admin/layouts/field/publlshing.php | 2 +- admin/layouts/field/scripts_left.php | 2 +- admin/layouts/field/scripts_right.php | 2 +- admin/layouts/fieldtype/details_fullwidth.php | 2 +- admin/layouts/fieldtype/details_left.php | 2 +- admin/layouts/fieldtype/details_right.php | 2 +- admin/layouts/fieldtype/fields_fullwidth.php | 2 +- admin/layouts/fieldtype/publishing.php | 2 +- admin/layouts/fieldtype/publlshing.php | 2 +- admin/layouts/ftp/details_above.php | 2 +- admin/layouts/ftp/details_fullwidth.php | 2 +- .../ftp/linked_components_fullwidth.php | 2 +- admin/layouts/ftp/publishing.php | 2 +- admin/layouts/ftp/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- .../admin_views_fullwidth.php | 2 +- .../custom_admin_views_fullwidth.php | 2 +- .../joomla_component/details_above.php | 2 +- .../layouts/joomla_component/details_left.php | 2 +- .../joomla_component/details_right.php | 2 +- .../joomla_component/details_under.php | 2 +- .../dynamic_build_beta_fullwidth.php | 2 +- .../dynamic_integration_fullwidth.php | 2 +- .../libs_helpers_fullwidth.php | 2 +- admin/layouts/joomla_component/metadata.php | 2 +- .../joomla_component/mysql_fullwidth.php | 2 +- .../joomla_component/php_fullwidth.php | 2 +- admin/layouts/joomla_component/publishing.php | 2 +- .../layouts/joomla_component/readme_left.php | 2 +- .../layouts/joomla_component/readme_right.php | 2 +- .../joomla_component/settings_left.php | 2 +- .../joomla_component/settings_right.php | 2 +- .../joomla_component/site_views_fullwidth.php | 2 +- .../translation_fullwidth.php | 2 +- admin/layouts/language/details_left.php | 2 +- admin/layouts/language/details_right.php | 2 +- admin/layouts/language/publishing.php | 2 +- admin/layouts/language/publlshing.php | 2 +- .../language_translation/details_above.php | 2 +- .../details_fullwidth.php | 2 +- .../language_translation/publishing.php | 2 +- .../language_translation/publlshing.php | 2 +- .../layout/custom_script_fullwidth.php | 2 +- admin/layouts/layout/details_fullwidth.php | 2 +- admin/layouts/layout/details_left.php | 2 +- admin/layouts/layout/details_right.php | 2 +- admin/layouts/layout/details_rightside.php | 2 +- admin/layouts/layout/details_under.php | 2 +- admin/layouts/layout/publishing.php | 2 +- admin/layouts/layout/publlshing.php | 2 +- .../site_view/custom_buttons_fullwidth.php | 2 +- .../layouts/site_view/custom_buttons_left.php | 2 +- .../site_view/custom_buttons_right.php | 2 +- admin/layouts/site_view/details_above.php | 2 +- admin/layouts/site_view/details_fullwidth.php | 2 +- admin/layouts/site_view/details_left.php | 2 +- admin/layouts/site_view/details_right.php | 2 +- admin/layouts/site_view/details_rightside.php | 2 +- admin/layouts/site_view/details_under.php | 2 +- .../site_view/javascript_css_fullwidth.php | 2 +- .../site_view/linked_components_fullwidth.php | 2 +- admin/layouts/site_view/php_fullwidth.php | 2 +- admin/layouts/site_view/publishing.php | 2 +- admin/layouts/site_view/publlshing.php | 2 +- admin/layouts/snippet/details_above.php | 2 +- admin/layouts/snippet/details_left.php | 2 +- admin/layouts/snippet/details_right.php | 2 +- admin/layouts/snippet/publishing.php | 2 +- admin/layouts/snippet/publlshing.php | 2 +- .../template/custom_script_fullwidth.php | 2 +- admin/layouts/template/details_fullwidth.php | 2 +- admin/layouts/template/details_left.php | 2 +- admin/layouts/template/details_right.php | 2 +- admin/layouts/template/details_rightside.php | 2 +- admin/layouts/template/details_under.php | 2 +- admin/layouts/template/publishing.php | 2 +- admin/layouts/template/publlshing.php | 2 +- admin/models/admin_fields.php | 2 +- admin/models/admin_fields_conditions.php | 2 +- admin/models/admin_view.php | 5 +- admin/models/admin_views.php | 4 +- admin/models/admins_fields.php | 2 +- admin/models/admins_fields_conditions.php | 2 +- admin/models/ajax.php | 110 ++-- admin/models/componentbuilder.php | 2 +- admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/adminviews.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/component.php | 2 +- admin/models/fields/components.php | 2 +- admin/models/fields/customadminviews.php | 2 +- admin/models/fields/customfilelist.php | 2 +- admin/models/fields/customfolderlist.php | 2 +- admin/models/fields/customgets.php | 2 +- admin/models/fields/dbtables.php | 2 +- admin/models/fields/dynamicget.php | 2 +- admin/models/fields/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldtypes.php | 2 +- admin/models/fields/ftps.php | 2 +- admin/models/fields/lang.php | 2 +- admin/models/fields/maingets.php | 2 +- .../{fieldsmulti.php => matchfield.php} | 85 ++- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/fields/siteviews.php | 2 +- admin/models/fields/snippets.php | 2 +- admin/models/fields/targetfields.php | 209 ++++++++ admin/models/fields/viewtabs.php | 2 +- admin/models/forms/admin_fields.js | 2 +- admin/models/forms/admin_fields_conditions.js | 2 +- .../models/forms/admin_fields_conditions.xml | 8 +- admin/models/forms/admin_view.js | 27 +- admin/models/forms/joomla_component.js | 4 +- admin/models/forms/language_translation.js | 19 +- admin/models/import.php | 2 +- admin/models/import_joomla_components.php | 283 +++++++--- admin/models/joomla_component.php | 4 +- admin/models/joomla_components.php | 487 ++++++++++-------- admin/models/language_translation.php | 4 +- admin/models/language_translations.php | 4 +- admin/sql/install.mysql.utf8.sql | 4 +- admin/tables/admin_fields.php | 2 +- admin/tables/admin_fields_conditions.php | 2 +- admin/tables/admin_view.php | 4 +- admin/tables/joomla_component.php | 4 +- admin/tables/language_translation.php | 4 +- admin/views/admin_fields/submitbutton.js | 2 +- admin/views/admin_fields/tmpl/edit.php | 2 +- admin/views/admin_fields/view.html.php | 2 +- .../admin_fields_conditions/submitbutton.js | 2 +- .../admin_fields_conditions/tmpl/edit.php | 2 +- .../admin_fields_conditions/view.html.php | 2 +- admin/views/admin_view/submitbutton.js | 4 +- admin/views/admin_view/tmpl/edit.php | 4 +- admin/views/admin_view/view.html.php | 4 +- admin/views/admin_views/tmpl/default.php | 4 +- .../admin_views/tmpl/default_batch_body.php | 4 +- .../admin_views/tmpl/default_batch_footer.php | 4 +- admin/views/admin_views/tmpl/default_body.php | 4 +- admin/views/admin_views/tmpl/default_foot.php | 4 +- admin/views/admin_views/tmpl/default_head.php | 4 +- .../admin_views/tmpl/default_toolbar.php | 4 +- admin/views/admin_views/view.html.php | 4 +- admin/views/admins_fields/tmpl/default.php | 2 +- .../admins_fields/tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../views/admins_fields/tmpl/default_body.php | 2 +- .../views/admins_fields/tmpl/default_foot.php | 2 +- .../views/admins_fields/tmpl/default_head.php | 2 +- .../admins_fields/tmpl/default_toolbar.php | 2 +- admin/views/admins_fields/view.html.php | 2 +- .../admins_fields_conditions/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../tmpl/default_body.php | 2 +- .../tmpl/default_foot.php | 2 +- .../tmpl/default_head.php | 2 +- .../tmpl/default_toolbar.php | 2 +- .../admins_fields_conditions/view.html.php | 2 +- admin/views/componentbuilder/tmpl/default.php | 2 +- ...ult_issues_the_closed_issues_on_github.php | 2 +- ...fault_issues_the_open_issues_on_github.php | 2 +- .../componentbuilder/tmpl/default_main.php | 2 +- .../tmpl/default_readme_information.php | 2 +- .../tmpl/default_releases_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../componentbuilder/tmpl/default_vdm.php | 2 +- .../tmpl/default_wiki_tutorials.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- .../import_joomla_components/tmpl/default.php | 2 +- .../import_joomla_components/view.html.php | 2 +- admin/views/joomla_component/submitbutton.js | 4 +- admin/views/joomla_component/tmpl/edit.php | 4 +- admin/views/joomla_component/view.html.php | 4 +- .../views/joomla_components/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../joomla_components/tmpl/default_body.php | 4 +- .../joomla_components/tmpl/default_foot.php | 4 +- .../joomla_components/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/joomla_components/view.html.php | 4 +- .../language_translation/submitbutton.js | 4 +- .../views/language_translation/tmpl/edit.php | 4 +- .../views/language_translation/view.html.php | 4 +- .../language_translations/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../tmpl/default_body.php | 4 +- .../tmpl/default_foot.php | 4 +- .../tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- .../views/language_translations/view.html.php | 4 +- componentbuilder.xml | 2 +- script.php | 2 +- site/assets/css/site.css | 2 +- site/assets/js/site.js | 2 +- site/componentbuilder.php | 2 +- site/controller.php | 2 +- site/controllers/api.php | 2 +- site/controllers/help.php | 2 +- site/helpers/category.php | 2 +- site/helpers/categoryfields.php | 2 +- site/helpers/categoryfieldtypes.php | 2 +- site/helpers/componentbuilder.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- site/router.php | 2 +- site/views/api/submitbutton.js | 2 +- 320 files changed, 1231 insertions(+), 742 deletions(-) rename admin/models/fields/{fieldsmulti.php => matchfield.php} (79%) create mode 100644 admin/models/fields/targetfields.php diff --git a/README.md b/README.md index 57184ca93..1521cbee6 100644 --- a/README.md +++ b/README.md @@ -110,12 +110,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 14th October, 2017 ++ *Last Build*: 16th October, 2017 + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **124552** -+ *File count*: **741** ++ *Line count*: **125041** ++ *File count*: **742** + *Folder count*: **129** > 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 57184ca93..1521cbee6 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -110,12 +110,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 14th October, 2017 ++ *Last Build*: 16th October, 2017 + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **124552** -+ *File count*: **741** ++ *Line count*: **125041** ++ *File count*: **742** + *Folder count*: **129** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 56e05f3ca..86d3c0598 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_fields.css b/admin/assets/css/admin_fields.css index 09890ee4d..81d4bbf96 100644 --- a/admin/assets/css/admin_fields.css +++ b/admin/assets/css/admin_fields.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.css diff --git a/admin/assets/css/admin_fields_conditions.css b/admin/assets/css/admin_fields_conditions.css index bd0bc47c4..7d5103893 100644 --- a/admin/assets/css/admin_fields_conditions.css +++ b/admin/assets/css/admin_fields_conditions.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.css diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index 632ba6c4f..e553237fe 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.css diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index f09e3b965..f91594a9b 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/admins_fields.css b/admin/assets/css/admins_fields.css index c9cb616a3..e08da91df 100644 --- a/admin/assets/css/admins_fields.css +++ b/admin/assets/css/admins_fields.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.css diff --git a/admin/assets/css/admins_fields_conditions.css b/admin/assets/css/admins_fields_conditions.css index 71300cba1..3e1e743ef 100644 --- a/admin/assets/css/admins_fields_conditions.css +++ b/admin/assets/css/admins_fields_conditions.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields_conditions.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 74ddc1d11..90c212fdd 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index fd1f1e74a..755b4f9c3 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.css diff --git a/admin/assets/css/joomla_components.css b/admin/assets/css/joomla_components.css index ffd5f4a86..51748cd2b 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.css diff --git a/admin/assets/css/language_translation.css b/admin/assets/css/language_translation.css index 8474a3438..8e547802b 100644 --- a/admin/assets/css/language_translation.css +++ b/admin/assets/css/language_translation.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage language_translation.css diff --git a/admin/assets/css/language_translations.css b/admin/assets/css/language_translations.css index 8be41edcf..51d06adfc 100644 --- a/admin/assets/css/language_translations.css +++ b/admin/assets/css/language_translations.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage language_translations.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index 93b661ae8..54976319b 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.js diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index ee4c83741..19ff6612c 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 135164ba1..be749b646 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_fields.php b/admin/controllers/admin_fields.php index 5a2942069..088f2be59 100644 --- a/admin/controllers/admin_fields.php +++ b/admin/controllers/admin_fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php diff --git a/admin/controllers/admin_fields_conditions.php b/admin/controllers/admin_fields_conditions.php index 9d9cda26b..737bc1bde 100644 --- a/admin/controllers/admin_fields_conditions.php +++ b/admin/controllers/admin_fields_conditions.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.php diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 84bea94e8..019bd779b 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 4304b9191..d9b294506 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/controllers/admins_fields.php b/admin/controllers/admins_fields.php index 6f27ee363..618064aa3 100644 --- a/admin/controllers/admins_fields.php +++ b/admin/controllers/admins_fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.php diff --git a/admin/controllers/admins_fields_conditions.php b/admin/controllers/admins_fields_conditions.php index cb3354175..7d7ad1644 100644 --- a/admin/controllers/admins_fields_conditions.php +++ b/admin/controllers/admins_fields_conditions.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields_conditions.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 7896e87ed..7bc924d85 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index bd1e023c6..402088266 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 434709ead..32d206ac2 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index e589b2a49..d3070ecd2 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index 99f9543d0..d827f8a21 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index 2474ffe52..1e29e0033 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index e072a8ed3..22034d710 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/controllers/language_translation.php b/admin/controllers/language_translation.php index dbbd3f1c5..fa7d30e3a 100644 --- a/admin/controllers/language_translation.php +++ b/admin/controllers/language_translation.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage language_translation.php diff --git a/admin/controllers/language_translations.php b/admin/controllers/language_translations.php index d11a5317f..a2a011e17 100644 --- a/admin/controllers/language_translations.php +++ b/admin/controllers/language_translations.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage language_translations.php diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index c3e496543..c977dbd8c 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index 6d417e8b4..7aeb6c2f6 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilderemail.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 058186eb7..42aa47aa5 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 53b661f2c..47f95d6e0 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index dde49547d..2c37c7073 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index 1cc6d60d3..a1a640fca 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 95bd093ec..f13211b88 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 88ae1d0eb..144dc1381 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -863,7 +863,6 @@ COM_COMPONENTBUILDER_BCUSTOM_FILESB_NOT_MOVE_TO_CORRECT_LOCATION="Custom file COM_COMPONENTBUILDER_BCUSTOM_GET_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BDYNAMIC_GETB_SO_THE_IDS_WAS_REMOVED="Custom get in %s has id mismatch of selected dynamic get. So the id:%s was removed!" COM_COMPONENTBUILDER_BDYNAMIC_GETB_IDS_MISMATCH_IN_BSB="Dynamic get id:%s mismatch in %s." COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE="Be cautious! Do not continue unless you trust the origin of this package!" -COM_COMPONENTBUILDER_BFIELD_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMOVED="Field in %s has id mismatch of selected field. So the id:%s was removed!" COM_COMPONENTBUILDER_BFIELD_TYPEB_IDS_MISMATCH_IN_BSB="Field type id:%s mismatch in %s." COM_COMPONENTBUILDER_BFIELD_TYPEB_NOT_SET_FOR_BSB="Field type not set for %s." COM_COMPONENTBUILDER_BGET_THE_KEY_FROMB_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA="Get the key from %s" @@ -875,7 +874,7 @@ COM_COMPONENTBUILDER_BMAIN_GETB_NOT_SET_FOR_BSB="Main get not set for COM_COMPONENTBUILDER_BREPEATABLEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD="Repeatable id:%s mismatch in field:%s, and was removed from the field." COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS="%s could not be imported%s" COM_COMPONENTBUILDER_BSB_EMCOMPONENT_DETAILSEM="%s component details" -COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMOVED="%s has id mismatch of selected field. So the id:%s was removed!" +COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED="%s has id mismatch. So the id:%s was removed!" COM_COMPONENTBUILDER_BSITE_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BSITE_VIEWB_SO_THE_IDS_WAS_REMOVED="Site view in %s has id mismatch of selected site view. So the id:%s was removed!" COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB="Snippet id:%s mismatch in %s." COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED_FOR_THE_FIRST_TIME="Button to create %s will show once %s is saved for the first time." @@ -4454,6 +4453,7 @@ COM_COMPONENTBUILDER_VIEW_MORE_ISSUES_ON_GITHUB="View more issues on Github" COM_COMPONENTBUILDER_VIEW_MORE_RELEASES_ON_GITHUB="View more releases on Github" COM_COMPONENTBUILDER_WEBSITE="Website" COM_COMPONENTBUILDER_WEBSITE_S="Website: %s" +COM_COMPONENTBUILDER_WE_FAILED_TO_MOVE_BSB="We failed to move %s!" COM_COMPONENTBUILDER_YES="Yes" COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EIGHT_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEYBR_WITHOUT_THIS_KEY_IT_WILL_TAKE_THE_CURRENT_TECHNOLOGY_WITH_A_BRUTE_FORCE_ATTACK_METHOD_MORE_THEN_A_HREFHTTPRANDOMIZECOMHOWLONGTOHACKPASS_TARGET_BLANK_TITLEHOW_LONG_TO_HACK_PASSSEVEN_HUNDRED_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZEROA_YEARS_TO_CRACK_THEORETICALLY="Your data is encrypted with a AES 128 bit encryption using the above 32 character key.
Without this key it will take the current technology with a brute force attack method more then 700 000 000 000 000 000 000 000 000 000 000 years to crack theoretically." COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EIGHT_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEY_WITHOUT_THIS_KEY_IT_WILL_TAKE_THE_CURRENT_TECHNOLOGY_WITH_A_BRUTE_FORCE_ATTACK_METHOD_MORE_THEN_A_HREFHTTPRANDOMIZECOMHOWLONGTOHACKPASS_TARGET_BLANK_TITLEHOW_LONG_TO_HACK_PASSSEVEN_HUNDRED_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZEROA_YEARS_TO_CRACK_THEORETICALLY_UNLESS_THEY_HAVE_THIS_KEY_ABOVE_SO_DO_KEEP_IT_SAFE="Your data is encrypted with a AES 128 bit encryption using the above 32 character key. Without this key it will take the current technology with a brute force attack method more then 700 000 000 000 000 000 000 000 000 000 000 years to crack theoretically. Unless they have this key above, so do keep it safe." diff --git a/admin/layouts/admin_fields/fields_above.php b/admin/layouts/admin_fields/fields_above.php index 20e540ae5..a98a54b2a 100644 --- a/admin/layouts/admin_fields/fields_above.php +++ b/admin/layouts/admin_fields/fields_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_above.php diff --git a/admin/layouts/admin_fields/fields_fullwidth.php b/admin/layouts/admin_fields/fields_fullwidth.php index 19d39659e..ea49ca88a 100644 --- a/admin/layouts/admin_fields/fields_fullwidth.php +++ b/admin/layouts/admin_fields/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_fields/publishing.php b/admin/layouts/admin_fields/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/admin_fields/publishing.php +++ b/admin/layouts/admin_fields/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields/publlshing.php b/admin/layouts/admin_fields/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/admin_fields/publlshing.php +++ b/admin/layouts/admin_fields/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_fields_conditions/conditions_above.php b/admin/layouts/admin_fields_conditions/conditions_above.php index 7af36149a..d2ab000db 100644 --- a/admin/layouts/admin_fields_conditions/conditions_above.php +++ b/admin/layouts/admin_fields_conditions/conditions_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_above.php diff --git a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php index 86bf9ce80..5e70aaf37 100644 --- a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php +++ b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_fullwidth.php diff --git a/admin/layouts/admin_fields_conditions/publishing.php b/admin/layouts/admin_fields_conditions/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/admin_fields_conditions/publishing.php +++ b/admin/layouts/admin_fields_conditions/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields_conditions/publlshing.php b/admin/layouts/admin_fields_conditions/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/admin_fields_conditions/publlshing.php +++ b/admin/layouts/admin_fields_conditions/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 4af960c6a..400e234ea 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php index 6aa342765..edcd4a546 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index 56a91fab1..bcd5c437f 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index 02be53983..d60f7e095 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/details_above.php b/admin/layouts/admin_view/details_above.php index bf64d3d3a..b85da93b3 100644 --- a/admin/layouts/admin_view/details_above.php +++ b/admin/layouts/admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/admin_view/details_left.php b/admin/layouts/admin_view/details_left.php index 7cc9b390d..1b5c987aa 100644 --- a/admin/layouts/admin_view/details_left.php +++ b/admin/layouts/admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/admin_view/details_right.php b/admin/layouts/admin_view/details_right.php index 05a41a76c..888bbc489 100644 --- a/admin/layouts/admin_view/details_right.php +++ b/admin/layouts/admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/admin_view/details_under.php b/admin/layouts/admin_view/details_under.php index c43e96321..ea92c01f4 100644 --- a/admin/layouts/admin_view/details_under.php +++ b/admin/layouts/admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/admin_view/fields_conditions_fullwidth.php b/admin/layouts/admin_view/fields_conditions_fullwidth.php index a1bc0bccc..64f216a4e 100644 --- a/admin/layouts/admin_view/fields_conditions_fullwidth.php +++ b/admin/layouts/admin_view/fields_conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_fullwidth.php diff --git a/admin/layouts/admin_view/fields_conditions_left.php b/admin/layouts/admin_view/fields_conditions_left.php index 6b5119059..f7ec97b95 100644 --- a/admin/layouts/admin_view/fields_conditions_left.php +++ b/admin/layouts/admin_view/fields_conditions_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_left.php diff --git a/admin/layouts/admin_view/fields_conditions_right.php b/admin/layouts/admin_view/fields_conditions_right.php index 9987d3c7a..a206c9e30 100644 --- a/admin/layouts/admin_view/fields_conditions_right.php +++ b/admin/layouts/admin_view/fields_conditions_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_right.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index a0cc8e5cc..8f6ff5daa 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php index 2b7ce7757..096b32af7 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index c5625a575..a953c3bc7 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index 129e603b3..eb3e2e09b 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index 53006f293..4ccd61dcf 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_fullwidth.php b/admin/layouts/admin_view/settings_fullwidth.php index 918939310..16a51bff2 100644 --- a/admin/layouts/admin_view/settings_fullwidth.php +++ b/admin/layouts/admin_view/settings_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_fullwidth.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 6424893a7..9adeb80a5 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 637b7fce6..cb9f60100 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index 56a91fab1..bcd5c437f 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index 9dc39ea6f..d01fb589a 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index bf64d3d3a..b85da93b3 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index 4fd544d07..d56795422 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index f038697a9..352a1a309 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index 1706d8ee9..a192f1233 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index 5d2d742e8..8a1038e23 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index c43e96321..ea92c01f4 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index 8d6cdc617..307d0d545 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index 7af54be1b..4a20f9ed2 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index 1bddbc872..91a377bc4 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index 0f8f5fffd..5f1706124 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index 948e882b4..2194e4579 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php index c43e96321..ea92c01f4 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index 7e94e2326..9e7fd9fe5 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index 9f9e2c45d..858f7fc22 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index 56f42b867..a3e4274c2 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/joint_fullwidth.php b/admin/layouts/dynamic_get/joint_fullwidth.php index e8d892b4f..f13787041 100644 --- a/admin/layouts/dynamic_get/joint_fullwidth.php +++ b/admin/layouts/dynamic_get/joint_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage joint_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_above.php b/admin/layouts/dynamic_get/main_above.php index 9abe1b1b8..8e926e5dc 100644 --- a/admin/layouts/dynamic_get/main_above.php +++ b/admin/layouts/dynamic_get/main_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_above.php diff --git a/admin/layouts/dynamic_get/main_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php index 48a15c9ad..f1250e58d 100644 --- a/admin/layouts/dynamic_get/main_fullwidth.php +++ b/admin/layouts/dynamic_get/main_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_left.php b/admin/layouts/dynamic_get/main_left.php index eeb2bfaee..0e38bf71b 100644 --- a/admin/layouts/dynamic_get/main_left.php +++ b/admin/layouts/dynamic_get/main_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_left.php diff --git a/admin/layouts/dynamic_get/main_right.php b/admin/layouts/dynamic_get/main_right.php index 6f54003b2..9d81d7433 100644 --- a/admin/layouts/dynamic_get/main_right.php +++ b/admin/layouts/dynamic_get/main_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_right.php diff --git a/admin/layouts/dynamic_get/main_under.php b/admin/layouts/dynamic_get/main_under.php index 37a0f3c2a..295bb6ea0 100644 --- a/admin/layouts/dynamic_get/main_under.php +++ b/admin/layouts/dynamic_get/main_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index f26602a59..d55f2a213 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index 621a91f3d..dbc63418f 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index 82387fe96..a600913df 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index c43e96321..ea92c01f4 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index 82ddbbda0..7f3fc62d8 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index 4ca188fc7..4bd80d0fc 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_fullwidth.php b/admin/layouts/fieldtype/details_fullwidth.php index 7f5054e50..7122809ed 100644 --- a/admin/layouts/fieldtype/details_fullwidth.php +++ b/admin/layouts/fieldtype/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 7fe886314..5fe5760da 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index 1d6f3d572..59ac1032b 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index ca928cbc7..656817d37 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/ftp/details_above.php b/admin/layouts/ftp/details_above.php index 003fade3d..068f3ea4a 100644 --- a/admin/layouts/ftp/details_above.php +++ b/admin/layouts/ftp/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/ftp/details_fullwidth.php b/admin/layouts/ftp/details_fullwidth.php index 90c7aeee5..581f207d3 100644 --- a/admin/layouts/ftp/details_fullwidth.php +++ b/admin/layouts/ftp/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index c7bd96824..6efde53d5 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/ftp/publishing.php b/admin/layouts/ftp/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/ftp/publishing.php +++ b/admin/layouts/ftp/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/ftp/publlshing.php b/admin/layouts/ftp/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/ftp/publlshing.php +++ b/admin/layouts/ftp/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index b085242eb..28cb261ef 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index c01bc6ce7..1eaafe7c2 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index e296d7565..85188c4b3 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 7b63932f6..1fa6cf18f 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index c43e96321..ea92c01f4 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php index 81ff0f148..f6a86ae09 100644 --- a/admin/layouts/joomla_component/admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index b84b06129..cbb71cc4a 100644 --- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index bf64d3d3a..b85da93b3 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index 07151bc33..1b5a90bec 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index 81f83f452..6bfa9c2ca 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php index c43e96321..ea92c01f4 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php index 43046e4fe..4bff1f4e7 100644 --- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index 0b049fc4c..8df11d0bc 100644 --- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php index b2f1380f0..1752a24cf 100644 --- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php +++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/metadata.php b/admin/layouts/joomla_component/metadata.php index aa7007742..8b76e02de 100644 --- a/admin/layouts/joomla_component/metadata.php +++ b/admin/layouts/joomla_component/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage metadata.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index 7254c75af..dafda1657 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php index 9c11732d3..5fb5bea06 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php index a4aa7b20d..be8261d6c 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index 1104b5e49..4bb8118df 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php index ee2db1a6a..57c6e7f3e 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php index 07677acb6..159c3c415 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index 0040b2d9f..531ccf392 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index 496cd7087..5225483da 100644 --- a/admin/layouts/joomla_component/site_views_fullwidth.php +++ b/admin/layouts/joomla_component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php index c9c06c5cb..1ca723bb4 100644 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ b/admin/layouts/joomla_component/translation_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage translation_fullwidth.php diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index 5aaff5586..1b401f88e 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php index cf75de15c..0b6dfc500 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/language_translation/details_above.php b/admin/layouts/language_translation/details_above.php index 3e0b05134..64f692141 100644 --- a/admin/layouts/language_translation/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php index cc661f992..fa965d14d 100644 --- a/admin/layouts/language_translation/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/language_translation/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/language_translation/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index ced9da293..69eff67fc 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index f4018b66d..cf6627d30 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index fdc1855b4..43b8c3d10 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index aea33ea85..f8a34e2e3 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index 3a84a1569..f1e716017 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index c43e96321..ea92c01f4 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index 363fabb8d..15de944b6 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php index ff72d51c4..cd0e689c8 100644 --- a/admin/layouts/site_view/custom_buttons_left.php +++ b/admin/layouts/site_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php index bb64eb6c4..cc983055a 100644 --- a/admin/layouts/site_view/custom_buttons_right.php +++ b/admin/layouts/site_view/custom_buttons_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_right.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index bf64d3d3a..b85da93b3 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index 4fd544d07..d56795422 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index f038697a9..352a1a309 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index aea33ea85..f8a34e2e3 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index 5d2d742e8..8a1038e23 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index c43e96321..ea92c01f4 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index 5b9f39200..979cfb4f7 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index 904b9e110..96e7a2f5a 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 0f415f298..9b5f809f0 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index e600703d9..59a7caef3 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index f9c626a6e..459d807fd 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index 6514b5d53..73535e8de 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index ced9da293..69eff67fc 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index 9efc58ef3..386616ba1 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index fdc1855b4..43b8c3d10 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index aea33ea85..f8a34e2e3 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index 3a84a1569..f1e716017 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index c43e96321..ea92c01f4 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index a73d367f0..bde3173d1 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index 043e2bbf5..f2d7bf8f8 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php index ad1f4e755..def35d2a7 100644 --- a/admin/models/admin_fields.php +++ b/admin/models/admin_fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php index 291ed47b3..4ce274096 100644 --- a/admin/models/admin_fields_conditions.php +++ b/admin/models/admin_fields_conditions.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.php diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 56961ff12..415be340d 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -465,7 +465,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin { $this->_db->updateObject('#__componentbuilder_admin_view', $objectUpdate, 'id'); } - // also update the fields and conditions if (!empty($item->id)) { diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 2950b851f..3658ee9d0 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/models/admins_fields.php b/admin/models/admins_fields.php index b3407df28..95c44ffdb 100644 --- a/admin/models/admins_fields.php +++ b/admin/models/admins_fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.php diff --git a/admin/models/admins_fields_conditions.php b/admin/models/admins_fields_conditions.php index 026524ba8..00a94665d 100644 --- a/admin/models/admins_fields_conditions.php +++ b/admin/models/admins_fields_conditions.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields_conditions.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index b1b4c4f6e..e9f4c7715 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -213,6 +213,7 @@ class ComponentbuilderModelAjax extends JModelList protected $buttonArray = array( 'admin_fields' => 'admins_fields', 'admin_fields_conditions' => 'admins_fields_conditions', + 'field' => 'fields', 'language' => true); public function getButton($type) @@ -346,58 +347,60 @@ class ComponentbuilderModelAjax extends JModelList 'match_behavior' => 'setMatchBehavior', 'match_options' => 'setMatchOptions'); - protected function getSubformTable($idName, $oject) + protected function getSubformTable($idName, $data) { - if (ComponentbuilderHelper::checkJson($oject) && ComponentbuilderHelper::checkString($idName)) + // make sure we convert the json to array + if (ComponentbuilderHelper::checkJson($data)) { - $array = json_decode($oject, true); - if (ComponentbuilderHelper::checkArray($array)) - { - // Build heading - $head = array(); - foreach ($array as $headers) + $data = json_decode($data, true); + } + // make sure we have an array + if (ComponentbuilderHelper::checkArray($data) && ComponentbuilderHelper::checkString($idName)) + { + // Build heading + $head = array(); + foreach ($data as $headers) + { + foreach ($headers as $header => $value) { - foreach ($headers as $header => $value) - { - $head[$header] = '' . ComponentbuilderHelper::safeString($header, 'Ww'); - } + $head[$header] = '' . ComponentbuilderHelper::safeString($header, 'Ww'); } - // build the rows - $rows = array(); - if (ComponentbuilderHelper::checkArray($array) && ComponentbuilderHelper::checkArray($head)) + } + // build the rows + $rows = array(); + if (ComponentbuilderHelper::checkArray($data) && ComponentbuilderHelper::checkArray($head)) + { + foreach ($data as $nr => $values) { - foreach ($array as $nr => $values) + foreach ($head as $key => $t) { - foreach ($head as $key => $t) + // set the value for the row + if (isset($values[$key])) { - // set the value for the row - if (isset($values[$key])) - { - $this->setSubformRows($nr, $this->setSubformValue($key, $values[$key]), $rows); - } - else - { - $this->setSubformRows($nr, $this->setSubformValue($key, ''), $rows); - } + $this->setSubformRows($nr, $this->setSubformValue($key, $values[$key]), $rows); + } + else + { + $this->setSubformRows($nr, $this->setSubformValue($key, ''), $rows); } } } - // build table - if (ComponentbuilderHelper::checkArray($rows) && ComponentbuilderHelper::checkArray($head)) - { - // set the number of rows - $this->rowNumber = count($rows); - // return the table - return $this->setSubformTable($head, $rows); - } + } + // build table + if (ComponentbuilderHelper::checkArray($rows) && ComponentbuilderHelper::checkArray($head)) + { + // set the number of rows + $this->rowNumber = count($rows); + // return the table + return $this->setSubformTable($head, $rows, $idName); } } return false; } - protected function setSubformTable($head, $rows) + protected function setSubformTable($head, $rows, $idName) { - $table[] = "
"; + $table[] = "
"; $table[] = "\t
"; $table[] = "\t\t
"; $table[] = "\t\t\t"; @@ -469,6 +472,8 @@ class ComponentbuilderModelAjax extends JModelList // get the field data if ($fieldsData = ComponentbuilderHelper::getVar($type, (int) $values['a_id'], 'admin_view', $this->fieldsArray[$type])) { + // check repeatable conversion + $this->checkRepeatableConversion($fieldsData, $type, $values['a_id']); // get the table $table = $this->getSubformTable($type, $fieldsData); // set notice of bad practice @@ -490,6 +495,35 @@ class ComponentbuilderModelAjax extends JModelList return '

' . JText::_('COM_COMPONENTBUILDER_TYPE_ERROR') . '

' . JText::_('COM_COMPONENTBUILDER_THERE_HAS_BEEN_AN_ERROR_IF_THIS_CONTINUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR_OF_A_TYPE_ERROR_IN_THE_FIELDS_DISPLAY_REQUEST') . '

'; } + protected $conversionCheck = array( + 'addfields' => 'field', + 'addconditions' => 'target_field'); + + protected function checkRepeatableConversion(&$fieldsData, $type, $id) + { + if (ComponentbuilderHelper::checkJson($fieldsData)) + { + $fieldsData = json_decode($fieldsData, true); + if (isset($fieldsData[$this->conversionCheck[$this->fieldsArray[$type]]])) + { + $bucket = array(); + foreach($fieldsData as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket[$this->fieldsArray[$type].$nr][$option] = $value; + } + } + $fieldsData = json_encode($bucket); + // update the fields + $objectUpdate = new stdClass(); + $objectUpdate->admin_view = (int) $id; + $objectUpdate->{$this->fieldsArray[$type]} = $fieldsData; + JFactory::getDbo()->updateObject('#__componentbuilder_'.$type, $objectUpdate, 'admin_view'); + } + } + } + protected function setAlignmentName($header, $value) { switch ($value) @@ -585,7 +619,7 @@ class ComponentbuilderModelAjax extends JModelList protected function setTabName($header, $value) { - if (ComponentbuilderHelper::checkArray($this->tabNames)) + if (!ComponentbuilderHelper::checkArray($this->tabNames)) { // get the view name & id $values = $this->getViewID(); diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 6b0e4f697..5cc2bc735 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index bb681b800..f0548b3b8 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 4ce18de81..3b9bcbd1b 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index ad3acba95..8d8e1c883 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index d460b9d1c..1d7ab26f4 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php index 0590e7b82..658024363 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index a90956325..dfb10d6ee 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index 210b95264..24feb4fba 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index fe1b5ff8c..81463c4d6 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index 3331f8d48..dbb5db6ed 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index a9d438622..e8f47552e 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php index 6e6b6991f..09a6bda33 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicget.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index a4128b7e3..c86710473 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 97fd13b5e..c67a428b5 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index e3c913985..44ec29f46 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/ftps.php b/admin/models/fields/ftps.php index 9b15f8b77..77483e34a 100644 --- a/admin/models/fields/ftps.php +++ b/admin/models/fields/ftps.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ftps.php diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php index 56ec5bdf7..d21ff672f 100644 --- a/admin/models/fields/lang.php +++ b/admin/models/fields/lang.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage lang.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 10eb9154d..3f69452ac 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/matchfield.php similarity index 79% rename from admin/models/fields/fieldsmulti.php rename to admin/models/fields/matchfield.php index 6be05b287..dc973b775 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/matchfield.php @@ -11,10 +11,10 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage fieldsmulti.php + @subpackage matchfield.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -31,16 +31,16 @@ jimport('joomla.form.helper'); JFormHelper::loadFieldClass('list'); /** - * Fieldsmulti Form Field class for the Componentbuilder component + * Matchfield Form Field class for the Componentbuilder component */ -class JFormFieldFieldsmulti extends JFormFieldList +class JFormFieldMatchfield extends JFormFieldList { /** - * The fieldsmulti field type. + * The matchfield field type. * * @var string */ - public $type = 'fieldsmulti'; + public $type = 'matchfield'; /** * Override to add new button * @@ -149,23 +149,62 @@ class JFormFieldFieldsmulti extends JFormFieldList */ public function getOptions() { - $db = JFactory::getDBO(); - $query = $db->getQuery(true); - $query->select($db->quoteName(array('a.id','a.name'),array('id','target_field_name'))); - $query->from($db->quoteName('#__componentbuilder_field', 'a')); - $query->where($db->quoteName('a.published') . ' = 1'); - $query->order('a.name ASC'); - $db->setQuery((string)$query); - $items = $db->loadObjectList(); - $options = array(); - if ($items) - { - $options[] = JHtml::_('select.option', '', 'Select an option'); - foreach($items as $item) - { - $options[] = JHtml::_('select.option', $item->id, $item->target_field_name); - } - } + // load the db opbject + $db = JFactory::getDBO(); + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the id + $ID = $jinput->getInt('id', 0); + // rest the fields ids + $fieldIds = array(); + if (is_numeric($ID) && $ID >= 1) + { + // get the admin view ID + if ($adminView = ComponentbuilderHelper::getVar('admin_fields_conditions', (int) $ID, 'id', 'admin_view')) + { + // get all the fields linked to the admin view + if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields')) + { + if (ComponentbuilderHelper::checkJson($addFields)) + { + $addFields = json_decode($addFields, true); + if (ComponentbuilderHelper::checkArray($addFields)) + { + foreach($addFields as $addField) + { + if (isset($addField['field'])) + { + $fieldIds[] = (int) $addField['field']; + } + } + } + } + } + } + } + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.id','a.name'),array('id','name'))); + $query->from($db->quoteName('#__componentbuilder_field', 'a')); + $query->where($db->quoteName('a.published') . ' >= 1'); + // filter by fields linked + if (ComponentbuilderHelper::checkArray($fieldIds)) + { + // only load these fields + $query->where($db->quoteName('a.id') . ' IN (' . implode(',', $fieldIds) . ')'); + } + $query->order('a.name ASC'); + $db->setQuery((string)$query); + $items = $db->loadObjectList(); + $options = array(); + if ($items) + { + $options[] = JHtml::_('select.option', '', 'Select an option'); + foreach($items as $item) + { + $options[] = JHtml::_('select.option', $item->id, $item->name); + } + } + return $options; } } diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 721c66176..b1f01f305 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index 7b5d79015..5229f2ca1 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index 0e25105cb..b19a0ee79 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fields/targetfields.php b/admin/models/fields/targetfields.php new file mode 100644 index 000000000..7275291ae --- /dev/null +++ b/admin/models/fields/targetfields.php @@ -0,0 +1,209 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import the list field type +jimport('joomla.form.helper'); +JFormHelper::loadFieldClass('list'); + +/** + * Targetfields Form Field class for the Componentbuilder component + */ +class JFormFieldTargetfields extends JFormFieldList +{ + /** + * The targetfields field type. + * + * @var string + */ + public $type = 'targetfields'; + /** + * Override to add new button + * + * @return string The field input markup. + * + * @since 3.2 + */ + protected function getInput() + { + // see if we should add buttons + $setButton = $this->getAttribute('button'); + // get html + $html = parent::getInput(); + // if true set button + if ($setButton === 'true') + { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $app = JFactory::getApplication(); + $jinput = $app->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } + $user = JFactory::getUser(); + // only add if user allowed to create field + if ($user->authorise('field.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build Create button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' + '; + } + // only add if user allowed to edit field + if (($buttonName === 'field' || $buttonName === 'fields') && $user->authorise('field.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_componentbuilder&view=fields&task=field.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for field field. + if (is_array($button) && count($button) > 0) + { + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return '
' .$html . implode('',$button).'
'; + } + } + return $html; + } + + /** + * Method to get a list of options for a list input. + * + * @return array An array of JHtml options. + */ + public function getOptions() + { + // load the db opbject + $db = JFactory::getDBO(); + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the id + $ID = $jinput->getInt('id', 0); + // rest the fields ids + $fieldIds = array(); + if (is_numeric($ID) && $ID >= 1) + { + // get the admin view ID + if ($adminView = ComponentbuilderHelper::getVar('admin_fields_conditions', (int) $ID, 'id', 'admin_view')) + { + // get all the fields linked to the admin view + if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields')) + { + if (ComponentbuilderHelper::checkJson($addFields)) + { + $addFields = json_decode($addFields, true); + if (ComponentbuilderHelper::checkArray($addFields)) + { + foreach($addFields as $addField) + { + if (isset($addField['field'])) + { + $fieldIds[] = (int) $addField['field']; + } + } + } + } + } + } + } + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.id','a.name'),array('id','name'))); + $query->from($db->quoteName('#__componentbuilder_field', 'a')); + $query->where($db->quoteName('a.published') . ' >= 1'); + // filter by fields linked + if (ComponentbuilderHelper::checkArray($fieldIds)) + { + // only load these fields + $query->where($db->quoteName('a.id') . ' IN (' . implode(',', $fieldIds) . ')'); + } + $query->order('a.name ASC'); + $db->setQuery((string)$query); + $items = $db->loadObjectList(); + $options = array(); + if ($items) + { + foreach($items as $item) + { + $options[] = JHtml::_('select.option', $item->id, $item->name); + } + } + + return $options; + } +} diff --git a/admin/models/fields/viewtabs.php b/admin/models/fields/viewtabs.php index 114daea25..6280f030e 100644 --- a/admin/models/fields/viewtabs.php +++ b/admin/models/fields/viewtabs.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage viewtabs.php diff --git a/admin/models/forms/admin_fields.js b/admin/models/forms/admin_fields.js index 4555b4d53..ea2d1d463 100644 --- a/admin/models/forms/admin_fields.js +++ b/admin/models/forms/admin_fields.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.js diff --git a/admin/models/forms/admin_fields_conditions.js b/admin/models/forms/admin_fields_conditions.js index 544de03a5..2ae4f1769 100644 --- a/admin/models/forms/admin_fields_conditions.js +++ b/admin/models/forms/admin_fields_conditions.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.js diff --git a/admin/models/forms/admin_fields_conditions.xml b/admin/models/forms/admin_fields_conditions.xml index 1bc5c2ed6..caee67221 100644 --- a/admin/models/forms/admin_fields_conditions.xml +++ b/admin/models/forms/admin_fields_conditions.xml @@ -106,9 +106,9 @@ icon="list" maximum="500"> - + COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CHAIN - + 0 && type.length > 0){ + var request = 'token='+token+'&type='+type; + } + return jQuery.ajax({ + type: 'GET', + url: getUrl, + dataType: 'jsonp', + data: request, + jsonp: 'callback' + }); +} +function addButton(type,where){ + addButton_server(type).done(function(result) { + if(result){ + addData(result,'#jform_'+where); + } + }) +} function getTableColumns_server(tableName){ var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json"; diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js index bb63a056e..b1f733cd3 100644 --- a/admin/models/forms/joomla_component.js +++ b/admin/models/forms/joomla_component.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.js diff --git a/admin/models/forms/language_translation.js b/admin/models/forms/language_translation.js index a4b92a7ba..e1470b7e0 100644 --- a/admin/models/forms/language_translation.js +++ b/admin/models/forms/language_translation.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage language_translation.js @@ -29,6 +29,10 @@ jQuery(document).ready(function($) // set button to add more languages addButton('language','components'); }); +function addData(result,where){ + jQuery(where).closest('.control-group').parent().append(result); +} + function addButton_server(type){ var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&vdm="+vastDevMod); if(token.length > 0 && type.length > 0){ @@ -42,13 +46,10 @@ function addButton_server(type){ jsonp: 'callback' }); } -function addButton(type, where){ +function addButton(type,where){ addButton_server(type).done(function(result) { if(result){ - setButton(result, '#jform_'+where); + addData(result,'#jform_'+where); } - }); -} -function setButton(result, where){ - jQuery(where).closest('.control-group').append(result); -} + }) +} diff --git a/admin/models/import.php b/admin/models/import.php index 88bc24be6..968c525e7 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index c64df7244..cca027d0b 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php @@ -654,6 +654,16 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy { return false; } + // we then store the admin_fields + if (!$this->saveSmartItems($data, 'admin_fields')) + { + return false; + } + // we then store the admin_fields_conditions + if (!$this->saveSmartItems($data, 'admin_fields_conditions')) + { + return false; + } // we then store the snippet if (!$this->saveSmartItems($data, 'snippet')) { @@ -1013,7 +1023,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } /* - * Convert repeatable field + * Convert repeatable field to subform * * @param array $array The array * @param string $name The main field name @@ -1154,11 +1164,11 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy if (isset($updateArray[$sleutel])) { $updateArray = $this->convertRepeatable($updateArray, $up); + // load it back + $item->{$up} = json_encode($updateArray); } - // load it back - $item->{$up} = json_encode($updateArray); } - else + elseif (isset($item->{$up})) { unset($item->{$up}); } @@ -1275,6 +1285,30 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB', $item->snippet, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'warning'); // unset($item->snippet); } + // repeatable fields to update + $updaterR = array( + 'ajax_input' => 'value_name', + 'custom_button' => 'name' + ); + // update the repeatable fields + foreach ($updaterR as $up => $sleutel) + { + if (isset($item->{$up}) && ComponentbuilderHelper::checkJson($item->{$up})) + { + $updateArray = json_decode($item->{$up}, true); + // check if this is old values for repeatable fields + if (isset($updateArray[$sleutel])) + { + $updateArray = $this->convertRepeatable($updateArray, $up); + // load it back + $item->{$up} = json_encode($updateArray); + } + } + elseif (isset($item->{$up})) + { + unset($item->{$up}); + } + } break; case 'admin_view': // we must clear the demo content (since it was not moved as far as we know) TODO @@ -1285,29 +1319,17 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy unset($item->source); unset($item->addtables); } - // update the addfields + // update the addfields (old dataset) if (isset($item->addfields) && ComponentbuilderHelper::checkJson($item->addfields)) { - $addfields = json_decode($item->addfields, true); - foreach ($addfields['field'] as $nr => $id) - { - if (!is_numeric($id)) - { - continue; - } - // update the addfields - if (isset($this->newID['field'][$id])) - { - $addfields['field'][$nr] = $this->newID['field'][$id]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BFIELD_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMOVED', '('.ComponentbuilderHelper::safeString($type, 'w').':'.$item->id.')', $id), 'warning'); - $addfields['field'][$nr] = ''; - } - } - // load it back - $item->addfields = json_encode($addfields); + // set the targets + $targets = array('field' => 'field'); + // set the anchors + $anchor = array('admin_view' => $item->id); + // move the old data + $this->moveData($item->addfields, 'admin_fields', 'addfields', 'target_field', $targets, $anchor); + // remove from this dataset + unset($item->addfields); } else { @@ -1322,55 +1344,50 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy { unset($item->addlinked_views); } - // update the addconditions - if (isset($item->addconditions) && ComponentbuilderHelper::checkJson($item->addconditions)) + // update the addconditions (old dataset) + if (isset($item->addconditions)) { - $addconditions = json_decode($item->addconditions, true); - $targets = array('target_field', 'match_field'); - foreach ($targets as $target) - { - foreach ($addconditions[$target] as $nr => $ids) - { - // update the addconditions - if (!ComponentbuilderHelper::checkArray($ids)) - { - $ids = array((int) $ids); - } - // the bucket to load the items back - $bucket = array(); - foreach ($ids as $id) - { - if (!is_numeric($id)) - { - continue; - } - if (isset($this->newID['field'][$id])) - { - $bucket[] = $this->newID['field'][$id]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMOVED', ComponentbuilderHelper::safeString($target, 'Ww') . ' in ('.ComponentbuilderHelper::safeString($type, 'w').':'.$item->id.')', $id), 'warning'); - $bucket[] = ''; - } - } - if (count($bucket) == 1) - { - $addconditions[$target][$nr] = $bucket[0]; - } - elseif (count($bucket) > 1) - { - $addconditions[$target][$nr] = $bucket; - } - } - } - // load it back - $item->addconditions = json_encode($addconditions); + // set the targets + $targets = array('target_field' => 'field', 'match_field' => 'field'); + // set the anchors + $anchor = array('admin_view' => $item->id); + // move the old data + $this->moveData($item->addconditions, 'admin_fields_conditions', 'addconditions', 'target_field', $targets, $anchor); + // remove from this dataset + unset($item->addconditions); } else { unset($item->addconditions); } + // repeatable fields to update + $updaterR = array( + 'ajax_input' => 'value_name', + 'custom_button' => 'name', + 'addtables' => 'table', + 'addlinked_views' => 'adminview', + 'addtabs' => 'name', + 'addpermissions' => 'action' + ); + // update the repeatable fields + foreach ($updaterR as $up => $sleutel) + { + if (isset($item->{$up}) && ComponentbuilderHelper::checkJson($item->{$up})) + { + $updateArray = json_decode($item->{$up}, true); + // check if this is old values for repeatable fields + if (isset($updateArray[$sleutel])) + { + $updateArray = $this->convertRepeatable($updateArray, $up); + // load it back + $item->{$up} = json_encode($updateArray); + } + } + elseif (isset($item->{$up})) + { + unset($item->{$up}); + } + } break; case 'joomla_component': // update the addconfig @@ -1645,8 +1662,6 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy return false; } - - /** * Check if a field has multiple fields * @@ -1676,6 +1691,116 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy return false; } + /** + * Move old repeatable field to new subform field, and new table + * + * @param array/json $values The values to move + * @param string $table The table to move the values to + * @param string $type The type of values + * @param string $checker The key to check if this is a repeatable field + * @param array $targets The target to update and its type + * @param array $anchor The fields to use in anchoring to the new table + * + * @return void + */ + protected function moveData($values, $table, $type, $checker, $targets, $anchor) + { + if (ComponentbuilderHelper::checkJson($values)) + { + $values = json_decode($values, true); + } + // check if this is old values for repeatable fields + if (ComponentbuilderHelper::checkArray($values) && isset($values[$checker])) + { + $values = $this->convertRepeatable($values, $type); + } + // now update the fields + if (ComponentbuilderHelper::checkArray($values)) + { + foreach ($values as $nr => &$value) + { + foreach ($targets as $target => $target_type) + { + if (isset($value[$target])) + { + // update the target + if (!ComponentbuilderHelper::checkArray($value[$target])) + { + if (isset($this->newID[$target_type][$value[$target]])) + { + $value[$target] = $this->newID[$target_type][$value[$target]]; + } + else + { + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED', ComponentbuilderHelper::safeString($target_type, 'Ww') . '->' . ComponentbuilderHelper::safeString($target, 'Ww') .' in ('.ComponentbuilderHelper::safeString($table, 'w').':'.$item->id.')', $value[$target]), 'warning'); + $value[$target] = ''; + } + } + elseif (ComponentbuilderHelper::checkArray($value[$target])) + { + // the bucket to load the items back + $bucket = array(); + foreach ($value[$target] as $id) + { + if (!is_numeric($id)) + { + continue; + } + if (isset($this->newID[$target_type][$id])) + { + $bucket[] = $this->newID[$target_type][$id]; + } + else + { + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED', ComponentbuilderHelper::safeString($target_type, 'Ww') . '->' . ComponentbuilderHelper::safeString($target, 'Ww') .' in ('.ComponentbuilderHelper::safeString($table, 'w').':'.$item->id.')', $id), 'warning'); + $bucket[] = ''; + } + } + // set ids back + if (ComponentbuilderHelper::checkArray($bucket)) + { + $value[$target] = $bucket; + } + } + } + } + } + } + // we need to move this to the new $table based on anchors + if (ComponentbuilderHelper::checkArray($anchor)) + { + $anchorArray = array(); + foreach ($anchor as $name => $id) + { + $updated = false; + if (isset($this->newID[$name]) && isset($this->newID[$name][$id])) + { + $id = $this->newID[$name][$id]; + $updated = true; + } + // set the values + $anchorArray[$name] = array('value' => $id, 'updated' => $updated); + } + if (!isset($this->dataMover[$table])) + { + $this->dataMover[$table] = array(); + } + // set unique key + $uniqueKey = md5(serialize($anchorArray)); + if (!isset($this->dataMover[$table][$uniqueKey])) + { + $this->dataMover[$table][$uniqueKey] = array(); + $this->dataMover[$table][$uniqueKey]['<(--AnCh0r'] = $anchorArray; + } + // add the data to the mover + $this->dataMover[$table][$uniqueKey][$type] = json_encode($values); + } + else + { + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_WE_FAILED_TO_MOVE_BSB', ComponentbuilderHelper::safeString($type, 'Ww') . ' to ('.ComponentbuilderHelper::safeString($table, 'w').')'), 'warning'); + } + } + /** * Get the field type * @@ -1727,9 +1852,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy /** * Update the local item * - * @param object $item The item to update - * @param string $type The type of values - * @param bool $canState The switch to set state + * @param object $item The item to update + * @param string $type The type of values + * @param bool $canState The switch to set state * * @return mixed false on failure * ID int on success @@ -1894,6 +2019,16 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // set the getter switch ($type) { + case 'admin_fields': + case 'admin_fields_conditions': + // get by admin_view (since there should only be one of each name) + $getter = 'admin_view'; + // update the admin_view with the local ID + if (isset($this->newID[$getter]) && isset($this->newID[$getter][$item->admin_view])) + { + $item->{$getter} = (int) $this->newID[$getter][$item->{$getter}]; + } + break; case 'fieldtype': // get by name (since there should only be one of each name) $getter = 'name'; diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index e99310e76..2b450cc51 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index 09569b74d..00e57e6f5 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php @@ -82,6 +82,10 @@ class ComponentbuilderModelJoomla_components extends JModelList protected $customPath; protected $smartExport = array(); protected $templateIds = array(); + protected $dynamicGetIds = array(); + protected $adminViewIds = array(); + protected $fieldTypeIds = array(); + protected $snippetIds = array(); protected $layoutIds = array(); protected $customCodeIds = array(); protected $customCodeM = array(); @@ -261,13 +265,13 @@ class ComponentbuilderModelJoomla_components extends JModelList // component image $this->moveIt(array('image' => array($item->image)), 'image'); // add config fields - $this->setData('field', $item->addconfig, 'field'); + $this->setData('field', $this->getIds($item->addconfig, 'repeatable', 'field'), 'id'); // add admin views - $this->setData('admin_view', $item->addadmin_views, 'adminview'); + $this->setData('admin_view', $this->getIds($item->addadmin_views, 'repeatable', 'adminview'), 'id'); // add custom admin views - $this->setData('custom_admin_view', $item->addcustom_admin_views, 'customadminview'); + $this->setData('custom_admin_view', $this->getIds($item->addcustom_admin_views, 'repeatable', 'customadminview'), 'id'); // add site views - $this->setData('site_view', $item->addsite_views, 'siteview'); + $this->setData('site_view', $this->getIds($item->addsite_views, 'repeatable', 'siteview'), 'id'); // set the custom code ID's $this->setCustomCodeIds($item, 'joomla_component'); // set the language strings for this component @@ -275,20 +279,41 @@ class ComponentbuilderModelJoomla_components extends JModelList // load to global object $this->smartExport['joomla_component'][$item->id] = $item; } + // add fields and conditions + if (ComponentbuilderHelper::checkArray($this->adminViewIds)) + { + $this->setData('admin_fields', $this->adminViewIds, 'id'); + $this->setData('admin_fields_conditions', $this->adminViewIds, 'id'); + } + // add field types + if (ComponentbuilderHelper::checkArray($this->fieldTypeIds)) + { + $this->setData('fieldtype', $this->fieldTypeIds, 'id'); + } + // add dynamic get + if (ComponentbuilderHelper::checkArray($this->dynamicGetIds)) + { + $this->setData('dynamic_get', $this->dynamicGetIds, 'id'); + } + // add snippets + if (ComponentbuilderHelper::checkArray($this->snippetIds)) + { + $this->setData('snippet', $this->snippetIds, 'id'); + } // add templates if (ComponentbuilderHelper::checkArray($this->templateIds)) { - $this->setData('template', array('template' => $this->templateIds), 'template'); + $this->setData('template', $this->templateIds, 'id'); } // add layouts if (ComponentbuilderHelper::checkArray($this->layoutIds)) { - $this->setData('layout', array('layout' => $this->layoutIds), 'layout'); + $this->setData('layout', $this->layoutIds, 'id'); } // add custom code if (ComponentbuilderHelper::checkArray($this->customCodeIds)) { - $this->setData('custom_code', array('custom_code' => $this->customCodeIds), 'custom_code'); + $this->setData('custom_code', $this->customCodeIds, 'id'); } // has any data been set if (ComponentbuilderHelper::checkArray($this->smartExport['joomla_component'])) @@ -302,6 +327,237 @@ class ComponentbuilderModelJoomla_components extends JModelList return false; } + + /** + * Method to get ids. + * + * @return mixed An array of ids on success, false on failure. + */ + protected function getIds($values, $type, $key = null) + { + // the ids bucket + $bucket = array(); + // if json convert to array + if (ComponentbuilderHelper::checkJson($values)) + { + $values = json_decode($values, true); + } + // check that the array has values + if (ComponentbuilderHelper::checkArray($values)) + { + // check if the key is an array (targeting subform) + if ('subform' === $type && $key) + { + foreach ($values as $value) + { + if (isset($value[$key])) + { + if (is_numeric($value[$key])) + { + $bucket[] = $value[$key]; + } + elseif (ComponentbuilderHelper::checkString($value[$key])) + { + $bucket[] = $this->_db->quote($value[$key]); + } + } + } + // only return if we set the ids + if (ComponentbuilderHelper::checkArray($bucket)) + { + // now set the values back + return array_unique($bucket); + } + } + // check if the key is an array (targeting subform) + if ('repeatable' === $type && $key) + { + if (isset($values[$key])) + { + return array_map(function($id) { + if (is_numeric($id)) + { + return $id; + } + elseif (ComponentbuilderHelper::checkString($id)) + { + return $this->_db->quote($id); + } + }, array_unique($values[$key]) ); + } + } + } + return false; + } + + /** + * Method to get data of a given table. + * + * @return mixed An array of data items on success, false on failure. + */ + protected function setData($table, $values, $key) + { + // make sure we have an array of values + if (!ComponentbuilderHelper::checkArray($values) || !ComponentbuilderHelper::checkString($table) || !ComponentbuilderHelper::checkString($key)) + { + return false; + } + // start the query + $query = $this->_db->getQuery(true); + + // Select some fields + $query->select(array('a.*')); + + // From the componentbuilder_ANY table + $query->from($this->_db->quoteName('#__componentbuilder_'. $table, 'a')); + // set the where query + $query->where('a.'.$key.' IN (' . implode(',',$values) . ')'); + // Implement View Level Access + if (!$this->user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $this->user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + + // Order the results by ordering + $query->order('a.ordering ASC'); + + // Load the items + $this->_db->setQuery($query); + $this->_db->execute(); + if ($this->_db->getNumRows()) + { + $items = $this->_db->loadObjectList(); + // check if we have items + if (ComponentbuilderHelper::checkArray($items)) + { + // set search array + if ('site_view' === $table || 'custom_admin_view' === $table) + { + $searchArray = array('php_view','php_jview','php_jview_display','php_document','js_document','css_document','css'); + } + // reset the global array + if ('template' === $table) + { + $this->templateIds = array(); + } + elseif ('layout' === $table) + { + $this->layoutIds = array(); + } + // start loading the data + if (!isset($this->smartExport[$table])) + { + $this->smartExport[$table] = array(); + } + // start loading the found items + foreach ($items as $nr => &$item) + { + // set the data per id only once + if (isset($this->smartExport[$table][$item->id])) + { + continue; + } + // load to global object + $this->smartExport[$table][$item->id] = $item; + // set the custom code ID's + $this->setCustomCodeIds($item, $table); + // actions to take if table is admin_view + if ('admin_view' === $table) + { + // add fields & conditions + $this->adminViewIds[$item->id] = $item->id; + // admin icon + $this->moveIt(array('image' => array($item->icon)), 'image'); + // admin icon_add + $this->moveIt(array('image' => array($item->icon_add)), 'image'); + // admin icon_category + $this->moveIt(array('image' => array($item->icon_category)), 'image'); + } + // actions to take if table is admin_fields + if ('admin_fields' === $table) + { + // add fields + $this->setData('field', $this->getIds($item->addfields, 'subform', 'field'), 'id'); + } + // actions to take if table is field + if ('field' === $table) + { + // add field types + $this->fieldTypeIds[$item->fieldtype] = $item->fieldtype; + // check if this field has multiple fields + if ($this->checkMultiFields($item->fieldtype)) + { + $fields = ComponentbuilderHelper::getBetween(json_decode($item->xml), 'fields="', '"'); + $fieldsSets = array(); + if (strpos($fields, ',') !== false) + { + // multiple fields + $fieldsSets = (array) explode(',', $fields); + } + elseif (is_numeric($fields)) + { + // single field + $fieldsSets[] = (int) $fields; + } + // get fields + if (ComponentbuilderHelper::checkArray($fieldsSets)) + { + $this->setData('field', $fieldsSets, 'id'); + } + } + } + // actions to take if table is site_view and custom_admin_view + if ('site_view' === $table || 'custom_admin_view' === $table) + { + // search for templates & layouts + $this->getTemplateLayout(base64_decode($item->default)); + // add search array templates and layouts + foreach ($searchArray as $scripter) + { + if (isset($item->{'add_'.$scripter}) && $item->{'add_'.$scripter} == 1) + { + $this->getTemplateLayout($item->$scripter); + } + } + // add dynamic gets + $this->dynamicGetIds[$item->main_get] = $item->main_get; + if (ComponentbuilderHelper::checkArray($item->custom_get)) + { + foreach ($item->custom_get as $custom_get) + { + // add dynamic gets + $this->dynamicGetIds[$custom_get] = $custom_get; + } + } + if ('custom_admin_view' === $table && isset($item->icon)) + { + // view icon + $this->moveIt(array('image' => array($item->icon)), 'image'); + } + // add snippets + $this->snippetIds[$item->snippet] = $item->snippet; + } + // actions to take if table is template and layout + if ('layout' === $table || 'template' === $table) + { + // search for templates & layouts + $this->getTemplateLayout(base64_decode($item->$table), $this->user); + // add search array templates and layouts + if (isset($item->add_php_view) && $item->add_php_view == 1) + { + $this->getTemplateLayout($item->php_view, $this->user); + } + // add dynamic gets + $this->dynamicGetIds[$item->dynamic_get] = $item->dynamic_get; + // add snippets + $this->snippetIds[$item->snippet] = $item->snippet; + } + } + } + } + } + /** * Method to build the package to export * @@ -518,213 +774,6 @@ class ComponentbuilderModelJoomla_components extends JModelList return true; } - /** - * Method to get data of a given table. - * - * @return mixed An array of data items on success, false on failure. - */ - protected function setData($table, $values, $key) - { - // if json convert to array - if (ComponentbuilderHelper::checkJson($values)) - { - $values = json_decode($values, true); - } - // check if the key is an array (targeting subform) - if (ComponentbuilderHelper::checkArray($key) && isset($key['subform']) && ComponentbuilderHelper::checkArray($values)) - { - $subform = $key['subform']; - $key = $key['key']; - $tmpBucket = array($key => array()); - foreach ($values as $value) - { - if (isset($value[$subform])) - { - if ('language' === $subform) - { - $tmpBucket[$key][] = (int) ComponentbuilderHelper::getVar('language', $value[$subform], 'langtag', 'id'); - } - else - { - $tmpBucket[$key][] = $value[$subform]; - } - } - } - if (ComponentbuilderHelper::checkArray($tmpBucket[$key])) - { - // now set the values back - $values = $tmpBucket; - } - else - { - return false; - } - } - elseif (ComponentbuilderHelper::checkArray($key)) - { - return false; - } - // make sure we have an array - if (('custom_code' !== $table && 'component' !== $key && 'custom_get' !== $key) && (!ComponentbuilderHelper::checkArray($values) || !isset($values[$key]) || !ComponentbuilderHelper::checkArray($values[$key]))) - { - return false; - } - elseif (!ComponentbuilderHelper::checkArray($values)) - { - return false; - } - $query = $this->_db->getQuery(true); - - // Select some fields - $query->select(array('a.*')); - - // From the componentbuilder_ANY table - $query->from($this->_db->quoteName('#__componentbuilder_'. $table, 'a')); - if ('custom_code' === $table && 'component' === $key) - { - $query->where('a.component IN (' . implode(',',$values) . ')'); - } - elseif ('custom_get' === $key) - { - $query->where('a.id IN (' . implode(',',$values) . ')'); - } - else - { - $query->where('a.id IN (' . implode(',',$values[$key]) . ')'); - } - - // Implement View Level Access - if (!$this->user->authorise('core.options', 'com_componentbuilder')) - { - $groups = implode(',', $this->user->getAuthorisedViewLevels()); - $query->where('a.access IN (' . $groups . ')'); - } - - // Order the results by ordering - $query->order('a.ordering ASC'); - - // Load the items - $this->_db->setQuery($query); - $this->_db->execute(); - if ($this->_db->getNumRows()) - { - $items = $this->_db->loadObjectList(); - // check if we have items - if (ComponentbuilderHelper::checkArray($items)) - { - // set search array - if ('site_view' === $table || 'custom_admin_view' === $table) - { - $searchArray = array('php_view','php_jview','php_jview_display','php_document','js_document','css_document','css'); - } - // reset the global array - if ('template' === $table) - { - $this->templateIds = array(); - } - elseif ('layout' === $table) - { - $this->layoutIds = array(); - } - // start loading the data - if (!isset($this->smartExport[$table])) - { - $this->smartExport[$table] = array(); - } - foreach ($items as $nr => &$item) - { - // set the data per id only once - if (isset($this->smartExport[$table][$item->id])) - { - continue; - } - // load to global object - $this->smartExport[$table][$item->id] = $item; - // set the custom code ID's - $this->setCustomCodeIds($item, $table); - // actions to take if table is admin_view - if ('admin_view' === $table) - { - // add fields - $this->setData('field', $item->addfields, 'field'); - // admin icon - $this->moveIt(array('image' => array($item->icon)), 'image'); - // admin icon_add - $this->moveIt(array('image' => array($item->icon_add)), 'image'); - // admin icon_category - $this->moveIt(array('image' => array($item->icon_category)), 'image'); - } - // actions to take if table is field - if ('field' === $table) - { - // add field types - $this->setData('fieldtype', array('fieldtype' => array($item->fieldtype)), 'fieldtype'); - // check if this field has multiple fields - if ($this->checkMultiFields($item->fieldtype)) - { - $fields = ComponentbuilderHelper::getBetween(json_decode($item->xml), 'fields="', '"'); - $fieldsSets = array(); - if (strpos($fields, ',') !== false) - { - // multiple fields - $fieldsSets = (array) explode(',', $fields); - } - elseif (is_numeric($fields)) - { - // single field - $fieldsSets[] = (int) $fields; - } - // get fields - if (ComponentbuilderHelper::checkArray($fieldsSets)) - { - $this->setData('field', array('field' => $fieldsSets), 'field'); - } - } - } - // actions to take if table is site_view and custom_admin_view - if ('site_view' === $table || 'custom_admin_view' === $table) - { - // search for templates & layouts - $this->getTemplateLayout(base64_decode($item->default)); - // add search array templates and layouts - foreach ($searchArray as $scripter) - { - if (isset($item->{'add_'.$scripter}) && $item->{'add_'.$scripter} == 1) - { - $this->getTemplateLayout($item->$scripter); - } - } - // add dynamic gets - $this->setData('dynamic_get', array('dynamic_get' => array($item->main_get)), 'dynamic_get'); - $this->setData('dynamic_get', $item->custom_get, 'custom_get'); - if ('custom_admin_view' === $table && isset($item->icon)) - { - // view icon - $this->moveIt(array('image' => array($item->icon)), 'image'); - } - // add snippets - $this->setData('snippet', array('snippet' => array($item->snippet)), 'snippet'); - } - // actions to take if table is template and layout - if ('layout' === $table || 'template' === $table) - { - // search for templates & layouts - $this->getTemplateLayout(base64_decode($item->$table), $this->user); - // add search array templates and layouts - if (isset($item->add_php_view) && $item->add_php_view == 1) - { - $this->getTemplateLayout($item->php_view, $this->user); - } - // add dynamic gets - $this->setData('dynamic_get', array('dynamic_get' => $item->dynamic_get), 'dynamic_get'); - // add snippets - $this->setData('snippet', array('snippet' => array($item->snippet)), 'snippet'); - } - } - } - } - } - /** * Check if a field has multiple fields * @@ -891,12 +940,12 @@ class ComponentbuilderModelJoomla_components extends JModelList // add templates if (ComponentbuilderHelper::checkArray($this->templateIds)) { - $this->setData('template', array('template' => $this->templateIds), 'template'); + $this->setData('template', $this->templateIds, 'id'); } // add layouts if (ComponentbuilderHelper::checkArray($this->layoutIds)) { - $this->setData('layout', array('layout' => $this->layoutIds), 'layout'); + $this->setData('layout', $this->layoutIds, 'id'); } } } @@ -1045,7 +1094,7 @@ class ComponentbuilderModelJoomla_components extends JModelList // add languages if (isset($item->translation)) { - $this->setData('language', $item->translation, array('key' => 'language', 'subform' => 'language')); + $this->setData('language', $this->getIds($item->translation, 'subform', 'language'), 'langtag'); } } } diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php index 4bc248879..1d0941a43 100644 --- a/admin/models/language_translation.php +++ b/admin/models/language_translation.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage language_translation.php diff --git a/admin/models/language_translations.php b/admin/models/language_translations.php index 0ed46b519..27e56065c 100644 --- a/admin/models/language_translations.php +++ b/admin/models/language_translations.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage language_translations.php diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index fb30cee2d..a08fe27e4 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -787,7 +787,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addfields` TEXT NOT NULL, + `addfields` MEDIUMTEXT NOT NULL, `admin_view` INT(11) NOT NULL DEFAULT 0, `params` text NOT NULL DEFAULT '', `published` TINYINT(3) NOT NULL DEFAULT 1, @@ -811,7 +811,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields_conditions` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', - `addconditions` TEXT NOT NULL, + `addconditions` MEDIUMTEXT NOT NULL, `admin_view` INT(11) NOT NULL DEFAULT 0, `params` text NOT NULL DEFAULT '', `published` TINYINT(3) NOT NULL DEFAULT 1, diff --git a/admin/tables/admin_fields.php b/admin/tables/admin_fields.php index 346ba6adf..05ae0448c 100644 --- a/admin/tables/admin_fields.php +++ b/admin/tables/admin_fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php diff --git a/admin/tables/admin_fields_conditions.php b/admin/tables/admin_fields_conditions.php index 2bd255fb4..38a5499fb 100644 --- a/admin/tables/admin_fields_conditions.php +++ b/admin/tables/admin_fields_conditions.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.php diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index 9b79b4e68..2ca8dbde7 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php index e16c10e3f..cf1aab60a 100644 --- a/admin/tables/joomla_component.php +++ b/admin/tables/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/tables/language_translation.php b/admin/tables/language_translation.php index 3c7a51827..d66b646b1 100644 --- a/admin/tables/language_translation.php +++ b/admin/tables/language_translation.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage language_translation.php diff --git a/admin/views/admin_fields/submitbutton.js b/admin/views/admin_fields/submitbutton.js index b5b05df98..64ee894e3 100644 --- a/admin/views/admin_fields/submitbutton.js +++ b/admin/views/admin_fields/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_fields/tmpl/edit.php b/admin/views/admin_fields/tmpl/edit.php index 3dabdb396..c66ecfaa7 100644 --- a/admin/views/admin_fields/tmpl/edit.php +++ b/admin/views/admin_fields/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage edit.php diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php index 2bfdc9878..f397800a5 100644 --- a/admin/views/admin_fields/view.html.php +++ b/admin/views/admin_fields/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php diff --git a/admin/views/admin_fields_conditions/submitbutton.js b/admin/views/admin_fields_conditions/submitbutton.js index ff036a727..4cd58ae20 100644 --- a/admin/views/admin_fields_conditions/submitbutton.js +++ b/admin/views/admin_fields_conditions/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_fields_conditions/tmpl/edit.php b/admin/views/admin_fields_conditions/tmpl/edit.php index 7b2b650f6..f4adc87a6 100644 --- a/admin/views/admin_fields_conditions/tmpl/edit.php +++ b/admin/views/admin_fields_conditions/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage edit.php diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php index eee425ef1..4087ece53 100644 --- a/admin/views/admin_fields_conditions/view.html.php +++ b/admin/views/admin_fields_conditions/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index 1f6498f9f..05e89a50f 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index f68a425b7..b6435d4fd 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index b2b4f7b26..a9c161c4e 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 7a5937aa5..21ed29f68 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index fc5d46eea..2e0b46192 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index 546eb9bd6..54f91c274 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 154119810..4de3591f7 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index 0713c344a..dd51f4b2c 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index ad468e54a..e254de9a0 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index 7d4445773..a744e3161 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 690e85072..f170c2f01 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 185 of this MVC - @build 14th October, 2017 + @version @update number 191 of this MVC + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/admins_fields/tmpl/default.php b/admin/views/admins_fields/tmpl/default.php index ea1e39e44..7b4f07797 100644 --- a/admin/views/admins_fields/tmpl/default.php +++ b/admin/views/admins_fields/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default.php diff --git a/admin/views/admins_fields/tmpl/default_batch_body.php b/admin/views/admins_fields/tmpl/default_batch_body.php index d3df5c824..990d3fdab 100644 --- a/admin/views/admins_fields/tmpl/default_batch_body.php +++ b/admin/views/admins_fields/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admins_fields/tmpl/default_batch_footer.php b/admin/views/admins_fields/tmpl/default_batch_footer.php index ff95adda8..42028c821 100644 --- a/admin/views/admins_fields/tmpl/default_batch_footer.php +++ b/admin/views/admins_fields/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admins_fields/tmpl/default_body.php b/admin/views/admins_fields/tmpl/default_body.php index 4331b4e66..b5198e08a 100644 --- a/admin/views/admins_fields/tmpl/default_body.php +++ b/admin/views/admins_fields/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_body.php diff --git a/admin/views/admins_fields/tmpl/default_foot.php b/admin/views/admins_fields/tmpl/default_foot.php index 02ebf14c3..c7bc6281e 100644 --- a/admin/views/admins_fields/tmpl/default_foot.php +++ b/admin/views/admins_fields/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admins_fields/tmpl/default_head.php b/admin/views/admins_fields/tmpl/default_head.php index f61bf874d..d57475c62 100644 --- a/admin/views/admins_fields/tmpl/default_head.php +++ b/admin/views/admins_fields/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admins_fields/tmpl/default_toolbar.php b/admin/views/admins_fields/tmpl/default_toolbar.php index a77900f0a..4ec4512a5 100644 --- a/admin/views/admins_fields/tmpl/default_toolbar.php +++ b/admin/views/admins_fields/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php index 0dd4e3471..0652929a2 100644 --- a/admin/views/admins_fields/view.html.php +++ b/admin/views/admins_fields/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 22 of this MVC - @build 13th October, 2017 + @build 15th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php diff --git a/admin/views/admins_fields_conditions/tmpl/default.php b/admin/views/admins_fields_conditions/tmpl/default.php index d3677325d..4c4d28e05 100644 --- a/admin/views/admins_fields_conditions/tmpl/default.php +++ b/admin/views/admins_fields_conditions/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_batch_body.php b/admin/views/admins_fields_conditions/tmpl/default_batch_body.php index dadef5f3a..0ef8b1bf6 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_batch_body.php +++ b/admin/views/admins_fields_conditions/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php b/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php index 10ee94af6..17c9bedf8 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php +++ b/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_body.php b/admin/views/admins_fields_conditions/tmpl/default_body.php index c6a4079e7..2344aa031 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_body.php +++ b/admin/views/admins_fields_conditions/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_body.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_foot.php b/admin/views/admins_fields_conditions/tmpl/default_foot.php index 5e430745c..464f86ec3 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_foot.php +++ b/admin/views/admins_fields_conditions/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_head.php b/admin/views/admins_fields_conditions/tmpl/default_head.php index 7d6a3915e..c068f684d 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_head.php +++ b/admin/views/admins_fields_conditions/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_toolbar.php b/admin/views/admins_fields_conditions/tmpl/default_toolbar.php index 0a6ca311a..7d4374c19 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_toolbar.php +++ b/admin/views/admins_fields_conditions/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php index ebb724e05..06d935886 100644 --- a/admin/views/admins_fields_conditions/view.html.php +++ b/admin/views/admins_fields_conditions/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 15 of this MVC - @build 13th October, 2017 + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index 9c2b7c873..f3719866f 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php index 8e3e94e90..64099ac92 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php index 3430f9b92..25e26b9d8 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index 0712d876f..36ac22de3 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index 1ce95218c..c949715a7 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_releases_information.php b/admin/views/componentbuilder/tmpl/default_releases_information.php index 31438fba8..614b11267 100644 --- a/admin/views/componentbuilder/tmpl/default_releases_information.php +++ b/admin/views/componentbuilder/tmpl/default_releases_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_releases_information.php diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index 9cbd66462..f1589b506 100644 --- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index bdfcfdcdb..62b5fa6ac 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php index ca0a1f107..92bd5d8cf 100644 --- a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php +++ b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_wiki_tutorials.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 97550a9e6..1e38844a1 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index be5d5249e..2f8053786 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index cda6301be..954cd995d 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php index 4cb4af4fa..bb97c67ba 100644 --- a/admin/views/import_joomla_components/tmpl/default.php +++ b/admin/views/import_joomla_components/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index 3d4674d6a..0c808e95c 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_component/submitbutton.js b/admin/views/joomla_component/submitbutton.js index 085e88f04..85f22ed5c 100644 --- a/admin/views/joomla_component/submitbutton.js +++ b/admin/views/joomla_component/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php index bbf300ea4..14426047d 100644 --- a/admin/views/joomla_component/tmpl/edit.php +++ b/admin/views/joomla_component/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php index 6958c5176..2927f5d74 100644 --- a/admin/views/joomla_component/view.html.php +++ b/admin/views/joomla_component/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_components/tmpl/default.php b/admin/views/joomla_components/tmpl/default.php index 3878eb34b..089d6bb89 100644 --- a/admin/views/joomla_components/tmpl/default.php +++ b/admin/views/joomla_components/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/joomla_components/tmpl/default_batch_body.php b/admin/views/joomla_components/tmpl/default_batch_body.php index 33efe3611..91a9d656d 100644 --- a/admin/views/joomla_components/tmpl/default_batch_body.php +++ b/admin/views/joomla_components/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/joomla_components/tmpl/default_batch_footer.php b/admin/views/joomla_components/tmpl/default_batch_footer.php index a2db00a40..8c1682ff3 100644 --- a/admin/views/joomla_components/tmpl/default_batch_footer.php +++ b/admin/views/joomla_components/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/joomla_components/tmpl/default_body.php b/admin/views/joomla_components/tmpl/default_body.php index 090b9d4c5..dcca8d8d1 100644 --- a/admin/views/joomla_components/tmpl/default_body.php +++ b/admin/views/joomla_components/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/joomla_components/tmpl/default_foot.php b/admin/views/joomla_components/tmpl/default_foot.php index f95be20c1..3064da697 100644 --- a/admin/views/joomla_components/tmpl/default_foot.php +++ b/admin/views/joomla_components/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/joomla_components/tmpl/default_head.php b/admin/views/joomla_components/tmpl/default_head.php index 154c63cd3..3d12d4831 100644 --- a/admin/views/joomla_components/tmpl/default_head.php +++ b/admin/views/joomla_components/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/joomla_components/tmpl/default_toolbar.php b/admin/views/joomla_components/tmpl/default_toolbar.php index 9e97ef9ab..f935ae591 100644 --- a/admin/views/joomla_components/tmpl/default_toolbar.php +++ b/admin/views/joomla_components/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index 96e76a3bc..bd5dac75b 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 389 of this MVC - @build 14th October, 2017 + @version @update number 412 of this MVC + @build 16th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/language_translation/submitbutton.js b/admin/views/language_translation/submitbutton.js index 72393db83..bada3b3a4 100644 --- a/admin/views/language_translation/submitbutton.js +++ b/admin/views/language_translation/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/language_translation/tmpl/edit.php b/admin/views/language_translation/tmpl/edit.php index 864da0342..78bb256b5 100644 --- a/admin/views/language_translation/tmpl/edit.php +++ b/admin/views/language_translation/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage edit.php diff --git a/admin/views/language_translation/view.html.php b/admin/views/language_translation/view.html.php index 094ee24d3..2311605fe 100644 --- a/admin/views/language_translation/view.html.php +++ b/admin/views/language_translation/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage view.html.php diff --git a/admin/views/language_translations/tmpl/default.php b/admin/views/language_translations/tmpl/default.php index c1eec6f8f..5cc18d338 100644 --- a/admin/views/language_translations/tmpl/default.php +++ b/admin/views/language_translations/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage default.php diff --git a/admin/views/language_translations/tmpl/default_batch_body.php b/admin/views/language_translations/tmpl/default_batch_body.php index 770688cc9..7085acb60 100644 --- a/admin/views/language_translations/tmpl/default_batch_body.php +++ b/admin/views/language_translations/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/language_translations/tmpl/default_batch_footer.php b/admin/views/language_translations/tmpl/default_batch_footer.php index b242ac852..f2530861e 100644 --- a/admin/views/language_translations/tmpl/default_batch_footer.php +++ b/admin/views/language_translations/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/language_translations/tmpl/default_body.php b/admin/views/language_translations/tmpl/default_body.php index 7736d9b40..81790bf8a 100644 --- a/admin/views/language_translations/tmpl/default_body.php +++ b/admin/views/language_translations/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage default_body.php diff --git a/admin/views/language_translations/tmpl/default_foot.php b/admin/views/language_translations/tmpl/default_foot.php index ac7371b7f..4b9b3c290 100644 --- a/admin/views/language_translations/tmpl/default_foot.php +++ b/admin/views/language_translations/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/language_translations/tmpl/default_head.php b/admin/views/language_translations/tmpl/default_head.php index 9db88f5ef..d3555750b 100644 --- a/admin/views/language_translations/tmpl/default_head.php +++ b/admin/views/language_translations/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage default_head.php diff --git a/admin/views/language_translations/tmpl/default_toolbar.php b/admin/views/language_translations/tmpl/default_toolbar.php index 0efcba23a..3e2535f48 100644 --- a/admin/views/language_translations/tmpl/default_toolbar.php +++ b/admin/views/language_translations/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php index a1147e032..cb19712e7 100644 --- a/admin/views/language_translations/view.html.php +++ b/admin/views/language_translations/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 44 of this MVC - @build 12th October, 2017 + @version @update number 45 of this MVC + @build 14th October, 2017 @created 3rd April, 2017 @package Component Builder @subpackage view.html.php diff --git a/componentbuilder.xml b/componentbuilder.xml index ee549e991..1b530cb93 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 14th October, 2017 + 16th October, 2017 Llewellyn van der Merwe joomla@vdm.io http://vdm.bz/component-builder diff --git a/script.php b/script.php index 23f4d5d2d..9409ee4eb 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage script.php diff --git a/site/assets/css/site.css b/site/assets/css/site.css index c865d6498..3d8340fdc 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 99e9aa115..0b300c7c0 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.js diff --git a/site/componentbuilder.php b/site/componentbuilder.php index e199fab64..0b633ee76 100644 --- a/site/componentbuilder.php +++ b/site/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/controller.php b/site/controller.php index bc5ab61c0..d33552c34 100644 --- a/site/controller.php +++ b/site/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/site/controllers/api.php b/site/controllers/api.php index 59d55cbbb..35e43642c 100644 --- a/site/controllers/api.php +++ b/site/controllers/api.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage api.php diff --git a/site/controllers/help.php b/site/controllers/help.php index 4bafd5ffb..06ec927fb 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/site/helpers/category.php b/site/helpers/category.php index da1b229e2..8a0d69c7d 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage category.php diff --git a/site/helpers/categoryfields.php b/site/helpers/categoryfields.php index 02d2569b5..a37a3f101 100644 --- a/site/helpers/categoryfields.php +++ b/site/helpers/categoryfields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfields.php diff --git a/site/helpers/categoryfieldtypes.php b/site/helpers/categoryfieldtypes.php index 27dad0118..951454a39 100644 --- a/site/helpers/categoryfieldtypes.php +++ b/site/helpers/categoryfieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfieldtypes.php diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index 2d71dd183..1d68364ac 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 058186eb7..42aa47aa5 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 9d863658e..4fa374d5e 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage route.php diff --git a/site/router.php b/site/router.php index 66ea0fe98..94ca5231f 100644 --- a/site/router.php +++ b/site/router.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage router.php diff --git a/site/views/api/submitbutton.js b/site/views/api/submitbutton.js index 99d75bf26..911dd5f65 100644 --- a/site/views/api/submitbutton.js +++ b/site/views/api/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 14th October, 2017 + @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js -- 2.40.1 From f7d5ac84c467f6f92558af2b9b9153418710093c Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Thu, 19 Oct 2017 05:53:55 +0200 Subject: [PATCH 12/14] Imporved the field display on admin fields conditions to only show fields linked to the admin view. Added access back to all JCB admin views. Fixed the export of JCB packages to include the new admin_fields and admin_flieds_conditions tables. Adapted the JCB package import method to be able to import old JCB packages --- README.md | 6 +- admin/README.txt | 6 +- admin/assets/css/admin.css | 2 +- admin/assets/css/admin_fields.css | 4 +- admin/assets/css/admin_fields_conditions.css | 2 +- admin/assets/css/admin_view.css | 2 +- admin/assets/css/admin_views.css | 2 +- admin/assets/css/admins_fields.css | 4 +- admin/assets/css/admins_fields_conditions.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/field.css | 4 +- admin/assets/css/fields.css | 4 +- admin/assets/css/ftp.css | 4 +- admin/assets/css/ftps.css | 4 +- admin/assets/css/joomla_component.css | 4 +- admin/assets/css/joomla_components.css | 4 +- admin/assets/js/admin.js | 2 +- admin/componentbuilder.php | 2 +- admin/controller.php | 2 +- admin/controllers/admin_fields.php | 4 +- admin/controllers/admin_fields_conditions.php | 2 +- admin/controllers/admin_view.php | 2 +- admin/controllers/admin_views.php | 2 +- admin/controllers/admins_fields.php | 4 +- .../controllers/admins_fields_conditions.php | 2 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/componentbuilder.php | 2 +- admin/controllers/field.php | 4 +- admin/controllers/fields.php | 4 +- admin/controllers/ftp.php | 4 +- admin/controllers/ftps.php | 4 +- admin/controllers/help.php | 2 +- admin/controllers/import.php | 2 +- .../controllers/import_joomla_components.php | 2 +- admin/controllers/joomla_component.php | 4 +- admin/controllers/joomla_components.php | 4 +- admin/helpers/compiler/a_Get.php | 2 +- admin/helpers/componentbuilder.php | 2 +- admin/helpers/componentbuilderemail.php | 2 +- admin/helpers/headercheck.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/indenter.php | 2 +- admin/helpers/js.php | 2 +- admin/helpers/minify.php | 2 +- .../en-GB/en-GB.com_componentbuilder.ini | 3 +- admin/layouts/admin_fields/fields_above.php | 2 +- .../layouts/admin_fields/fields_fullwidth.php | 2 +- admin/layouts/admin_fields/publishing.php | 2 +- admin/layouts/admin_fields/publlshing.php | 3 +- .../conditions_above.php | 2 +- .../conditions_fullwidth.php | 2 +- .../admin_fields_conditions/publishing.php | 2 +- .../admin_fields_conditions/publlshing.php | 3 +- admin/layouts/admin_view/css_fullwidth.php | 2 +- .../admin_view/custom_buttons_fullwidth.php | 2 +- .../admin_view/custom_buttons_left.php | 2 +- .../admin_view/custom_import_fullwidth.php | 2 +- admin/layouts/admin_view/details_above.php | 2 +- admin/layouts/admin_view/details_left.php | 2 +- admin/layouts/admin_view/details_right.php | 2 +- admin/layouts/admin_view/details_under.php | 2 +- .../fields_conditions_fullwidth.php | 2 +- .../admin_view/fields_conditions_left.php | 2 +- .../admin_view/fields_conditions_right.php | 2 +- .../admin_view/javascript_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_left.php | 2 +- admin/layouts/admin_view/php_fullwidth.php | 2 +- admin/layouts/admin_view/publishing.php | 2 +- admin/layouts/admin_view/publlshing.php | 3 +- .../layouts/admin_view/settings_fullwidth.php | 2 +- admin/layouts/batchselection.php | 2 +- .../custom_buttons_fullwidth.php | 2 +- .../custom_admin_view/custom_buttons_left.php | 2 +- .../custom_script_fullwidth.php | 2 +- .../custom_admin_view/details_above.php | 2 +- .../custom_admin_view/details_fullwidth.php | 2 +- .../custom_admin_view/details_left.php | 2 +- .../custom_admin_view/details_right.php | 2 +- .../custom_admin_view/details_rightside.php | 2 +- .../custom_admin_view/details_under.php | 2 +- .../linked_components_fullwidth.php | 2 +- .../layouts/custom_admin_view/publishing.php | 2 +- .../layouts/custom_admin_view/publlshing.php | 3 +- admin/layouts/custom_code/details_above.php | 2 +- .../layouts/custom_code/details_fullwidth.php | 2 +- admin/layouts/custom_code/details_left.php | 2 +- admin/layouts/custom_code/details_right.php | 2 +- admin/layouts/custom_code/details_under.php | 2 +- admin/layouts/custom_code/publishing.php | 2 +- admin/layouts/custom_code/publlshing.php | 3 +- .../layouts/dynamic_get/abacus_fullwidth.php | 2 +- admin/layouts/dynamic_get/abacus_left.php | 2 +- .../dynamic_get/custom_script_fullwidth.php | 2 +- admin/layouts/dynamic_get/joint_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_above.php | 2 +- admin/layouts/dynamic_get/main_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_left.php | 2 +- admin/layouts/dynamic_get/main_right.php | 2 +- admin/layouts/dynamic_get/main_under.php | 2 +- admin/layouts/dynamic_get/publishing.php | 2 +- admin/layouts/dynamic_get/publlshing.php | 3 +- admin/layouts/field/details_fullwidth.php | 2 +- admin/layouts/field/details_left.php | 2 +- admin/layouts/field/details_right.php | 2 +- admin/layouts/field/details_under.php | 2 +- admin/layouts/field/publishing.php | 2 +- admin/layouts/field/publlshing.php | 3 +- admin/layouts/field/scripts_left.php | 2 +- admin/layouts/field/scripts_right.php | 2 +- admin/layouts/fieldtype/details_fullwidth.php | 2 +- admin/layouts/fieldtype/details_left.php | 2 +- admin/layouts/fieldtype/details_right.php | 2 +- admin/layouts/fieldtype/fields_fullwidth.php | 2 +- admin/layouts/fieldtype/publishing.php | 2 +- admin/layouts/fieldtype/publlshing.php | 3 +- admin/layouts/ftp/details_above.php | 2 +- admin/layouts/ftp/details_fullwidth.php | 2 +- .../ftp/linked_components_fullwidth.php | 2 +- admin/layouts/ftp/publishing.php | 2 +- admin/layouts/ftp/publlshing.php | 3 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 3 +- .../admin_views_fullwidth.php | 2 +- .../custom_admin_views_fullwidth.php | 2 +- .../joomla_component/details_above.php | 2 +- .../layouts/joomla_component/details_left.php | 2 +- .../joomla_component/details_right.php | 2 +- .../joomla_component/details_under.php | 2 +- .../dynamic_build_beta_fullwidth.php | 2 +- .../dynamic_integration_fullwidth.php | 2 +- .../libs_helpers_fullwidth.php | 2 +- admin/layouts/joomla_component/metadata.php | 2 +- .../joomla_component/mysql_fullwidth.php | 2 +- .../joomla_component/php_fullwidth.php | 2 +- admin/layouts/joomla_component/publishing.php | 2 +- .../layouts/joomla_component/readme_left.php | 2 +- .../layouts/joomla_component/readme_right.php | 2 +- .../joomla_component/settings_left.php | 2 +- .../joomla_component/settings_right.php | 2 +- .../joomla_component/site_views_fullwidth.php | 2 +- .../translation_fullwidth.php | 2 +- admin/layouts/language/details_left.php | 2 +- admin/layouts/language/details_right.php | 2 +- admin/layouts/language/publishing.php | 2 +- admin/layouts/language/publlshing.php | 3 +- .../language_translation/details_above.php | 2 +- .../details_fullwidth.php | 2 +- .../language_translation/publishing.php | 2 +- .../language_translation/publlshing.php | 3 +- .../layout/custom_script_fullwidth.php | 2 +- admin/layouts/layout/details_fullwidth.php | 2 +- admin/layouts/layout/details_left.php | 2 +- admin/layouts/layout/details_right.php | 2 +- admin/layouts/layout/details_rightside.php | 2 +- admin/layouts/layout/details_under.php | 2 +- admin/layouts/layout/publishing.php | 2 +- admin/layouts/layout/publlshing.php | 3 +- .../site_view/custom_buttons_fullwidth.php | 2 +- .../layouts/site_view/custom_buttons_left.php | 2 +- .../site_view/custom_buttons_right.php | 2 +- admin/layouts/site_view/details_above.php | 2 +- admin/layouts/site_view/details_fullwidth.php | 2 +- admin/layouts/site_view/details_left.php | 2 +- admin/layouts/site_view/details_right.php | 2 +- admin/layouts/site_view/details_rightside.php | 2 +- admin/layouts/site_view/details_under.php | 2 +- .../site_view/javascript_css_fullwidth.php | 2 +- .../site_view/linked_components_fullwidth.php | 2 +- admin/layouts/site_view/php_fullwidth.php | 2 +- admin/layouts/site_view/publishing.php | 2 +- admin/layouts/site_view/publlshing.php | 3 +- admin/layouts/snippet/details_above.php | 2 +- admin/layouts/snippet/details_left.php | 2 +- admin/layouts/snippet/details_right.php | 2 +- admin/layouts/snippet/publishing.php | 2 +- admin/layouts/snippet/publlshing.php | 3 +- .../template/custom_script_fullwidth.php | 2 +- admin/layouts/template/details_fullwidth.php | 2 +- admin/layouts/template/details_left.php | 2 +- admin/layouts/template/details_right.php | 2 +- admin/layouts/template/details_rightside.php | 2 +- admin/layouts/template/details_under.php | 2 +- admin/layouts/template/publishing.php | 2 +- admin/layouts/template/publlshing.php | 3 +- admin/models/admin_fields.php | 4 +- admin/models/admin_fields_conditions.php | 2 +- admin/models/admin_view.php | 2 +- admin/models/admin_views.php | 23 +- admin/models/admins_fields.php | 19 +- admin/models/admins_fields_conditions.php | 17 +- admin/models/ajax.php | 2 +- admin/models/componentbuilder.php | 2 +- admin/models/custom_admin_views.php | 21 + admin/models/custom_codes.php | 21 + admin/models/dynamic_gets.php | 21 + admin/models/field.php | 4 +- admin/models/fields.php | 25 +- admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/adminviews.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/component.php | 2 +- admin/models/fields/components.php | 2 +- admin/models/fields/customadminviews.php | 2 +- admin/models/fields/customfilelist.php | 2 +- admin/models/fields/customfolderlist.php | 2 +- admin/models/fields/customgets.php | 2 +- admin/models/fields/dbtables.php | 2 +- admin/models/fields/dynamicget.php | 2 +- admin/models/fields/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldtypes.php | 2 +- admin/models/fields/ftps.php | 2 +- admin/models/fields/lang.php | 2 +- admin/models/fields/maingets.php | 2 +- admin/models/fields/matchfield.php | 30 +- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/fields/siteviews.php | 2 +- admin/models/fields/snippets.php | 2 +- admin/models/fields/targetfields.php | 30 +- admin/models/fields/viewtabs.php | 2 +- admin/models/fieldtype.php | 15 + admin/models/fieldtypes.php | 21 + admin/models/forms/admin_fields.js | 4 +- admin/models/forms/admin_fields.xml | 9 + admin/models/forms/admin_fields_conditions.js | 2 +- .../models/forms/admin_fields_conditions.xml | 9 + admin/models/forms/admin_view.js | 2 +- admin/models/forms/admin_view.xml | 9 + admin/models/forms/custom_admin_view.xml | 9 + admin/models/forms/custom_code.xml | 9 + admin/models/forms/dynamic_get.xml | 9 + admin/models/forms/field.js | 4 +- admin/models/forms/field.xml | 9 + admin/models/forms/fieldtype.xml | 9 + admin/models/forms/ftp.js | 4 +- admin/models/forms/ftp.xml | 9 + admin/models/forms/help_document.xml | 9 + admin/models/forms/joomla_component.js | 4 +- admin/models/forms/language.xml | 9 + admin/models/forms/language_translation.xml | 9 + admin/models/forms/layout.xml | 9 + admin/models/forms/site_view.xml | 9 + admin/models/forms/snippet.xml | 9 + admin/models/forms/template.xml | 9 + admin/models/ftp.php | 4 +- admin/models/ftps.php | 25 +- admin/models/help_documents.php | 21 + admin/models/import.php | 2 +- admin/models/import_joomla_components.php | 610 ++++++++++-------- admin/models/joomla_component.php | 64 +- admin/models/joomla_components.php | 4 +- admin/models/language_translations.php | 21 + admin/models/languages.php | 21 + admin/models/layouts.php | 21 + admin/models/site_views.php | 21 + admin/models/snippets.php | 21 + admin/models/templates.php | 21 + admin/sql/install.mysql.utf8.sql | 58 +- admin/tables/admin_fields.php | 4 +- admin/tables/admin_fields_conditions.php | 2 +- admin/tables/admin_view.php | 2 +- admin/tables/field.php | 4 +- admin/tables/ftp.php | 4 +- admin/tables/joomla_component.php | 4 +- admin/views/admin_fields/submitbutton.js | 4 +- admin/views/admin_fields/tmpl/edit.php | 4 +- admin/views/admin_fields/view.html.php | 4 +- .../admin_fields_conditions/submitbutton.js | 2 +- .../admin_fields_conditions/tmpl/edit.php | 2 +- .../admin_fields_conditions/view.html.php | 2 +- admin/views/admin_view/submitbutton.js | 2 +- admin/views/admin_view/tmpl/edit.php | 2 +- admin/views/admin_view/view.html.php | 2 +- admin/views/admin_views/tmpl/default.php | 2 +- .../admin_views/tmpl/default_batch_body.php | 2 +- .../admin_views/tmpl/default_batch_footer.php | 2 +- admin/views/admin_views/tmpl/default_body.php | 2 +- admin/views/admin_views/tmpl/default_foot.php | 2 +- admin/views/admin_views/tmpl/default_head.php | 2 +- .../admin_views/tmpl/default_toolbar.php | 2 +- admin/views/admin_views/view.html.php | 2 +- admin/views/admins_fields/tmpl/default.php | 4 +- .../admins_fields/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/admins_fields/tmpl/default_body.php | 4 +- .../views/admins_fields/tmpl/default_foot.php | 4 +- .../views/admins_fields/tmpl/default_head.php | 4 +- .../admins_fields/tmpl/default_toolbar.php | 4 +- admin/views/admins_fields/view.html.php | 4 +- .../admins_fields_conditions/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../tmpl/default_body.php | 2 +- .../tmpl/default_foot.php | 2 +- .../tmpl/default_head.php | 2 +- .../tmpl/default_toolbar.php | 2 +- .../admins_fields_conditions/view.html.php | 2 +- admin/views/componentbuilder/tmpl/default.php | 2 +- ...ult_issues_the_closed_issues_on_github.php | 2 +- ...fault_issues_the_open_issues_on_github.php | 2 +- .../componentbuilder/tmpl/default_main.php | 2 +- .../tmpl/default_readme_information.php | 2 +- .../tmpl/default_releases_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../componentbuilder/tmpl/default_vdm.php | 2 +- .../tmpl/default_wiki_tutorials.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/field/submitbutton.js | 4 +- admin/views/field/tmpl/edit.php | 4 +- admin/views/field/view.html.php | 4 +- admin/views/fields/tmpl/default.php | 4 +- .../views/fields/tmpl/default_batch_body.php | 4 +- .../fields/tmpl/default_batch_footer.php | 4 +- admin/views/fields/tmpl/default_body.php | 4 +- admin/views/fields/tmpl/default_foot.php | 4 +- admin/views/fields/tmpl/default_head.php | 4 +- admin/views/fields/tmpl/default_toolbar.php | 4 +- admin/views/fields/view.html.php | 4 +- admin/views/ftp/submitbutton.js | 4 +- admin/views/ftp/tmpl/edit.php | 4 +- admin/views/ftp/view.html.php | 4 +- admin/views/ftps/tmpl/default.php | 4 +- admin/views/ftps/tmpl/default_batch_body.php | 4 +- .../views/ftps/tmpl/default_batch_footer.php | 4 +- admin/views/ftps/tmpl/default_body.php | 4 +- admin/views/ftps/tmpl/default_foot.php | 4 +- admin/views/ftps/tmpl/default_head.php | 4 +- admin/views/ftps/tmpl/default_toolbar.php | 4 +- admin/views/ftps/view.html.php | 4 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- .../import_joomla_components/tmpl/default.php | 2 +- .../import_joomla_components/view.html.php | 2 +- admin/views/joomla_component/submitbutton.js | 4 +- admin/views/joomla_component/tmpl/edit.php | 4 +- admin/views/joomla_component/view.html.php | 4 +- .../views/joomla_components/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../joomla_components/tmpl/default_body.php | 4 +- .../joomla_components/tmpl/default_foot.php | 4 +- .../joomla_components/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/joomla_components/view.html.php | 4 +- componentbuilder.xml | 4 +- script.php | 164 ++--- site/assets/css/site.css | 2 +- site/assets/js/site.js | 2 +- site/componentbuilder.php | 2 +- site/controller.php | 2 +- site/controllers/api.php | 2 +- site/controllers/help.php | 2 +- site/helpers/category.php | 2 +- site/helpers/categoryfields.php | 2 +- site/helpers/categoryfieldtypes.php | 2 +- site/helpers/componentbuilder.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- site/router.php | 2 +- site/views/api/submitbutton.js | 2 +- 367 files changed, 1486 insertions(+), 796 deletions(-) diff --git a/README.md b/README.md index 1521cbee6..8b29db15c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder ![Component Builder image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/vdm-component.jpg "The Component Builder") -The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) that is highly advanced, truly able to build extremely complex components in a fraction of the time. +The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time. Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! @@ -110,11 +110,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 16th October, 2017 ++ *Last Build*: 18th October, 2017 + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **125041** ++ *Line count*: **125731** + *File count*: **742** + *Folder count*: **129** diff --git a/admin/README.txt b/admin/README.txt index 1521cbee6..8b29db15c 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -5,7 +5,7 @@ This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder ![Component Builder image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/vdm-component.jpg "The Component Builder") -The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) that is highly advanced, truly able to build extremely complex components in a fraction of the time. +The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time. Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! @@ -110,11 +110,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 16th October, 2017 ++ *Last Build*: 18th October, 2017 + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **125041** ++ *Line count*: **125731** + *File count*: **742** + *Folder count*: **129** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 86d3c0598..d40af0500 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_fields.css b/admin/assets/css/admin_fields.css index 81d4bbf96..6d27b7d74 100644 --- a/admin/assets/css/admin_fields.css +++ b/admin/assets/css/admin_fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.css diff --git a/admin/assets/css/admin_fields_conditions.css b/admin/assets/css/admin_fields_conditions.css index 7d5103893..480e4cd30 100644 --- a/admin/assets/css/admin_fields_conditions.css +++ b/admin/assets/css/admin_fields_conditions.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index e553237fe..297130ece 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index f91594a9b..0d32c4016 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/admins_fields.css b/admin/assets/css/admins_fields.css index e08da91df..6509e2410 100644 --- a/admin/assets/css/admins_fields.css +++ b/admin/assets/css/admins_fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.css diff --git a/admin/assets/css/admins_fields_conditions.css b/admin/assets/css/admins_fields_conditions.css index 3e1e743ef..1c56a1ca3 100644 --- a/admin/assets/css/admins_fields_conditions.css +++ b/admin/assets/css/admins_fields_conditions.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 90c212fdd..bd4174456 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/field.css b/admin/assets/css/field.css index 8d04aefaf..475a1a58d 100644 --- a/admin/assets/css/field.css +++ b/admin/assets/css/field.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.css diff --git a/admin/assets/css/fields.css b/admin/assets/css/fields.css index 52ca1ec11..a4bd0d41b 100644 --- a/admin/assets/css/fields.css +++ b/admin/assets/css/fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.css diff --git a/admin/assets/css/ftp.css b/admin/assets/css/ftp.css index aa5b07198..9584a45fd 100644 --- a/admin/assets/css/ftp.css +++ b/admin/assets/css/ftp.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage ftp.css diff --git a/admin/assets/css/ftps.css b/admin/assets/css/ftps.css index 8e597f403..0578cdc23 100644 --- a/admin/assets/css/ftps.css +++ b/admin/assets/css/ftps.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage ftps.css diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index 755b4f9c3..4e81ea98e 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.css diff --git a/admin/assets/css/joomla_components.css b/admin/assets/css/joomla_components.css index 51748cd2b..ad88aa789 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index 54976319b..fd3b3493e 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.js diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 19ff6612c..4cb07f498 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index be749b646..8dea4a695 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_fields.php b/admin/controllers/admin_fields.php index 088f2be59..d5bc469b6 100644 --- a/admin/controllers/admin_fields.php +++ b/admin/controllers/admin_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php diff --git a/admin/controllers/admin_fields_conditions.php b/admin/controllers/admin_fields_conditions.php index 737bc1bde..8d4156209 100644 --- a/admin/controllers/admin_fields_conditions.php +++ b/admin/controllers/admin_fields_conditions.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 019bd779b..cbd3e05ba 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index d9b294506..01b6a263c 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/admins_fields.php b/admin/controllers/admins_fields.php index 618064aa3..d50e85990 100644 --- a/admin/controllers/admins_fields.php +++ b/admin/controllers/admins_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.php diff --git a/admin/controllers/admins_fields_conditions.php b/admin/controllers/admins_fields_conditions.php index 7d7ad1644..eff76ef36 100644 --- a/admin/controllers/admins_fields_conditions.php +++ b/admin/controllers/admins_fields_conditions.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 7bc924d85..8f3faa2c4 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 402088266..9d0432ac6 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/field.php b/admin/controllers/field.php index 7a8c3c828..b3d4c57cd 100644 --- a/admin/controllers/field.php +++ b/admin/controllers/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index e965dde8c..cf0526115 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/controllers/ftp.php b/admin/controllers/ftp.php index e27df64cc..eb1a1b4a0 100644 --- a/admin/controllers/ftp.php +++ b/admin/controllers/ftp.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage ftp.php diff --git a/admin/controllers/ftps.php b/admin/controllers/ftps.php index 9cc9583ec..398d1b67b 100644 --- a/admin/controllers/ftps.php +++ b/admin/controllers/ftps.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage ftps.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 32d206ac2..c04591f67 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index d3070ecd2..ae3b0d585 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index d827f8a21..9ba5ea2db 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index 1e29e0033..7e8f2a8e7 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index 22034d710..19f85a8ed 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index b3c7ccf4a..0573cce2b 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -1953,7 +1953,7 @@ class Get $field->xml = $this->setDynamicValues(json_decode($field->xml)); // load the type values form type params - $properties = json_decode($field->properties,true); + $properties = json_decode($field->properties, true); // check what type of field array we have here (should be subform... but just incase) // This could happen due to huge data sets if (isset($properties['name'])) diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index c977dbd8c..8f806661a 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index 7aeb6c2f6..dff973ffb 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilderemail.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 42aa47aa5..fda934257 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 47f95d6e0..a867826ec 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 2c37c7073..efd1ebc21 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index a1a640fca..eec7ea1d1 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index f13211b88..6c1f3addb 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 144dc1381..1fe68482e 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -863,12 +863,11 @@ COM_COMPONENTBUILDER_BCUSTOM_FILESB_NOT_MOVE_TO_CORRECT_LOCATION="Custom file COM_COMPONENTBUILDER_BCUSTOM_GET_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BDYNAMIC_GETB_SO_THE_IDS_WAS_REMOVED="Custom get in %s has id mismatch of selected dynamic get. So the id:%s was removed!" COM_COMPONENTBUILDER_BDYNAMIC_GETB_IDS_MISMATCH_IN_BSB="Dynamic get id:%s mismatch in %s." COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE="Be cautious! Do not continue unless you trust the origin of this package!" +COM_COMPONENTBUILDER_BFIELD_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED="Field in %s has id mismatch of selected admin view. So the id:%s was removed!" COM_COMPONENTBUILDER_BFIELD_TYPEB_IDS_MISMATCH_IN_BSB="Field type id:%s mismatch in %s." COM_COMPONENTBUILDER_BFIELD_TYPEB_NOT_SET_FOR_BSB="Field type not set for %s." COM_COMPONENTBUILDER_BGET_THE_KEY_FROMB_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA="Get the key from %s" COM_COMPONENTBUILDER_BIMAGESB_NOT_MOVE_TO_CORRECT_LOCATION="Images not move to correct location!" -COM_COMPONENTBUILDER_BJOIN_VIEW_TABLE_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BJOIN_VIEW_TABLEB_SO_THE_IDS_WAS_REMOVED="Join view table in %s has id mismatch of selected join view table. So the id:%s was removed!" -COM_COMPONENTBUILDER_BLINKED_VIEWB_IDS_MISMATCH_IN_BADMIN_VIEWSB_AND_WAS_EMREMOVEDEM_FROM_THE_LINKED_VIEWS="Linked view id:%s mismatch in admin view:%s, and was removed from the linked views." COM_COMPONENTBUILDER_BMAIN_GETB_IDS_MISMATCH_IN_BSB="Main get id:%s mismatch in %s." COM_COMPONENTBUILDER_BMAIN_GETB_NOT_SET_FOR_BSB="Main get not set for %s." COM_COMPONENTBUILDER_BREPEATABLEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD="Repeatable id:%s mismatch in field:%s, and was removed from the field." diff --git a/admin/layouts/admin_fields/fields_above.php b/admin/layouts/admin_fields/fields_above.php index a98a54b2a..99c1e6aa7 100644 --- a/admin/layouts/admin_fields/fields_above.php +++ b/admin/layouts/admin_fields/fields_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_above.php diff --git a/admin/layouts/admin_fields/fields_fullwidth.php b/admin/layouts/admin_fields/fields_fullwidth.php index ea49ca88a..45b638211 100644 --- a/admin/layouts/admin_fields/fields_fullwidth.php +++ b/admin/layouts/admin_fields/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_fields/publishing.php b/admin/layouts/admin_fields/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/admin_fields/publishing.php +++ b/admin/layouts/admin_fields/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields/publlshing.php b/admin/layouts/admin_fields/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/admin_fields/publlshing.php +++ b/admin/layouts/admin_fields/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/admin_fields_conditions/conditions_above.php b/admin/layouts/admin_fields_conditions/conditions_above.php index d2ab000db..913d8aa96 100644 --- a/admin/layouts/admin_fields_conditions/conditions_above.php +++ b/admin/layouts/admin_fields_conditions/conditions_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_above.php diff --git a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php index 5e70aaf37..b838137d1 100644 --- a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php +++ b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_fullwidth.php diff --git a/admin/layouts/admin_fields_conditions/publishing.php b/admin/layouts/admin_fields_conditions/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/admin_fields_conditions/publishing.php +++ b/admin/layouts/admin_fields_conditions/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields_conditions/publlshing.php b/admin/layouts/admin_fields_conditions/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/admin_fields_conditions/publlshing.php +++ b/admin/layouts/admin_fields_conditions/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 400e234ea..b31527ac6 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php index edcd4a546..32182a945 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index bcd5c437f..5140fe1eb 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index d60f7e095..fc256068d 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/details_above.php b/admin/layouts/admin_view/details_above.php index b85da93b3..3f0d3cf5f 100644 --- a/admin/layouts/admin_view/details_above.php +++ b/admin/layouts/admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/admin_view/details_left.php b/admin/layouts/admin_view/details_left.php index 1b5c987aa..5594a83fa 100644 --- a/admin/layouts/admin_view/details_left.php +++ b/admin/layouts/admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/admin_view/details_right.php b/admin/layouts/admin_view/details_right.php index 888bbc489..57269517c 100644 --- a/admin/layouts/admin_view/details_right.php +++ b/admin/layouts/admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/admin_view/details_under.php b/admin/layouts/admin_view/details_under.php index ea92c01f4..889420ac1 100644 --- a/admin/layouts/admin_view/details_under.php +++ b/admin/layouts/admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/admin_view/fields_conditions_fullwidth.php b/admin/layouts/admin_view/fields_conditions_fullwidth.php index 64f216a4e..4721808b4 100644 --- a/admin/layouts/admin_view/fields_conditions_fullwidth.php +++ b/admin/layouts/admin_view/fields_conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_fullwidth.php diff --git a/admin/layouts/admin_view/fields_conditions_left.php b/admin/layouts/admin_view/fields_conditions_left.php index f7ec97b95..4a8369360 100644 --- a/admin/layouts/admin_view/fields_conditions_left.php +++ b/admin/layouts/admin_view/fields_conditions_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_left.php diff --git a/admin/layouts/admin_view/fields_conditions_right.php b/admin/layouts/admin_view/fields_conditions_right.php index a206c9e30..1b398833c 100644 --- a/admin/layouts/admin_view/fields_conditions_right.php +++ b/admin/layouts/admin_view/fields_conditions_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_right.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 8f6ff5daa..26bf0bcf2 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php index 096b32af7..f51512ab9 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index a953c3bc7..9e1ce3c36 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index eb3e2e09b..ab6fe7518 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index 4ccd61dcf..96d96c163 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/admin_view/settings_fullwidth.php b/admin/layouts/admin_view/settings_fullwidth.php index 16a51bff2..20a1397fa 100644 --- a/admin/layouts/admin_view/settings_fullwidth.php +++ b/admin/layouts/admin_view/settings_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_fullwidth.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 9adeb80a5..215533f39 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index cb9f60100..0ce7624d4 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index bcd5c437f..5140fe1eb 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index d01fb589a..78cc790a9 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index b85da93b3..3f0d3cf5f 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index d56795422..1249082a5 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index 352a1a309..b9627de85 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index a192f1233..709b247ea 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index 8a1038e23..a4e820159 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index ea92c01f4..889420ac1 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index 307d0d545..c949bc189 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index 4a20f9ed2..d765da109 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index 91a377bc4..b961095e9 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index 5f1706124..d27972f4c 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index 2194e4579..bd88cd8d8 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php index ea92c01f4..889420ac1 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index 9e7fd9fe5..9667a78c9 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index 858f7fc22..787910eea 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index a3e4274c2..7930df713 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/joint_fullwidth.php b/admin/layouts/dynamic_get/joint_fullwidth.php index f13787041..12f29a181 100644 --- a/admin/layouts/dynamic_get/joint_fullwidth.php +++ b/admin/layouts/dynamic_get/joint_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage joint_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_above.php b/admin/layouts/dynamic_get/main_above.php index 8e926e5dc..961a49c79 100644 --- a/admin/layouts/dynamic_get/main_above.php +++ b/admin/layouts/dynamic_get/main_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_above.php diff --git a/admin/layouts/dynamic_get/main_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php index f1250e58d..adba39823 100644 --- a/admin/layouts/dynamic_get/main_fullwidth.php +++ b/admin/layouts/dynamic_get/main_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_left.php b/admin/layouts/dynamic_get/main_left.php index 0e38bf71b..ca665cf03 100644 --- a/admin/layouts/dynamic_get/main_left.php +++ b/admin/layouts/dynamic_get/main_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_left.php diff --git a/admin/layouts/dynamic_get/main_right.php b/admin/layouts/dynamic_get/main_right.php index 9d81d7433..360932843 100644 --- a/admin/layouts/dynamic_get/main_right.php +++ b/admin/layouts/dynamic_get/main_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_right.php diff --git a/admin/layouts/dynamic_get/main_under.php b/admin/layouts/dynamic_get/main_under.php index 295bb6ea0..a89f15030 100644 --- a/admin/layouts/dynamic_get/main_under.php +++ b/admin/layouts/dynamic_get/main_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index d55f2a213..9ee3eb8e7 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index dbc63418f..1cfb02f0b 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index a600913df..7f6781020 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index ea92c01f4..889420ac1 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index 7f3fc62d8..67e79798e 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index 4bd80d0fc..50337b63c 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_fullwidth.php b/admin/layouts/fieldtype/details_fullwidth.php index 7122809ed..82d15dd76 100644 --- a/admin/layouts/fieldtype/details_fullwidth.php +++ b/admin/layouts/fieldtype/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 5fe5760da..9227835c0 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index 59ac1032b..5dbbc4049 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 656817d37..0b0d7e544 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/ftp/details_above.php b/admin/layouts/ftp/details_above.php index 068f3ea4a..1a0e4d787 100644 --- a/admin/layouts/ftp/details_above.php +++ b/admin/layouts/ftp/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/ftp/details_fullwidth.php b/admin/layouts/ftp/details_fullwidth.php index 581f207d3..1cb2131d7 100644 --- a/admin/layouts/ftp/details_fullwidth.php +++ b/admin/layouts/ftp/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index 6efde53d5..b15977a4c 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/ftp/publishing.php b/admin/layouts/ftp/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/ftp/publishing.php +++ b/admin/layouts/ftp/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/ftp/publlshing.php b/admin/layouts/ftp/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/ftp/publlshing.php +++ b/admin/layouts/ftp/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 28cb261ef..c2054f3af 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 1eaafe7c2..5fd45c230 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 85188c4b3..f2b12ed4e 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 1fa6cf18f..d559e943a 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index ea92c01f4..889420ac1 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php index f6a86ae09..20f8c31da 100644 --- a/admin/layouts/joomla_component/admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index cbb71cc4a..4dc374cf3 100644 --- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index b85da93b3..3f0d3cf5f 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index 1b5a90bec..a554d1acb 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index 6bfa9c2ca..7e7571990 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php index ea92c01f4..889420ac1 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php index 4bff1f4e7..ba3fbcbab 100644 --- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index 8df11d0bc..a5c2ab8fe 100644 --- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php index 1752a24cf..8006650fb 100644 --- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php +++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/metadata.php b/admin/layouts/joomla_component/metadata.php index 8b76e02de..e4fbf9487 100644 --- a/admin/layouts/joomla_component/metadata.php +++ b/admin/layouts/joomla_component/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage metadata.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index dafda1657..6751d3424 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php index 5fb5bea06..64355465d 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php index be8261d6c..7a82c1c75 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index 4bb8118df..944d41330 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php index 57c6e7f3e..661d3e022 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php index 159c3c415..c9b474957 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index 531ccf392..264d3dce0 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index 5225483da..49b290bd5 100644 --- a/admin/layouts/joomla_component/site_views_fullwidth.php +++ b/admin/layouts/joomla_component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php index 1ca723bb4..f2c3317d2 100644 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ b/admin/layouts/joomla_component/translation_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage translation_fullwidth.php diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index 1b401f88e..d69ac871d 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php index 0b6dfc500..af652e5f5 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/language_translation/details_above.php b/admin/layouts/language_translation/details_above.php index 64f692141..77ebff8e1 100644 --- a/admin/layouts/language_translation/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php index fa965d14d..e87180fef 100644 --- a/admin/layouts/language_translation/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/language_translation/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/language_translation/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index 69eff67fc..d77820355 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index cf6627d30..8fe98ce36 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index 43b8c3d10..7c7cf9e46 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index f8a34e2e3..fdf234cbb 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index f1e716017..f40f46d70 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index ea92c01f4..889420ac1 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index 15de944b6..aa27bef37 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php index cd0e689c8..353e66db0 100644 --- a/admin/layouts/site_view/custom_buttons_left.php +++ b/admin/layouts/site_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php index cc983055a..cdabf8dab 100644 --- a/admin/layouts/site_view/custom_buttons_right.php +++ b/admin/layouts/site_view/custom_buttons_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_right.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index b85da93b3..3f0d3cf5f 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index d56795422..1249082a5 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index 352a1a309..b9627de85 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index f8a34e2e3..fdf234cbb 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index 8a1038e23..a4e820159 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index ea92c01f4..889420ac1 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index 979cfb4f7..784418553 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index 96e7a2f5a..eb6f25487 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 9b5f809f0..fa49bcd45 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index 59a7caef3..e63a33228 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index 459d807fd..5ee6b611e 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index 73535e8de..5e2fc19ca 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index 69eff67fc..d77820355 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index 386616ba1..7e8b67097 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index 43b8c3d10..7c7cf9e46 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index f8a34e2e3..fdf234cbb 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index f1e716017..f40f46d70 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index ea92c01f4..889420ac1 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index bde3173d1..49a10da7c 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index f2d7bf8f8..2e7948dc2 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php @@ -33,6 +33,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'published', 'ordering', + 'access', 'version', 'hits', 'id' diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php index def35d2a7..6578a1abb 100644 --- a/admin/models/admin_fields.php +++ b/admin/models/admin_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php index 4ce274096..5cad61656 100644 --- a/admin/models/admin_fields_conditions.php +++ b/admin/models/admin_fields_conditions.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 415be340d..5878e6f11 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 3658ee9d0..e97139cac 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder @@ -165,6 +165,21 @@ class ComponentbuilderModelAdmin_views extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -216,6 +231,12 @@ class ComponentbuilderModelAdmin_views extends JModelList // From the componentbuilder_admin_view table $query->from($db->quoteName('#__componentbuilder_admin_view', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/admins_fields.php b/admin/models/admins_fields.php index 95c44ffdb..c87b2bfa0 100644 --- a/admin/models/admins_fields.php +++ b/admin/models/admins_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.php @@ -156,6 +156,21 @@ class ComponentbuilderModelAdmins_fields extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + // Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); diff --git a/admin/models/admins_fields_conditions.php b/admin/models/admins_fields_conditions.php index 00a94665d..72ea7266c 100644 --- a/admin/models/admins_fields_conditions.php +++ b/admin/models/admins_fields_conditions.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @@ -156,6 +156,21 @@ class ComponentbuilderModelAdmins_fields_conditions extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + // Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); diff --git a/admin/models/ajax.php b/admin/models/ajax.php index e9f4c7715..b42fbc32c 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 5cc2bc735..afe2e4d49 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index 7fba5bc30..ba7015b95 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -169,6 +169,21 @@ class ComponentbuilderModelCustom_admin_views extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -220,6 +235,12 @@ class ComponentbuilderModelCustom_admin_views extends JModelList // From the componentbuilder_custom_admin_view table $query->from($db->quoteName('#__componentbuilder_custom_admin_view', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/custom_codes.php b/admin/models/custom_codes.php index 3d8129746..34fe22303 100644 --- a/admin/models/custom_codes.php +++ b/admin/models/custom_codes.php @@ -254,6 +254,21 @@ class ComponentbuilderModelCustom_codes extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -325,6 +340,12 @@ class ComponentbuilderModelCustom_codes extends JModelList // From the componentbuilder_custom_code table $query->from($db->quoteName('#__componentbuilder_custom_code', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php index 9cef64809..6c07983eb 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -214,6 +214,21 @@ class ComponentbuilderModelDynamic_gets extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -275,6 +290,12 @@ class ComponentbuilderModelDynamic_gets extends JModelList // From the componentbuilder_dynamic_get table $query->from($db->quoteName('#__componentbuilder_dynamic_get', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/field.php b/admin/models/field.php index f9485479c..9a63f570c 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/models/fields.php b/admin/models/fields.php index 7f06213d1..cc5717896 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php @@ -286,6 +286,21 @@ class ComponentbuilderModelFields extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -384,6 +399,12 @@ class ComponentbuilderModelFields extends JModelList // From the componentbuilder_field table $query->from($db->quoteName('#__componentbuilder_field', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index f0548b3b8..77f3a9749 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 3b9bcbd1b..6ac5ba989 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 8d8e1c883..67e9c86bf 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index 1d7ab26f4..f76f01deb 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php index 658024363..89a695c53 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index dfb10d6ee..9d3f8bee9 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index 24feb4fba..2bf7bc6ce 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 81463c4d6..0af3853e9 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index dbb5db6ed..d561ff363 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index e8f47552e..370071deb 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php index 09a6bda33..4f53d0d01 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicget.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index c86710473..2e29a5392 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index c67a428b5..4cfe4f1b9 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 44ec29f46..86af29bb7 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/ftps.php b/admin/models/fields/ftps.php index 77483e34a..09bcdd966 100644 --- a/admin/models/fields/ftps.php +++ b/admin/models/fields/ftps.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ftps.php diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php index d21ff672f..fd352cce7 100644 --- a/admin/models/fields/lang.php +++ b/admin/models/fields/lang.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage lang.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 3f69452ac..c32c1747f 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/matchfield.php b/admin/models/fields/matchfield.php index dc973b775..d9e06f843 100644 --- a/admin/models/fields/matchfield.php +++ b/admin/models/fields/matchfield.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage matchfield.php @@ -160,22 +160,28 @@ class JFormFieldMatchfield extends JFormFieldList if (is_numeric($ID) && $ID >= 1) { // get the admin view ID - if ($adminView = ComponentbuilderHelper::getVar('admin_fields_conditions', (int) $ID, 'id', 'admin_view')) + $adminView = ComponentbuilderHelper::getVar('admin_fields_conditions', (int) $ID, 'id', 'admin_view'); + } + else + { + // get the admin view ID + $adminView = $jinput->getInt('refid', 0); + } + if (is_numeric($adminView) && $adminView >= 1) + { + // get all the fields linked to the admin view + if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields')) { - // get all the fields linked to the admin view - if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields')) + if (ComponentbuilderHelper::checkJson($addFields)) { - if (ComponentbuilderHelper::checkJson($addFields)) + $addFields = json_decode($addFields, true); + if (ComponentbuilderHelper::checkArray($addFields)) { - $addFields = json_decode($addFields, true); - if (ComponentbuilderHelper::checkArray($addFields)) + foreach($addFields as $addField) { - foreach($addFields as $addField) + if (isset($addField['field'])) { - if (isset($addField['field'])) - { - $fieldIds[] = (int) $addField['field']; - } + $fieldIds[] = (int) $addField['field']; } } } diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index b1f01f305..6caeef95b 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index 5229f2ca1..a4fd6d283 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index b19a0ee79..d05fb9add 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fields/targetfields.php b/admin/models/fields/targetfields.php index 7275291ae..a7665e834 100644 --- a/admin/models/fields/targetfields.php +++ b/admin/models/fields/targetfields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage targetfields.php @@ -160,22 +160,28 @@ class JFormFieldTargetfields extends JFormFieldList if (is_numeric($ID) && $ID >= 1) { // get the admin view ID - if ($adminView = ComponentbuilderHelper::getVar('admin_fields_conditions', (int) $ID, 'id', 'admin_view')) + $adminView = ComponentbuilderHelper::getVar('admin_fields_conditions', (int) $ID, 'id', 'admin_view'); + } + else + { + // get the admin view ID + $adminView = $jinput->getInt('refid', 0); + } + if (is_numeric($adminView) && $adminView >= 1) + { + // get all the fields linked to the admin view + if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields')) { - // get all the fields linked to the admin view - if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields')) + if (ComponentbuilderHelper::checkJson($addFields)) { - if (ComponentbuilderHelper::checkJson($addFields)) + $addFields = json_decode($addFields, true); + if (ComponentbuilderHelper::checkArray($addFields)) { - $addFields = json_decode($addFields, true); - if (ComponentbuilderHelper::checkArray($addFields)) + foreach($addFields as $addField) { - foreach($addFields as $addField) + if (isset($addField['field'])) { - if (isset($addField['field'])) - { - $fieldIds[] = (int) $addField['field']; - } + $fieldIds[] = (int) $addField['field']; } } } diff --git a/admin/models/fields/viewtabs.php b/admin/models/fields/viewtabs.php index 6280f030e..bbd258cdf 100644 --- a/admin/models/fields/viewtabs.php +++ b/admin/models/fields/viewtabs.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage viewtabs.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 43e0c2e5a..83026ce2d 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -174,6 +174,21 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $query->where('a.fieldtype = -5'); } + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + // Order the results by ordering $query->order('a.published ASC'); $query->order('a.ordering ASC'); diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php index 405093912..96f3186ed 100644 --- a/admin/models/fieldtypes.php +++ b/admin/models/fieldtypes.php @@ -171,6 +171,21 @@ class ComponentbuilderModelFieldtypes extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -244,6 +259,12 @@ class ComponentbuilderModelFieldtypes extends JModelList // From the componentbuilder_fieldtype table $query->from($db->quoteName('#__componentbuilder_fieldtype', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/forms/admin_fields.js b/admin/models/forms/admin_fields.js index ea2d1d463..f132f8860 100644 --- a/admin/models/forms/admin_fields.js +++ b/admin/models/forms/admin_fields.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.js diff --git a/admin/models/forms/admin_fields.xml b/admin/models/forms/admin_fields.xml index 9aa2bbc66..c161bc2d3 100644 --- a/admin/models/forms/admin_fields.xml +++ b/admin/models/forms/admin_fields.xml @@ -57,6 +57,15 @@ readonly="true" filter="unset" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -209,6 +224,12 @@ class ComponentbuilderModelFtps extends JModelList // From the componentbuilder_ftp table $query->from($db->quoteName('#__componentbuilder_ftp', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 76cc18fdd..507d2fcdb 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -240,6 +240,21 @@ class ComponentbuilderModelHelp_documents extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -311,6 +326,12 @@ class ComponentbuilderModelHelp_documents extends JModelList // From the componentbuilder_help_document table $query->from($db->quoteName('#__componentbuilder_help_document', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/import.php b/admin/models/import.php index 968c525e7..cb7b7583e 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index cca027d0b..94d54f3a3 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php @@ -81,15 +81,16 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } protected $app; - protected $target = false; - protected $newID = array(); - protected $forceUpdate = 0; - protected $hasKey = 0; - protected $sleutle = null; - protected $updateAfter = array('field' => array(), 'adminview' => array()); - protected $fieldTypes = array(); - protected $isMultiple = array(); - protected $specialValue = false; + protected $target = false; + protected $newID = array(); + protected $forceUpdate = 0; + protected $hasKey = 0; + protected $sleutle = null; + protected $updateAfter = array('field' => array(), 'adminview' => array()); + protected $divergedDataMover = array(); + protected $fieldTypes = array(); + protected $isMultiple = array(); + protected $specialValue = false; /** * Import an spreadsheet from either folder, url or upload. @@ -716,6 +717,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } // do a after all run on all items that need it $this->updateAfter(); + // finally move the old datasets + $this->moveDivergedData(); // lets move all the files to its correct location if (!$this->moveSmartStuff($dir)) { @@ -991,31 +994,53 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } // get the field from db if ($addlinked_views = ComponentbuilderHelper::getVar('admin_view', $adminview, 'id', 'addlinked_views')) - { + { if (ComponentbuilderHelper::checkJson($addlinked_views)) { $addlinked_views = json_decode($addlinked_views, true); - if (ComponentbuilderHelper::checkArray($addlinked_views['adminview'])) + // convert Repetable Fields + if (ComponentbuilderHelper::checkArray($addlinked_views) && isset($addlinked_views['adminview'])) { - foreach ($addlinked_views['adminview'] as $nr => $admin) - { - if (isset($this->newID['admin_view'][$admin])) - { - $addlinked_views['adminview'][$nr] = $this->newID['admin_view'][$admin]; - } - else - { - $addlinked_views['adminview'][$nr] = ''; - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BLINKED_VIEWB_IDS_MISMATCH_IN_BADMIN_VIEWSB_AND_WAS_EMREMOVEDEM_FROM_THE_LINKED_VIEWS', $admin, $adminview), 'warning'); - } - } - // update the fields - $object = new stdClass; - $object->id = $adminview; - $object->addlinked_views = json_encode($addlinked_views); - // update the admin view - $this->_db->updateObject('#__componentbuilder_admin_view', $object, 'id'); + $addlinked_views = $this->convertRepeatable($addlinked_views, 'addlinked_views'); } + // update the view IDs + if (ComponentbuilderHelper::checkArray($addlinked_views)) + { + // only update the view IDs + $addlinked_views = $this->updateSubformIDs($addlinked_views, 'admin_view', array('adminview' => 'admin_view')); + } + // update the fields + $object = new stdClass; + $object->id = $adminview; + $object->addlinked_views = json_encode($addlinked_views); + // update the admin view + $this->_db->updateObject('#__componentbuilder_admin_view', $object, 'id'); + } + } + } + } + } + + /** + * Moving of diverged data + * + * @return void + * + **/ + protected function moveDivergedData() + { + // check if there is data to move + if (ComponentbuilderHelper::checkArray($this->divergedDataMover)) + { + foreach($this->divergedDataMover as $table => $values) + { + foreach($values as $value) + { + // first check if exist (only add if it does not) + if (!$this->getLocalItem($value, $table, 1)) + { + // add the diverged data + $this->addLocalItem($value, $table); } } } @@ -1025,8 +1050,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy /* * Convert repeatable field to subform * - * @param array $array The array - * @param string $name The main field name + * @param array $array The array to convert + * @param string $name The main field name + * @param array $updater The updater (dynamic) option * * @return array */ @@ -1047,6 +1073,138 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy return $bucket; } + /* + * Convert repeatable field to subform + * + * @param object $item The item to update + * @param json $updater The fields to check and update + * + * @return void + */ + protected function convertRepeatableFields(&$item, $updater) + { + // update the repeatable fields + foreach ($updater as $up => $sleutel) + { + if (isset($item->{$up}) && ComponentbuilderHelper::checkJson($item->{$up})) + { + $updateArray = json_decode($item->{$up}, true); + // check if this is old values for repeatable fields + if (ComponentbuilderHelper::checkArray($updateArray) && isset($updateArray[$sleutel])) + { + // load it back + $item->{$up} = json_encode($this->convertRepeatable($updateArray, $up)); + } + } + elseif (isset($item->{$up})) + { + unset($item->{$up}); + } + } + } + + /** + * Update Many Subform IDs + * + * @param array $values The values to update the IDs in + * @param string $table The table these values belong to + * @param array $targets The target to update and its type + * + * @return void + */ + protected function updateSubformsIDs(&$item, $table, $targets) + { + // update the repeatable fields + foreach ($targets as $field => $targetArray) + { + if (isset($item->{$field}) && ComponentbuilderHelper::checkJson($item->{$field})) + { + $updateArray = json_decode($item->{$field}, true); + if (ComponentbuilderHelper::checkArray($updateArray)) + { + // load it back + $item->{$field} = json_encode($this->updateSubformIDs($updateArray, $table, $targetArray)); + } + } + } + } + + /** + * Update One Subform IDs + * + * @param array $values The values to update the IDs in + * @param string $table The table these values belong to + * @param array $targets The target to update and its type + * + * @return void + */ + protected function updateSubformIDs($values, $table, $targets) + { + $isJson = false; + if (ComponentbuilderHelper::checkJson($values)) + { + $values = json_decode($values, true); + $isJson = true; + } + // now update the fields + if (ComponentbuilderHelper::checkArray($values)) + { + foreach ($values as $nr => &$value) + { + foreach ($targets as $target => $target_type) + { + if (isset($value[$target])) + { + // update the target + if (!ComponentbuilderHelper::checkArray($value[$target])) + { + if (isset($this->newID[$target_type][$value[$target]])) + { + $value[$target] = $this->newID[$target_type][$value[$target]]; + } + else + { + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED', ComponentbuilderHelper::safeString($target_type, 'Ww') . '->' . ComponentbuilderHelper::safeString($target, 'Ww') .' in ('.ComponentbuilderHelper::safeString($table, 'w').':'.$item->id.')', $value[$target]), 'warning'); + $value[$target] = ''; + } + } + elseif (ComponentbuilderHelper::checkArray($value[$target])) + { + // the bucket to load the items back + $bucket = array(); + foreach ($value[$target] as $id) + { + if (!is_numeric($id)) + { + continue; + } + if (isset($this->newID[$target_type][$id])) + { + $bucket[] = $this->newID[$target_type][$id]; + } + else + { + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED', ComponentbuilderHelper::safeString($target_type, 'Ww') . '->' . ComponentbuilderHelper::safeString($target, 'Ww') .' in ('.ComponentbuilderHelper::safeString($table, 'w').':'.$item->id.')', $id), 'warning'); + $bucket[] = ''; + } + } + // set ids back + if (ComponentbuilderHelper::checkArray($bucket)) + { + $value[$target] = $bucket; + } + } + } + } + } + } + if ($isJson) + { + return json_encode($values); + } + return $values; + } + /** * Prep the item * @@ -1076,6 +1234,15 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // do the id fix for the new ids switch($type) { + case 'fieldtype': + // repeatable fields to update + $updaterR = array( + // repeatablefield => checker + 'properties' => 'name' + ); + // update the repeatable fields + $this->convertRepeatableFields($item, $updaterR); + break; case 'field': // update the fieldtype if (isset($item->fieldtype) && is_numeric($item->fieldtype) && $item->fieldtype > 0 && isset($this->newID['fieldtype'][$item->fieldtype])) @@ -1112,42 +1279,10 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy return false; } } - // update the join_view_table - if (isset($item->join_view_table) && ComponentbuilderHelper::checkJson($item->join_view_table)) - { - $join_view_table = json_decode($item->join_view_table, true); - // check if this is old values for repeatable fields - if (isset($join_view_table['view_table'])) - { - $join_view_table = $this->convertRepeatable($join_view_table, 'join_view_table'); - } - foreach ($join_view_table as $nr => $join_values) - { - $id = $join_values['view_table']; - if (!is_numeric($id)) - { - continue; - } - // update the id's with local id's - if (isset($this->newID['admin_view'][$id])) - { - $join_view_table[$nr]['view_table'] = $this->newID['admin_view'][$id]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BJOIN_VIEW_TABLE_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BJOIN_VIEW_TABLEB_SO_THE_IDS_WAS_REMOVED', '('.ComponentbuilderHelper::safeString($type, 'w').':'.$item->id.')', $id), 'warning'); - $join_values['view_table'] = ''; - } - } - // load it back - $item->join_view_table = json_encode($join_view_table); - } - else - { - unset($item->join_view_table); - } // repeatable fields to update $updaterR = array( + // repeatablefield => checker + 'join_view_table' => 'view_table', 'join_db_table' => 'db_table', 'order' => 'table_key', 'where' => 'table_key', @@ -1155,24 +1290,14 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy 'filter' => 'filter_type' ); // update the repeatable fields - foreach ($updaterR as $up => $sleutel) - { - if (isset($item->{$up}) && ComponentbuilderHelper::checkJson($item->{$up})) - { - $updateArray = json_decode($item->{$up}, true); - // check if this is old values for repeatable fields - if (isset($updateArray[$sleutel])) - { - $updateArray = $this->convertRepeatable($updateArray, $up); - // load it back - $item->{$up} = json_encode($updateArray); - } - } - elseif (isset($item->{$up})) - { - unset($item->{$up}); - } - } + $this->convertRepeatableFields($item, $updaterR); + // subform fields to target + $updaterT = array( + // subformfield => field => type_value + 'join_view_table' => array('view_table' => 'admin_view') + ); + // update the subform ids + $this->updateSubformsIDs($item, 'dynamic_get', $updaterT); break; case 'layout': case 'template': @@ -1287,28 +1412,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } // repeatable fields to update $updaterR = array( + // repeatablefield => checker 'ajax_input' => 'value_name', 'custom_button' => 'name' ); - // update the repeatable fields - foreach ($updaterR as $up => $sleutel) - { - if (isset($item->{$up}) && ComponentbuilderHelper::checkJson($item->{$up})) - { - $updateArray = json_decode($item->{$up}, true); - // check if this is old values for repeatable fields - if (isset($updateArray[$sleutel])) - { - $updateArray = $this->convertRepeatable($updateArray, $up); - // load it back - $item->{$up} = json_encode($updateArray); - } - } - elseif (isset($item->{$up})) - { - unset($item->{$up}); - } - } + // update the repeatable fields + $this->convertRepeatableFields($item, $updaterR); break; case 'admin_view': // we must clear the demo content (since it was not moved as far as we know) TODO @@ -1322,16 +1431,14 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // update the addfields (old dataset) if (isset($item->addfields) && ComponentbuilderHelper::checkJson($item->addfields)) { - // set the targets - $targets = array('field' => 'field'); - // set the anchors - $anchor = array('admin_view' => $item->id); + // set the anchors getters + $getter = array('admin_view' => $item->id); // move the old data - $this->moveData($item->addfields, 'admin_fields', 'addfields', 'target_field', $targets, $anchor); + $this->setDivergedDataMover($item->addfields, 'admin_fields', 'addfields', $getter); // remove from this dataset unset($item->addfields); } - else + elseif (isset($item->addfields)) { unset($item->addfields); } @@ -1340,28 +1447,27 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy { $this->updateAfter['adminview'][$item->id] = $item->id; // addlinked_views } - else + elseif (isset($item->addlinked_views)) { unset($item->addlinked_views); } // update the addconditions (old dataset) - if (isset($item->addconditions)) + if (isset($item->addconditions) && ComponentbuilderHelper::checkJson($item->addconditions)) { - // set the targets - $targets = array('target_field' => 'field', 'match_field' => 'field'); - // set the anchors - $anchor = array('admin_view' => $item->id); + // set the getters anchors + $getter = array('admin_view' => $item->id); // move the old data - $this->moveData($item->addconditions, 'admin_fields_conditions', 'addconditions', 'target_field', $targets, $anchor); + $this->setDivergedDataMover($item->addconditions, 'admin_fields_conditions', 'addconditions', $getter); // remove from this dataset unset($item->addconditions); } - else + elseif (isset($item->addconditions)) { unset($item->addconditions); } // repeatable fields to update $updaterR = array( + // repeatablefield => checker 'ajax_input' => 'value_name', 'custom_button' => 'name', 'addtables' => 'table', @@ -1370,24 +1476,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy 'addpermissions' => 'action' ); // update the repeatable fields - foreach ($updaterR as $up => $sleutel) - { - if (isset($item->{$up}) && ComponentbuilderHelper::checkJson($item->{$up})) - { - $updateArray = json_decode($item->{$up}, true); - // check if this is old values for repeatable fields - if (isset($updateArray[$sleutel])) - { - $updateArray = $this->convertRepeatable($updateArray, $up); - // load it back - $item->{$up} = json_encode($updateArray); - } - } - elseif (isset($item->{$up})) - { - unset($item->{$up}); - } - } + $this->convertRepeatableFields($item, $updaterR); break; case 'joomla_component': // update the addconfig @@ -1633,6 +1722,58 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy unset($item->localTranslation); } break; + case 'admin_fields': + case 'admin_fields_conditions': + // update the admin_view ID where needed + if (isset($item->admin_view) && $item->admin_view > 0) + { + if (isset($this->newID['admin_view'][$item->admin_view])) + { + $item->admin_view = $this->newID['admin_view'][$item->admin_view]; + } + else + { + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BFIELD_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED', '('.ComponentbuilderHelper::safeString($type, 'w').':'.$item->id.')', $item->admin_view), 'warning'); + unset($item->admin_view); + } + } + if ('admin_fields' === $type) + { + // repeatable fields to update + $updaterR = array( + // repeatablefield => checker + 'addfields' => 'field' + ); + // subform fields to target + $updaterT = array( + // subformfield => field => type_value + 'addfields' => array('field' => 'field') + ); + // little tweak... oops + if (isset($item->addconditions)) + { + unset($item->addconditions); + } + } + else + { + // repeatable fields to update + $updaterR = array( + // repeatablefield => checker + 'addconditions' => 'target_field' + ); + // subform fields to target + $updaterT = array( + // subformfield => field => type_value + 'addconditions' => array('target_field' => 'field', 'match_field' => 'field') + ); + } + + // update the repeatable fields + $this->convertRepeatableFields($item, $updaterR); + + // update the subform ids + $this->updateSubformsIDs($item, $type, $updaterT); } // final action prep switch($action) @@ -1662,6 +1803,45 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy return false; } + /** + * Set the data that should be moved + * + * @param array/json $values The values/data to move + * @param string $table The table to move the values to + * @param string $type The type of values + * @param array $getters The get values used to anchor the values to the new table + * + * @return bool + */ + protected function setDivergedDataMover($values, $table, $type, $getters) + { + // we need to move this to the new $table based on anchors + if (ComponentbuilderHelper::checkArray($getters)) + { + if (!isset($this->divergedDataMover[$table])) + { + $this->divergedDataMover[$table] = array(); + } + // set unique key + $uniqueKey = md5(serialize($getters)); + if (!isset($this->divergedDataMover[$table][$uniqueKey])) + { + $this->divergedDataMover[$table][$uniqueKey] = new stdClass; + foreach ($getters as $name => $value) + { + $this->divergedDataMover[$table][$uniqueKey]->{$name} = $value; + } + } + // add the data to the mover + $this->divergedDataMover[$table][$uniqueKey]->{$type} = $values; + // success + return true; + } + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_WE_FAILED_TO_MOVE_BSB', ComponentbuilderHelper::safeString($type, 'Ww') . ' to ('.ComponentbuilderHelper::safeString($table, 'w').')'), 'warning'); + // failure + return false; + } + /** * Check if a field has multiple fields * @@ -1691,116 +1871,6 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy return false; } - /** - * Move old repeatable field to new subform field, and new table - * - * @param array/json $values The values to move - * @param string $table The table to move the values to - * @param string $type The type of values - * @param string $checker The key to check if this is a repeatable field - * @param array $targets The target to update and its type - * @param array $anchor The fields to use in anchoring to the new table - * - * @return void - */ - protected function moveData($values, $table, $type, $checker, $targets, $anchor) - { - if (ComponentbuilderHelper::checkJson($values)) - { - $values = json_decode($values, true); - } - // check if this is old values for repeatable fields - if (ComponentbuilderHelper::checkArray($values) && isset($values[$checker])) - { - $values = $this->convertRepeatable($values, $type); - } - // now update the fields - if (ComponentbuilderHelper::checkArray($values)) - { - foreach ($values as $nr => &$value) - { - foreach ($targets as $target => $target_type) - { - if (isset($value[$target])) - { - // update the target - if (!ComponentbuilderHelper::checkArray($value[$target])) - { - if (isset($this->newID[$target_type][$value[$target]])) - { - $value[$target] = $this->newID[$target_type][$value[$target]]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED', ComponentbuilderHelper::safeString($target_type, 'Ww') . '->' . ComponentbuilderHelper::safeString($target, 'Ww') .' in ('.ComponentbuilderHelper::safeString($table, 'w').':'.$item->id.')', $value[$target]), 'warning'); - $value[$target] = ''; - } - } - elseif (ComponentbuilderHelper::checkArray($value[$target])) - { - // the bucket to load the items back - $bucket = array(); - foreach ($value[$target] as $id) - { - if (!is_numeric($id)) - { - continue; - } - if (isset($this->newID[$target_type][$id])) - { - $bucket[] = $this->newID[$target_type][$id]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED', ComponentbuilderHelper::safeString($target_type, 'Ww') . '->' . ComponentbuilderHelper::safeString($target, 'Ww') .' in ('.ComponentbuilderHelper::safeString($table, 'w').':'.$item->id.')', $id), 'warning'); - $bucket[] = ''; - } - } - // set ids back - if (ComponentbuilderHelper::checkArray($bucket)) - { - $value[$target] = $bucket; - } - } - } - } - } - } - // we need to move this to the new $table based on anchors - if (ComponentbuilderHelper::checkArray($anchor)) - { - $anchorArray = array(); - foreach ($anchor as $name => $id) - { - $updated = false; - if (isset($this->newID[$name]) && isset($this->newID[$name][$id])) - { - $id = $this->newID[$name][$id]; - $updated = true; - } - // set the values - $anchorArray[$name] = array('value' => $id, 'updated' => $updated); - } - if (!isset($this->dataMover[$table])) - { - $this->dataMover[$table] = array(); - } - // set unique key - $uniqueKey = md5(serialize($anchorArray)); - if (!isset($this->dataMover[$table][$uniqueKey])) - { - $this->dataMover[$table][$uniqueKey] = array(); - $this->dataMover[$table][$uniqueKey]['<(--AnCh0r'] = $anchorArray; - } - // add the data to the mover - $this->dataMover[$table][$uniqueKey][$type] = json_encode($values); - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_WE_FAILED_TO_MOVE_BSB', ComponentbuilderHelper::safeString($type, 'Ww') . ' to ('.ComponentbuilderHelper::safeString($table, 'w').')'), 'warning'); - } - } - /** * Get the field type * @@ -1925,19 +1995,22 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy $query = $this->_db->getQuery(true); $query->select('a.*'); $query->from($this->_db->quoteName('#__componentbuilder_' . $type, 'a')); - if ($get == 1) + // only run query if where is set + $runQuery = false; + if ($get == 1 && isset($item->created) && isset($item->id)) { $query->where($this->_db->quoteName('a.created') . ' = '. $this->_db->quote($item->created)); $query->where($this->_db->quoteName('a.id') .' = '. (int) $item->id); + $runQuery = true; } elseif (componentbuilderHelper::checkArray($get)) { foreach ($get as $field) { - if (isset($item->$field)) + if (isset($item->{$field})) { // set the value - $value = $item->$field; + $value = $item->{$field}; // check if we have special value if ($this->specialValue && ComponentbuilderHelper::checkArray($this->specialValue) && isset($this->specialValue[$field])) { @@ -1960,6 +2033,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy { return false; } + $runQuery = true; } else { @@ -1967,21 +2041,22 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } } } - elseif (isset($item->$get) && componentbuilderHelper::checkString($item->$get)) // do not allow empty strings (since it could be major mis match) + elseif (isset($item->{$get}) && componentbuilderHelper::checkString($item->{$get})) // do not allow empty strings (since it could be major mis match) { // set the value - $value = $item->$get; + $value = $item->{$get}; // check if we have special value if ($this->specialValue && ComponentbuilderHelper::checkArray($this->specialValue) && isset($this->specialValue[$get])) { $value = $this->specialValue[$get]; } $query->where($this->_db->quoteName('a.' . $get) . ' = '. $this->_db->quote($value)); + $runQuery = true; } - elseif (isset($item->$get) && is_numeric($item->$get)) + elseif (isset($item->{$get}) && is_numeric($item->{$get})) { // set the value - $value = $item->$get; + $value = $item->{$get}; // check if we have special value if ($this->specialValue && ComponentbuilderHelper::checkArray($this->specialValue) && isset($this->specialValue[$get])) { @@ -2000,19 +2075,21 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy { return false; // really not needed but who knows for sure... } + $runQuery = true; } - else + // since where has been set run the query + if ($runQuery) { - return false; + // see if we get an item + $this->_db->setQuery($query); + $this->_db->execute(); + if ($this->_db->getNumRows()) + { + return $this->_db->loadObject(); + } } - // see if we get an item - $this->_db->setQuery($query); - $this->_db->execute(); - if ($this->_db->getNumRows()) - { - return $this->_db->loadObject(); - } - elseif ($retry) + // retry to get the item + if ($retry) { $retryAgain = false; $this->specialValue = false; @@ -2022,12 +2099,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy case 'admin_fields': case 'admin_fields_conditions': // get by admin_view (since there should only be one of each name) - $getter = 'admin_view'; - // update the admin_view with the local ID - if (isset($this->newID[$getter]) && isset($this->newID[$getter][$item->admin_view])) - { - $item->{$getter} = (int) $this->newID[$getter][$item->{$getter}]; - } + $getter = array('admin_view'); + $this->specialValue = array(); + $this->specialValue['admin_view'] = $this->newID['admin_view'][$item->admin_view]; break; case 'fieldtype': // get by name (since there should only be one of each name) diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index 2b450cc51..f233a1a7c 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php @@ -241,6 +241,21 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin // From the componentbuilder_admin_view table $query->from($db->quoteName('#__componentbuilder_admin_view', 'a')); + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + // Order the results by ordering $query->order('a.published ASC'); $query->order('a.ordering ASC'); @@ -322,6 +337,21 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $query->select($db->quoteName('g.name','snippet_name')); $query->join('LEFT', $db->quoteName('#__componentbuilder_snippet', 'g') . ' ON (' . $db->quoteName('a.snippet') . ' = ' . $db->quoteName('g.id') . ')'); + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + // Order the results by ordering $query->order('a.published ASC'); $query->order('a.ordering ASC'); @@ -403,6 +433,21 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $query->select($db->quoteName('g.name','snippet_name')); $query->join('LEFT', $db->quoteName('#__componentbuilder_snippet', 'g') . ' ON (' . $db->quoteName('a.snippet') . ' = ' . $db->quoteName('g.id') . ')'); + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + // Order the results by ordering $query->order('a.published ASC'); $query->order('a.ordering ASC'); @@ -480,6 +525,21 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin // From the componentbuilder_language_translation table $query->from($db->quoteName('#__componentbuilder_language_translation', 'a')); + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + // Order the results by ordering $query->order('a.published ASC'); $query->order('a.ordering ASC'); diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index 00e57e6f5..7b6e7bac2 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/models/language_translations.php b/admin/models/language_translations.php index 27e56065c..c68957715 100644 --- a/admin/models/language_translations.php +++ b/admin/models/language_translations.php @@ -195,6 +195,21 @@ class ComponentbuilderModelLanguage_translations extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -246,6 +261,12 @@ class ComponentbuilderModelLanguage_translations extends JModelList // From the componentbuilder_language_translation table $query->from($db->quoteName('#__componentbuilder_language_translation', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/languages.php b/admin/models/languages.php index ea0345627..8bcf570cc 100644 --- a/admin/models/languages.php +++ b/admin/models/languages.php @@ -157,6 +157,21 @@ class ComponentbuilderModelLanguages extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -208,6 +223,12 @@ class ComponentbuilderModelLanguages extends JModelList // From the componentbuilder_language table $query->from($db->quoteName('#__componentbuilder_language', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/layouts.php b/admin/models/layouts.php index 175ebb1ef..13eb16f27 100644 --- a/admin/models/layouts.php +++ b/admin/models/layouts.php @@ -169,6 +169,21 @@ class ComponentbuilderModelLayouts extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -225,6 +240,12 @@ class ComponentbuilderModelLayouts extends JModelList // From the componentbuilder_layout table $query->from($db->quoteName('#__componentbuilder_layout', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/site_views.php b/admin/models/site_views.php index 49f59f450..08efc2497 100644 --- a/admin/models/site_views.php +++ b/admin/models/site_views.php @@ -169,6 +169,21 @@ class ComponentbuilderModelSite_views extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -220,6 +235,12 @@ class ComponentbuilderModelSite_views extends JModelList // From the componentbuilder_site_view table $query->from($db->quoteName('#__componentbuilder_site_view', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/snippets.php b/admin/models/snippets.php index 1967d305c..2f0ef9722 100644 --- a/admin/models/snippets.php +++ b/admin/models/snippets.php @@ -203,6 +203,21 @@ class ComponentbuilderModelSnippets extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -259,6 +274,12 @@ class ComponentbuilderModelSnippets extends JModelList // From the componentbuilder_snippet table $query->from($db->quoteName('#__componentbuilder_snippet', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/models/templates.php b/admin/models/templates.php index fccc70fcb..6a7503245 100644 --- a/admin/models/templates.php +++ b/admin/models/templates.php @@ -165,6 +165,21 @@ class ComponentbuilderModelTemplates extends JModelList { $query->where('(a.published = 0 OR a.published = 1)'); } + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) @@ -216,6 +231,12 @@ class ComponentbuilderModelTemplates extends JModelList // From the componentbuilder_template table $query->from($db->quoteName('#__componentbuilder_template', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } // Order the results by ordering $query->order('a.ordering ASC'); diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index a08fe27e4..4b1e96e8c 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -224,8 +224,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -304,8 +306,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -369,8 +373,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -413,8 +419,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -447,8 +455,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_layout` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -501,8 +511,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -545,8 +557,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -579,8 +593,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -623,8 +639,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -663,8 +681,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -689,8 +709,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_language_translation` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -712,8 +734,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_language` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -736,8 +760,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_ftp` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -770,8 +796,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -799,8 +827,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -823,8 +853,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields_conditions` ( `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `version` INT(10) unsigned NOT NULL DEFAULT 1, `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), + KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), KEY `idx_modifiedby` (`modified_by`), @@ -843,8 +875,8 @@ INSERT INTO `#__componentbuilder_joomla_component` (`id`, `add_license`, `licens -- Dumping data for table `#__componentbuilder_admin_view` -- -INSERT INTO `#__componentbuilder_admin_view` (`id`, `add_css_view`, `add_css_views`, `add_custom_button`, `add_custom_import`, `add_fadein`, `add_javascript_view_file`, `add_javascript_view_footer`, `add_javascript_views_file`, `add_javascript_views_footer`, `add_php_ajax`, `add_php_allowedit`, `add_php_batchcopy`, `add_php_batchmove`, `add_php_getitem`, `add_php_getitems`, `add_php_getitems_after_all`, `add_php_getlistquery`, `add_php_postsavehook`, `add_php_save`, `add_sql`, `addconditions`, `addfields`, `addlinked_views`, `addpermissions`, `addtables`, `addtabs`, `add_php_before_delete`, `add_php_before_publish`, `add_php_document`, `add_php_after_delete`, `add_php_after_publish`, `php_before_delete`, `php_before_publish`, `php_controller`, `php_document`, `php_after_delete`, `php_after_publish`, `ajax_input`, `css_view`, `css_views`, `custom_button`, `description`, `html_import_view`, `icon`, `icon_add`, `icon_category`, `javascript_view_file`, `javascript_view_footer`, `javascript_views_file`, `javascript_views_footer`, `name_list`, `system_name`, `name_single`, `not_required`, `php_ajaxmethod`, `php_allowedit`, `php_batchcopy`, `php_batchmove`, `php_getitem`, `php_getitems`, `php_getitems_after_all`, `php_getlistquery`, `php_import`, `php_import_display`, `php_import_save`, `php_import_setdata`, `php_model`, `php_postsavehook`, `php_save`, `short_description`, `source`, `sql`, `type`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES -(109, '', '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '{\"addconditions0\":{\"target_field\":[\"1011\",\"100\",\"158\",\"196\",\"280\"],\"target_behavior\":\"1\",\"target_relation\":\"0\",\"match_field\":\"682\",\"match_behavior\":\"1\",\"match_options\":\"1|Yes\"}}', '{\"addfields0\":{\"field\":\"199\",\"list\":\"1\",\"order_list\":\"1\",\"title\":\"1\",\"alias\":\"0\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"0\",\"link\":\"1\",\"tab\":\"1\",\"alignment\":\"4\",\"order_edit\":\"1\",\"permission\":\"1\"},\"addfields1\":{\"field\":\"23\",\"list\":\"0\",\"order_list\":\"0\",\"title\":\"0\",\"alias\":\"1\",\"sort\":\"0\",\"search\":\"1\",\"filter\":\"0\",\"link\":\"0\",\"tab\":\"1\",\"alignment\":\"4\",\"order_edit\":\"2\",\"permission\":\"1\"},\"addfields2\":{\"field\":\"84\",\"list\":\"1\",\"order_list\":\"2\",\"title\":\"0\",\"alias\":\"0\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"0\",\"link\":\"0\",\"tab\":\"1\",\"alignment\":\"3\",\"order_edit\":\"1\",\"permission\":\"1\"},\"addfields3\":{\"field\":\"682\",\"list\":\"0\",\"order_list\":\"0\",\"title\":\"0\",\"alias\":\"0\",\"sort\":\"1\",\"search\":\"1\",\"filter\":\"1\",\"link\":\"0\",\"tab\":\"2\",\"alignment\":\"1\",\"order_edit\":\"1\",\"permission\":\"1\"},\"addfields4\":{\"field\":\"100\",\"list\":\"0\",\"order_list\":\"0\",\"title\":\"0\",\"alias\":\"0\",\"sort\":\"0\",\"search\":\"0\",\"filter\":\"0\",\"link\":\"0\",\"tab\":\"2\",\"alignment\":\"2\",\"order_edit\":\"1\",\"permission\":\"1\"},\"addfields5\":{\"field\":\"196\",\"list\":\"0\",\"order_list\":\"0\",\"title\":\"0\",\"alias\":\"0\",\"sort\":\"0\",\"search\":\"0\",\"filter\":\"0\",\"link\":\"0\",\"tab\":\"2\",\"alignment\":\"2\",\"order_edit\":\"2\",\"permission\":\"1\"},\"addfields6\":{\"field\":\"1011\",\"list\":\"0\",\"order_list\":\"0\",\"title\":\"0\",\"alias\":\"0\",\"sort\":\"0\",\"search\":\"0\",\"filter\":\"0\",\"link\":\"0\",\"tab\":\"2\",\"alignment\":\"2\",\"order_edit\":\"3\",\"permission\":\"1\"},\"addfields7\":{\"field\":\"158\",\"list\":\"0\",\"order_list\":\"0\",\"title\":\"0\",\"alias\":\"0\",\"sort\":\"0\",\"search\":\"0\",\"filter\":\"0\",\"link\":\"0\",\"tab\":\"2\",\"alignment\":\"2\",\"order_edit\":\"4\",\"permission\":\"1\"},\"addfields8\":{\"field\":\"280\",\"list\":\"0\",\"order_list\":\"0\",\"title\":\"0\",\"alias\":\"0\",\"sort\":\"0\",\"search\":\"0\",\"filter\":\"0\",\"link\":\"0\",\"tab\":\"2\",\"alignment\":\"2\",\"order_edit\":\"5\",\"permission\":\"1\"},\"addfields9\":{\"field\":\"203\",\"list\":\"0\",\"order_list\":\"0\",\"title\":\"0\",\"alias\":\"0\",\"sort\":\"0\",\"search\":\"0\",\"filter\":\"0\",\"link\":\"0\",\"tab\":\"1\",\"alignment\":\"5\",\"order_edit\":\"1\",\"permission\":\"0\"}}', '', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":\"3\"},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":\"3\"},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":\"3\"},\"addpermissions3\":{\"action\":\"view.edit.created_by\",\"implementation\":\"3\"},\"addpermissions4\":{\"action\":\"view.edit.created\",\"implementation\":\"3\"},\"addpermissions5\":{\"action\":\"view.create\",\"implementation\":\"3\"},\"addpermissions6\":{\"action\":\"view.delete\",\"implementation\":\"3\"},\"addpermissions7\":{\"action\":\"view.access\",\"implementation\":\"3\"}}', '', '{\"addtabs0\":{\"name\":\"Details\"},\"addtabs1\":{\"name\":\"More\"}}', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'images/WoodMannequin-icon.png', 'images/WoodMannequin-icon-plus.png', '', '', '', '', '', 'Looks', 'Look', 'Look', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'The demo view', '', '', 1, '', 1, '2016-10-18 11:44:46', '2016-10-20 19:23:57', 12, '', 16); +INSERT INTO `#__componentbuilder_admin_view` (`id`, `add_css_view`, `add_css_views`, `add_custom_button`, `add_custom_import`, `add_fadein`, `add_javascript_view_file`, `add_javascript_view_footer`, `add_javascript_views_file`, `add_javascript_views_footer`, `add_php_ajax`, `add_php_allowedit`, `add_php_batchcopy`, `add_php_batchmove`, `add_php_getitem`, `add_php_getitems`, `add_php_getitems_after_all`, `add_php_getlistquery`, `add_php_postsavehook`, `add_php_save`, `add_sql`, `addlinked_views`, `addpermissions`, `addtables`, `addtabs`, `add_php_before_delete`, `add_php_before_publish`, `add_php_document`, `add_php_after_delete`, `add_php_after_publish`, `php_before_delete`, `php_before_publish`, `php_controller`, `php_document`, `php_after_delete`, `php_after_publish`, `ajax_input`, `css_view`, `css_views`, `custom_button`, `description`, `html_import_view`, `icon`, `icon_add`, `icon_category`, `javascript_view_file`, `javascript_view_footer`, `javascript_views_file`, `javascript_views_footer`, `name_list`, `system_name`, `name_single`, `not_required`, `php_ajaxmethod`, `php_allowedit`, `php_batchcopy`, `php_batchmove`, `php_getitem`, `php_getitems`, `php_getitems_after_all`, `php_getlistquery`, `php_import`, `php_import_display`, `php_import_save`, `php_import_setdata`, `php_model`, `php_postsavehook`, `php_save`, `short_description`, `source`, `sql`, `type`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES +(109, '', '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":\"3\"},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":\"3\"},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":\"3\"},\"addpermissions3\":{\"action\":\"view.edit.created_by\",\"implementation\":\"3\"},\"addpermissions4\":{\"action\":\"view.edit.created\",\"implementation\":\"3\"},\"addpermissions5\":{\"action\":\"view.create\",\"implementation\":\"3\"},\"addpermissions6\":{\"action\":\"view.delete\",\"implementation\":\"3\"},\"addpermissions7\":{\"action\":\"view.access\",\"implementation\":\"3\"}}', '', '{\"addtabs0\":{\"name\":\"Details\"},\"addtabs1\":{\"name\":\"More\"}}', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'images/WoodMannequin-icon.png', 'images/WoodMannequin-icon-plus.png', '', '', '', '', '', 'Looks', 'Look', 'Look', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'The demo view', '', '', 1, '', 1, '2016-10-18 11:44:46', '2016-10-20 19:23:57', 12, '', 16); @@ -972,17 +1004,17 @@ INSERT INTO `#__componentbuilder_snippet` (`id`, `description`, `heading`, `name -- Dumping data for table `#__componentbuilder_field` -- -INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`, `add_javascript_view_footer`, `add_javascript_views_footer`, `catid`, `css_view`, `css_views`, `datadefault`, `datadefault_other`, `datalenght`, `datalenght_other`, `datatype`, `indexes`, `javascript_view_footer`, `javascript_views_footer`, `name`, `not_required`, `null_switch`, `store`, `fieldtype`, `xml`, `params`, `published`, `created`, `modified`, `version`, `hits`, `access`, `ordering`) VALUES -(23, '', '', '', '', '', '', '', '', '', 64, '', 'CHAR', '', '', '', 'Alias', '', 'NOT NULL', '', 24, '\"\"', '', 1, '2015-04-09 13:46:04', '2016-05-05 22:30:18', 2, '', 1, 216), -(84, '', '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'Description (full width)', '', 'NOT NULL', '', 25, '\"\"', '', 1, '2015-03-19 18:20:49', '2016-10-20 17:01:21', 4, '', 1, 265), -(100, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Email (required)', '', 'NOT NULL', '', 24, '\"\"', '', 1, '2015-05-05 23:44:32', '2016-02-07 22:43:18', 4, '', 1, 285), -(158, '', '', '', '', '', '', '', '', '', 64, '', 'CHAR', '', '', '', 'Image', '', 'NOT NULL', '', 12, '\"\"', '', 1, '2015-04-29 14:00:56', '2015-08-25 21:15:22', 1, '', 1, 45), -(196, '', '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', '', '', '', 'Mobile Phone', '', 'NOT NULL', '', 23, '\"\"', '', 1, '2015-04-07 22:12:58', '2016-03-28 14:00:02', 2, '', 1, 7), -(199, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Name', '', 'NOT NULL', '', 24, '\"\"', '', 1, '2015-03-19 17:30:59', '2016-10-18 12:42:57', 6, '', 1, 4), -(203, '', '', '', '', '', '', '', '', '', 1, '', 'INT', '', '', '', 'Not Required', '', 'NOT NULL', '', 9, '\"\"', '', 1, '2015-05-08 16:19:16', '2015-08-25 21:15:22', 1, '', 1, 19), -(280, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Website', '', 'NOT NULL', '', 27, '\"\"', '', 1, '2015-04-08 00:36:16', '2015-08-25 21:15:22', 1, '', 1, 105), -(682, '', '', '', '', '', '', '', '', '', 1, '', 'TINYINT', 2, '', '', 'Add More', '', 'NOT NULL', '', 17, '\"\"', '', 1, '2015-08-05 01:18:20', '2016-10-18 12:16:27', 2, '', 1, 196), -(1011, '', '', '', '', '', '', '', 'Other', '0000-00-00', '', '', 'DATE', '', '', '', 'Date of Birth', '', 'NOT NULL', '', 1, '\"\"', '', 1, '2015-12-07 01:47:32', '2015-12-07 02:15:24', 3, '', 1, 649); +INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`, `add_javascript_view_footer`, `add_javascript_views_footer`, `catid`, `css_view`, `css_views`, `datadefault`, `datadefault_other`, `datalenght`, `datalenght_other`, `datatype`, `indexes`, `javascript_view_footer`, `javascript_views_footer`, `name`, `null_switch`, `store`, `fieldtype`, `xml`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES +(23, '', '', '', '', '', '', '', '', '', 64, '', 'CHAR', '', '', '', 'Alias', 'NOT NULL', '', 24, '\"\"', 1, '2015-04-09 13:46:04', '2016-05-05 22:30:18', 2, '', 216), +(84, '', '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'Description (full width)', 'NOT NULL', '', 25, '\"\"', 1, '2015-03-19 18:20:49', '2016-10-20 17:01:21', 4, '', 265), +(100, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Email (required)', 'NOT NULL', '', 24, '\"\"', 1, '2015-05-05 23:44:32', '2016-02-07 22:43:18', 4, '', 285), +(158, '', '', '', '', '', '', '', '', '', 64, '', 'CHAR', '', '', '', 'Image', 'NOT NULL', '', 12, '\"\"', 1, '2015-04-29 14:00:56', '2015-08-25 21:15:22', 1, '', 45), +(196, '', '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', '', '', '', 'Mobile Phone', 'NOT NULL', '', 23, '\"\"', 1, '2015-04-07 22:12:58', '2016-03-28 14:00:02', 2, '', 7), +(199, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Name', 'NOT NULL', '', 24, '\"\"', 1, '2015-03-19 17:30:59', '2016-10-18 12:42:57', 6, '', 4), +(203, '', '', '', '', '', '', '', '', '', 1, '', 'INT', '', '', '', 'Not Required', 'NOT NULL', '', 9, '\"\"', 1, '2015-05-08 16:19:16', '2015-08-25 21:15:22', 1, '', 19), +(280, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Website', 'NOT NULL', '', 27, '\"\"', 1, '2015-04-08 00:36:16', '2015-08-25 21:15:22', 1, '', 105), +(682, '', '', '', '', '', '', '', '', '', 1, '', 'TINYINT', 2, '', '', 'Add More', 'NOT NULL', '', 17, '\"\"', 1, '2015-08-05 01:18:20', '2016-10-18 12:16:27', 2, '', 196), +(1011, '', '', '', '', '', '', '', 'Other', '0000-00-00', '', '', 'DATE', '', '', '', 'Date of Birth', 'NOT NULL', '', 1, '\"\"', 1, '2015-12-07 01:47:32', '2015-12-07 02:15:24', 3, '', 649); -- -- Dumping data for table `#__componentbuilder_fieldtype` diff --git a/admin/tables/admin_fields.php b/admin/tables/admin_fields.php index 05ae0448c..04653a000 100644 --- a/admin/tables/admin_fields.php +++ b/admin/tables/admin_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php diff --git a/admin/tables/admin_fields_conditions.php b/admin/tables/admin_fields_conditions.php index 38a5499fb..0e3ee6876 100644 --- a/admin/tables/admin_fields_conditions.php +++ b/admin/tables/admin_fields_conditions.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index 2ca8dbde7..a92a8669a 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/tables/field.php b/admin/tables/field.php index 739f6888c..49d70b298 100644 --- a/admin/tables/field.php +++ b/admin/tables/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/tables/ftp.php b/admin/tables/ftp.php index f58567f64..368c10975 100644 --- a/admin/tables/ftp.php +++ b/admin/tables/ftp.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage ftp.php diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php index cf1aab60a..1a5df82a1 100644 --- a/admin/tables/joomla_component.php +++ b/admin/tables/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/views/admin_fields/submitbutton.js b/admin/views/admin_fields/submitbutton.js index 64ee894e3..66fe38b21 100644 --- a/admin/views/admin_fields/submitbutton.js +++ b/admin/views/admin_fields/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_fields/tmpl/edit.php b/admin/views/admin_fields/tmpl/edit.php index c66ecfaa7..6edf256e9 100644 --- a/admin/views/admin_fields/tmpl/edit.php +++ b/admin/views/admin_fields/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage edit.php diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php index f397800a5..35f8fb4d8 100644 --- a/admin/views/admin_fields/view.html.php +++ b/admin/views/admin_fields/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php diff --git a/admin/views/admin_fields_conditions/submitbutton.js b/admin/views/admin_fields_conditions/submitbutton.js index 4cd58ae20..d92055a81 100644 --- a/admin/views/admin_fields_conditions/submitbutton.js +++ b/admin/views/admin_fields_conditions/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admin_fields_conditions/tmpl/edit.php b/admin/views/admin_fields_conditions/tmpl/edit.php index f4adc87a6..a0bf57ba7 100644 --- a/admin/views/admin_fields_conditions/tmpl/edit.php +++ b/admin/views/admin_fields_conditions/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php index 4087ece53..80a113988 100644 --- a/admin/views/admin_fields_conditions/view.html.php +++ b/admin/views/admin_fields_conditions/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index 05e89a50f..55ea2776d 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index b6435d4fd..6b1dceba8 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index a9c161c4e..5d25092d6 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 21ed29f68..a1f3d0c2d 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index 2e0b46192..9dddadefa 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index 54f91c274..29b50b8d4 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 4de3591f7..4def5148b 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index dd51f4b2c..e32409e8c 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index e254de9a0..c06202cfd 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index a744e3161..e31591e0f 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index f170c2f01..dda6eba57 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 191 of this MVC + @version @update number 192 of this MVC @build 16th October, 2017 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admins_fields/tmpl/default.php b/admin/views/admins_fields/tmpl/default.php index 7b4f07797..6078f5221 100644 --- a/admin/views/admins_fields/tmpl/default.php +++ b/admin/views/admins_fields/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default.php diff --git a/admin/views/admins_fields/tmpl/default_batch_body.php b/admin/views/admins_fields/tmpl/default_batch_body.php index 990d3fdab..99068b474 100644 --- a/admin/views/admins_fields/tmpl/default_batch_body.php +++ b/admin/views/admins_fields/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admins_fields/tmpl/default_batch_footer.php b/admin/views/admins_fields/tmpl/default_batch_footer.php index 42028c821..0e0db40f2 100644 --- a/admin/views/admins_fields/tmpl/default_batch_footer.php +++ b/admin/views/admins_fields/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admins_fields/tmpl/default_body.php b/admin/views/admins_fields/tmpl/default_body.php index b5198e08a..86987965d 100644 --- a/admin/views/admins_fields/tmpl/default_body.php +++ b/admin/views/admins_fields/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_body.php diff --git a/admin/views/admins_fields/tmpl/default_foot.php b/admin/views/admins_fields/tmpl/default_foot.php index c7bc6281e..f9715680d 100644 --- a/admin/views/admins_fields/tmpl/default_foot.php +++ b/admin/views/admins_fields/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admins_fields/tmpl/default_head.php b/admin/views/admins_fields/tmpl/default_head.php index d57475c62..764122d30 100644 --- a/admin/views/admins_fields/tmpl/default_head.php +++ b/admin/views/admins_fields/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admins_fields/tmpl/default_toolbar.php b/admin/views/admins_fields/tmpl/default_toolbar.php index 4ec4512a5..a0fbf694f 100644 --- a/admin/views/admins_fields/tmpl/default_toolbar.php +++ b/admin/views/admins_fields/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php index 0652929a2..17079e1dc 100644 --- a/admin/views/admins_fields/view.html.php +++ b/admin/views/admins_fields/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 15th October, 2017 + @version @update number 23 of this MVC + @build 16th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php diff --git a/admin/views/admins_fields_conditions/tmpl/default.php b/admin/views/admins_fields_conditions/tmpl/default.php index 4c4d28e05..e37f9e4ef 100644 --- a/admin/views/admins_fields_conditions/tmpl/default.php +++ b/admin/views/admins_fields_conditions/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_batch_body.php b/admin/views/admins_fields_conditions/tmpl/default_batch_body.php index 0ef8b1bf6..96d887c5b 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_batch_body.php +++ b/admin/views/admins_fields_conditions/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php b/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php index 17c9bedf8..ce9c22e88 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php +++ b/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_body.php b/admin/views/admins_fields_conditions/tmpl/default_body.php index 2344aa031..ffed4ff38 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_body.php +++ b/admin/views/admins_fields_conditions/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_foot.php b/admin/views/admins_fields_conditions/tmpl/default_foot.php index 464f86ec3..1ef113bb4 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_foot.php +++ b/admin/views/admins_fields_conditions/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_head.php b/admin/views/admins_fields_conditions/tmpl/default_head.php index c068f684d..a08c09011 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_head.php +++ b/admin/views/admins_fields_conditions/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/tmpl/default_toolbar.php b/admin/views/admins_fields_conditions/tmpl/default_toolbar.php index 7d4374c19..05d1318da 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_toolbar.php +++ b/admin/views/admins_fields_conditions/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php index 06d935886..173cf4bb7 100644 --- a/admin/views/admins_fields_conditions/view.html.php +++ b/admin/views/admins_fields_conditions/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 15 of this MVC + @version @update number 16 of this MVC @build 16th October, 2017 @created 12th October, 2017 @package Component Builder diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index f3719866f..afb5df3e4 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php index 64099ac92..7a3e5eac9 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php index 25e26b9d8..deeab391e 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index 36ac22de3..1a7e61c5e 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index c949715a7..0f353921a 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_releases_information.php b/admin/views/componentbuilder/tmpl/default_releases_information.php index 614b11267..cdae5540c 100644 --- a/admin/views/componentbuilder/tmpl/default_releases_information.php +++ b/admin/views/componentbuilder/tmpl/default_releases_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_releases_information.php diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index f1589b506..ec851c2f6 100644 --- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index 62b5fa6ac..da8c1f34c 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php index 92bd5d8cf..f54c4d1d6 100644 --- a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php +++ b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_wiki_tutorials.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 1e38844a1..63cbe4226 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/field/submitbutton.js b/admin/views/field/submitbutton.js index 47f6c3de1..46500dbf5 100644 --- a/admin/views/field/submitbutton.js +++ b/admin/views/field/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php index 5c5f0d18b..9775e47a3 100644 --- a/admin/views/field/tmpl/edit.php +++ b/admin/views/field/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php index 311c9f23c..d5de9fa82 100644 --- a/admin/views/field/view.html.php +++ b/admin/views/field/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/fields/tmpl/default.php b/admin/views/fields/tmpl/default.php index aa6702791..6947dffd4 100644 --- a/admin/views/fields/tmpl/default.php +++ b/admin/views/fields/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/fields/tmpl/default_batch_body.php b/admin/views/fields/tmpl/default_batch_body.php index 84cf5fd81..a57304870 100644 --- a/admin/views/fields/tmpl/default_batch_body.php +++ b/admin/views/fields/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/fields/tmpl/default_batch_footer.php b/admin/views/fields/tmpl/default_batch_footer.php index 236493c37..46e72a8f5 100644 --- a/admin/views/fields/tmpl/default_batch_footer.php +++ b/admin/views/fields/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/fields/tmpl/default_body.php b/admin/views/fields/tmpl/default_body.php index 9b0d0c30c..0e695c0a4 100644 --- a/admin/views/fields/tmpl/default_body.php +++ b/admin/views/fields/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/fields/tmpl/default_foot.php b/admin/views/fields/tmpl/default_foot.php index f408f79bc..dcd018234 100644 --- a/admin/views/fields/tmpl/default_foot.php +++ b/admin/views/fields/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/fields/tmpl/default_head.php b/admin/views/fields/tmpl/default_head.php index 6cc62bafa..abdfb4567 100644 --- a/admin/views/fields/tmpl/default_head.php +++ b/admin/views/fields/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/fields/tmpl/default_toolbar.php b/admin/views/fields/tmpl/default_toolbar.php index 15916ef80..47eb10268 100644 --- a/admin/views/fields/tmpl/default_toolbar.php +++ b/admin/views/fields/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php index 3e348e1a4..89bf30943 100644 --- a/admin/views/fields/view.html.php +++ b/admin/views/fields/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 39 of this MVC - @build 14th October, 2017 + @version @update number 40 of this MVC + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/ftp/submitbutton.js b/admin/views/ftp/submitbutton.js index cfda23b3b..350af32cb 100644 --- a/admin/views/ftp/submitbutton.js +++ b/admin/views/ftp/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/ftp/tmpl/edit.php b/admin/views/ftp/tmpl/edit.php index 1b88d3506..614f51af8 100644 --- a/admin/views/ftp/tmpl/edit.php +++ b/admin/views/ftp/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage edit.php diff --git a/admin/views/ftp/view.html.php b/admin/views/ftp/view.html.php index ec6d80f2b..49c8b1730 100644 --- a/admin/views/ftp/view.html.php +++ b/admin/views/ftp/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage view.html.php diff --git a/admin/views/ftps/tmpl/default.php b/admin/views/ftps/tmpl/default.php index 55b23cb2d..0d357bd6e 100644 --- a/admin/views/ftps/tmpl/default.php +++ b/admin/views/ftps/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage default.php diff --git a/admin/views/ftps/tmpl/default_batch_body.php b/admin/views/ftps/tmpl/default_batch_body.php index 6db6bb0c4..8cc82c9e6 100644 --- a/admin/views/ftps/tmpl/default_batch_body.php +++ b/admin/views/ftps/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/ftps/tmpl/default_batch_footer.php b/admin/views/ftps/tmpl/default_batch_footer.php index 8769ddec6..d8e65aab2 100644 --- a/admin/views/ftps/tmpl/default_batch_footer.php +++ b/admin/views/ftps/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/ftps/tmpl/default_body.php b/admin/views/ftps/tmpl/default_body.php index 643cd4b87..95bb5e6f9 100644 --- a/admin/views/ftps/tmpl/default_body.php +++ b/admin/views/ftps/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage default_body.php diff --git a/admin/views/ftps/tmpl/default_foot.php b/admin/views/ftps/tmpl/default_foot.php index c654f5483..4d3b4e074 100644 --- a/admin/views/ftps/tmpl/default_foot.php +++ b/admin/views/ftps/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/ftps/tmpl/default_head.php b/admin/views/ftps/tmpl/default_head.php index 54eec3e1a..9636572a8 100644 --- a/admin/views/ftps/tmpl/default_head.php +++ b/admin/views/ftps/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage default_head.php diff --git a/admin/views/ftps/tmpl/default_toolbar.php b/admin/views/ftps/tmpl/default_toolbar.php index 3b8b30473..c49ea1971 100644 --- a/admin/views/ftps/tmpl/default_toolbar.php +++ b/admin/views/ftps/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/ftps/view.html.php b/admin/views/ftps/view.html.php index 1aa11b01e..e705ce854 100644 --- a/admin/views/ftps/view.html.php +++ b/admin/views/ftps/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 10 of this MVC - @build 24th August, 2017 + @version @update number 11 of this MVC + @build 16th October, 2017 @created 23rd August, 2017 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 2f8053786..bfacaef2d 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 954cd995d..585f7e5e3 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php index bb97c67ba..839a1b049 100644 --- a/admin/views/import_joomla_components/tmpl/default.php +++ b/admin/views/import_joomla_components/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index 0c808e95c..69be01db1 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_component/submitbutton.js b/admin/views/joomla_component/submitbutton.js index 85f22ed5c..34dd5862e 100644 --- a/admin/views/joomla_component/submitbutton.js +++ b/admin/views/joomla_component/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php index 14426047d..08c810165 100644 --- a/admin/views/joomla_component/tmpl/edit.php +++ b/admin/views/joomla_component/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php index 2927f5d74..32040e236 100644 --- a/admin/views/joomla_component/view.html.php +++ b/admin/views/joomla_component/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_components/tmpl/default.php b/admin/views/joomla_components/tmpl/default.php index 089d6bb89..1a8ca16ed 100644 --- a/admin/views/joomla_components/tmpl/default.php +++ b/admin/views/joomla_components/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/joomla_components/tmpl/default_batch_body.php b/admin/views/joomla_components/tmpl/default_batch_body.php index 91a9d656d..b0e06ce45 100644 --- a/admin/views/joomla_components/tmpl/default_batch_body.php +++ b/admin/views/joomla_components/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/joomla_components/tmpl/default_batch_footer.php b/admin/views/joomla_components/tmpl/default_batch_footer.php index 8c1682ff3..cfc51b604 100644 --- a/admin/views/joomla_components/tmpl/default_batch_footer.php +++ b/admin/views/joomla_components/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/joomla_components/tmpl/default_body.php b/admin/views/joomla_components/tmpl/default_body.php index dcca8d8d1..27a982194 100644 --- a/admin/views/joomla_components/tmpl/default_body.php +++ b/admin/views/joomla_components/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/joomla_components/tmpl/default_foot.php b/admin/views/joomla_components/tmpl/default_foot.php index 3064da697..c9a950003 100644 --- a/admin/views/joomla_components/tmpl/default_foot.php +++ b/admin/views/joomla_components/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/joomla_components/tmpl/default_head.php b/admin/views/joomla_components/tmpl/default_head.php index 3d12d4831..9313296c1 100644 --- a/admin/views/joomla_components/tmpl/default_head.php +++ b/admin/views/joomla_components/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/joomla_components/tmpl/default_toolbar.php b/admin/views/joomla_components/tmpl/default_toolbar.php index f935ae591..5939a38e5 100644 --- a/admin/views/joomla_components/tmpl/default_toolbar.php +++ b/admin/views/joomla_components/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index bd5dac75b..2a3fedddd 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 412 of this MVC - @build 16th October, 2017 + @version @update number 439 of this MVC + @build 18th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/componentbuilder.xml b/componentbuilder.xml index 1b530cb93..7424f69dc 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 16th October, 2017 + 18th October, 2017 Llewellyn van der Merwe joomla@vdm.io http://vdm.bz/component-builder @@ -11,7 +11,7 @@ Component Builder (v.2.5.8)
-

The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) that is highly advanced, truly able to build extremely complex components in a fraction of the time. +

The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time. Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!

Created by Llewellyn van der Merwe
Development started 30th April, 2015

diff --git a/script.php b/script.php index 9409ee4eb..adf9ad29c 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage script.php @@ -1992,17 +1992,31 @@ class com_componentbuilderInstallerScript $this->dynamicTable = array('admin_fields' => 'admin_view', 'admin_fields_conditions' => 'admin_view'); foreach ($tables as $move => $array) { - // move all fields & conditions out of admin views into admin fields - $query = $db->getQuery(true); - // update all JCB fieldtype properties - $query->select($db->quoteName(array_keys($array),array_values($array))); - $query->from($db->quoteName('#__componentbuilder_'.$this->dynamicTable[$move])); - // Reset the query using our newly populated query object. - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) + // we must first check if the fields are still there + $columns = $db->getTableColumns('#__componentbuilder_'.$this->dynamicTable[$move]); + foreach ($array as $column => $as) { - $this->setMoveValues[$move] = $db->loadObjectList(); + if (!isset($columns[$column])) + { + // remove this column since it is no longer found + unset($array[$column]); + } + } + // do we still need to move any + if (ComponentbuilderHelper::checkArray($array)) + { + // move all diverged data + $query = $db->getQuery(true); + // update all JCB fieldtype properties + $query->select($db->quoteName(array_keys($array),array_values($array))); + $query->from($db->quoteName('#__componentbuilder_'.$this->dynamicTable[$move])); + // Reset the query using our newly populated query object. + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $this->setMoveValues[$move] = $db->loadObjectList(); + } } } } @@ -2045,9 +2059,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $admin_view_Inserted = $db->insertObject('#__content_types', $admin_view); @@ -2057,9 +2071,9 @@ class com_componentbuilderInstallerScript $custom_admin_view->type_title = 'Componentbuilder Custom_admin_view'; $custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view'; $custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_php_jview":"add_php_jview","add_php_view":"add_php_view","add_css_document":"add_css_document","icon":"icon","add_php_jview_display":"add_php_jview_display","add_js_document":"add_js_document","php_controller":"php_controller","add_css":"add_css","default":"default","add_php_document":"add_php_document","php_model":"php_model","not_required":"not_required","php_document":"php_document","custom_get":"custom_get","php_view":"php_view","main_get":"main_get","php_jview_display":"php_jview_display","dynamic_get":"dynamic_get","php_jview":"php_jview","js_document":"js_document","add_custom_button":"add_custom_button","css_document":"css_document","css":"css"}}'; + $custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_php_jview":"add_php_jview","add_php_view":"add_php_view","add_css_document":"add_css_document","icon":"icon","add_php_jview_display":"add_php_jview_display","add_js_document":"add_js_document","php_controller":"php_controller","add_css":"add_css","default":"default","add_php_document":"add_php_document","php_model":"php_model","not_required":"not_required","php_document":"php_document","custom_get":"custom_get","php_view":"php_view","main_get":"main_get","php_jview_display":"php_jview_display","dynamic_get":"dynamic_get","php_jview":"php_jview","js_document":"js_document","add_custom_button":"add_custom_button","css_document":"css_document","css":"css"}}'; $custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute'; - $custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_jview","add_php_view","add_css_document","add_php_jview_display","add_js_document","add_css","add_php_document","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; + $custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_jview","add_php_view","add_css_document","add_php_jview_display","add_js_document","add_css","add_php_document","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $custom_admin_view_Inserted = $db->insertObject('#__content_types', $custom_admin_view); @@ -2069,9 +2083,9 @@ class com_componentbuilderInstallerScript $site_view->type_title = 'Componentbuilder Site_view'; $site_view->type_alias = 'com_componentbuilder.site_view'; $site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css":"css","add_php_document":"add_php_document","js_document":"js_document","css_document":"css_document","default":"default","php_ajaxmethod":"php_ajaxmethod","add_php_jview_display":"add_php_jview_display","add_php_view":"add_php_view","php_model":"php_model","add_php_jview":"add_php_jview","not_required":"not_required","custom_get":"custom_get","add_js_document":"add_js_document","main_get":"main_get","add_css_document":"add_css_document","dynamic_get":"dynamic_get","add_css":"add_css","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","button_position":"button_position","php_document":"php_document","php_view":"php_view","php_jview_display":"php_jview_display","php_controller":"php_controller","php_jview":"php_jview"}}'; + $site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css":"css","add_php_document":"add_php_document","js_document":"js_document","css_document":"css_document","default":"default","php_ajaxmethod":"php_ajaxmethod","add_php_jview_display":"add_php_jview_display","add_php_view":"add_php_view","php_model":"php_model","add_php_jview":"add_php_jview","not_required":"not_required","custom_get":"custom_get","add_js_document":"add_js_document","main_get":"main_get","add_css_document":"add_css_document","dynamic_get":"dynamic_get","add_css":"add_css","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","button_position":"button_position","php_document":"php_document","php_view":"php_view","php_jview_display":"php_jview_display","php_controller":"php_controller","php_jview":"php_jview"}}'; $site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute'; - $site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_js_document","main_get","add_css_document","dynamic_get","add_css","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; + $site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_js_document","main_get","add_css_document","dynamic_get","add_css","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $site_view_Inserted = $db->insertObject('#__content_types', $site_view); @@ -2081,9 +2095,9 @@ class com_componentbuilderInstallerScript $template->type_title = 'Componentbuilder Template'; $template->type_alias = 'com_componentbuilder.template'; $template->table = '{"special": {"dbtable": "#__componentbuilder_template","key": "id","type": "Template","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","dynamic_get":"dynamic_get","add_php_view":"add_php_view","template":"template","not_required":"not_required","php_view":"php_view"}}'; + $template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","dynamic_get":"dynamic_get","add_php_view":"add_php_view","template":"template","not_required":"not_required","php_view":"php_view"}}'; $template->router = 'ComponentbuilderHelperRoute::getTemplateRoute'; - $template->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/template.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","dynamic_get","add_php_view","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; + $template->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/template.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","dynamic_get","add_php_view","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $template_Inserted = $db->insertObject('#__content_types', $template); @@ -2093,9 +2107,9 @@ class com_componentbuilderInstallerScript $layout->type_title = 'Componentbuilder Layout'; $layout->type_alias = 'com_componentbuilder.layout'; $layout->table = '{"special": {"dbtable": "#__componentbuilder_layout","key": "id","type": "Layout","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","add_php_view":"add_php_view","layout":"layout","not_required":"not_required","php_view":"php_view"}}'; + $layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","add_php_view":"add_php_view","layout":"layout","not_required":"not_required","php_view":"php_view"}}'; $layout->router = 'ComponentbuilderHelperRoute::getLayoutRoute'; - $layout->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/layout.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","dynamic_get","snippet","add_php_view","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"}]}'; + $layout->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/layout.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","dynamic_get","snippet","add_php_view","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $layout_Inserted = $db->insertObject('#__content_types', $layout); @@ -2105,9 +2119,9 @@ class com_componentbuilderInstallerScript $dynamic_get->type_title = 'Componentbuilder Dynamic_get'; $dynamic_get->type_alias = 'com_componentbuilder.dynamic_get'; $dynamic_get->table = '{"special": {"dbtable": "#__componentbuilder_dynamic_get","key": "id","type": "Dynamic_get","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","add_php_before_getitem":"add_php_before_getitem","addcalculation":"addcalculation","db_selection":"db_selection","add_php_getlistquery":"add_php_getlistquery","view_table_main":"view_table_main","add_php_after_getitem":"add_php_after_getitem","db_table_main":"db_table_main","php_custom_get":"php_custom_get","view_selection":"view_selection","php_before_getitem":"php_before_getitem","add_php_before_getitems":"add_php_before_getitems","php_after_getitem":"php_after_getitem","add_php_after_getitems":"add_php_after_getitems","php_getlistquery":"php_getlistquery","getcustom":"getcustom","php_before_getitems":"php_before_getitems","pagination":"pagination","php_after_getitems":"php_after_getitems","not_required":"not_required","php_calculation":"php_calculation"}}'; + $dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","add_php_before_getitem":"add_php_before_getitem","addcalculation":"addcalculation","db_selection":"db_selection","add_php_getlistquery":"add_php_getlistquery","view_table_main":"view_table_main","add_php_after_getitem":"add_php_after_getitem","db_table_main":"db_table_main","php_custom_get":"php_custom_get","view_selection":"view_selection","php_before_getitem":"php_before_getitem","add_php_before_getitems":"add_php_before_getitems","php_after_getitem":"php_after_getitem","add_php_after_getitems":"add_php_after_getitems","php_getlistquery":"php_getlistquery","getcustom":"getcustom","php_before_getitems":"php_before_getitems","pagination":"pagination","php_after_getitems":"php_after_getitems","not_required":"not_required","php_calculation":"php_calculation"}}'; $dynamic_get->router = 'ComponentbuilderHelperRoute::getDynamic_getRoute'; - $dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","main_source","gettype","add_php_before_getitem","add_php_getlistquery","view_table_main","add_php_after_getitem","add_php_before_getitems","add_php_after_getitems","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; + $dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","main_source","gettype","add_php_before_getitem","add_php_getlistquery","view_table_main","add_php_after_getitem","add_php_before_getitems","add_php_after_getitems","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; // Set the object into the content types table. $dynamic_get_Inserted = $db->insertObject('#__content_types', $dynamic_get); @@ -2117,9 +2131,9 @@ class com_componentbuilderInstallerScript $custom_code->type_title = 'Componentbuilder Custom_code'; $custom_code->type_alias = 'com_componentbuilder.custom_code'; $custom_code->table = '{"special": {"dbtable": "#__componentbuilder_custom_code","key": "id","type": "Custom_code","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","hashtarget":"hashtarget","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","function_name":"function_name","from_line":"from_line","system_name":"system_name","not_required":"not_required"}}'; + $custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","hashtarget":"hashtarget","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","function_name":"function_name","from_line":"from_line","system_name":"system_name","not_required":"not_required"}}'; $custom_code->router = 'ComponentbuilderHelperRoute::getCustom_codeRoute'; - $custom_code->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_code.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","component","target","type","comment_type","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "component","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}'; + $custom_code->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_code.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","component","target","type","comment_type","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "component","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}'; // Set the object into the content types table. $custom_code_Inserted = $db->insertObject('#__content_types', $custom_code); @@ -2129,9 +2143,9 @@ class com_componentbuilderInstallerScript $snippet->type_title = 'Componentbuilder Snippet'; $snippet->type_alias = 'com_componentbuilder.snippet'; $snippet->table = '{"special": {"dbtable": "#__componentbuilder_snippet","key": "id","type": "Snippet","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $snippet->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","url":"url","type":"type","heading":"heading","description":"description","usage":"usage","snippet":"snippet"}}'; + $snippet->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","url":"url","type":"type","heading":"heading","description":"description","usage":"usage","snippet":"snippet"}}'; $snippet->router = 'ComponentbuilderHelperRoute::getSnippetRoute'; - $snippet->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/snippet.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $snippet->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/snippet.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $snippet_Inserted = $db->insertObject('#__content_types', $snippet); @@ -2141,9 +2155,9 @@ class com_componentbuilderInstallerScript $field->type_title = 'Componentbuilder Field'; $field->type_alias = 'com_componentbuilder.field'; $field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datalenght_other":"datalenght_other","datadefault":"datadefault","add_css_view":"add_css_view","datadefault_other":"datadefault_other","datalenght":"datalenght","add_css_views":"add_css_views","add_javascript_view_footer":"add_javascript_view_footer","xml":"xml","add_javascript_views_footer":"add_javascript_views_footer","not_required":"not_required","css_view":"css_view","css_views":"css_views","store":"store","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer"}}'; + $field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datalenght_other":"datalenght_other","datadefault":"datadefault","add_css_view":"add_css_view","datadefault_other":"datadefault_other","datalenght":"datalenght","add_css_views":"add_css_views","add_javascript_view_footer":"add_javascript_view_footer","xml":"xml","add_javascript_views_footer":"add_javascript_views_footer","not_required":"not_required","css_view":"css_view","css_views":"css_views","store":"store","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer"}}'; $field->router = 'ComponentbuilderHelperRoute::getFieldRoute'; - $field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_css_view","add_css_views","add_javascript_view_footer","add_javascript_views_footer","not_required","catid","store"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}'; + $field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_css_view","add_css_views","add_javascript_view_footer","add_javascript_views_footer","not_required","catid","store"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $field_Inserted = $db->insertObject('#__content_types', $field); @@ -2165,9 +2179,9 @@ class com_componentbuilderInstallerScript $fieldtype->type_title = 'Componentbuilder Fieldtype'; $fieldtype->type_alias = 'com_componentbuilder.fieldtype'; $fieldtype->table = '{"special": {"dbtable": "#__componentbuilder_fieldtype","key": "id","type": "Fieldtype","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $fieldtype->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","description":"description","short_description":"short_description"}}'; + $fieldtype->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","description":"description","short_description":"short_description"}}'; $fieldtype->router = 'ComponentbuilderHelperRoute::getFieldtypeRoute'; - $fieldtype->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/fieldtype.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","catid"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $fieldtype->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/fieldtype.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","catid"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $fieldtype_Inserted = $db->insertObject('#__content_types', $fieldtype); @@ -2189,9 +2203,9 @@ class com_componentbuilderInstallerScript $language_translation->type_title = 'Componentbuilder Language_translation'; $language_translation->type_alias = 'com_componentbuilder.language_translation'; $language_translation->table = '{"special": {"dbtable": "#__componentbuilder_language_translation","key": "id","type": "Language_translation","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $language_translation->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "entranslation","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"entranslation":"entranslation","components":"components"}}'; + $language_translation->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "entranslation","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"entranslation":"entranslation","components":"components"}}'; $language_translation->router = 'ComponentbuilderHelperRoute::getLanguage_translationRoute'; - $language_translation->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/language_translation.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "components","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}'; + $language_translation->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/language_translation.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "components","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}'; // Set the object into the content types table. $language_translation_Inserted = $db->insertObject('#__content_types', $language_translation); @@ -2201,9 +2215,9 @@ class com_componentbuilderInstallerScript $language->type_title = 'Componentbuilder Language'; $language->type_alias = 'com_componentbuilder.language'; $language->table = '{"special": {"dbtable": "#__componentbuilder_language","key": "id","type": "Language","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $language->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","langtag":"langtag"}}'; + $language->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","langtag":"langtag"}}'; $language->router = 'ComponentbuilderHelperRoute::getLanguageRoute'; - $language->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/language.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $language->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/language.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $language_Inserted = $db->insertObject('#__content_types', $language); @@ -2213,9 +2227,9 @@ class com_componentbuilderInstallerScript $ftp->type_title = 'Componentbuilder Ftp'; $ftp->type_alias = 'com_componentbuilder.ftp'; $ftp->table = '{"special": {"dbtable": "#__componentbuilder_ftp","key": "id","type": "Ftp","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $ftp->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","signature":"signature"}}'; + $ftp->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","signature":"signature"}}'; $ftp->router = 'ComponentbuilderHelperRoute::getFtpRoute'; - $ftp->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/ftp.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $ftp->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/ftp.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $ftp_Inserted = $db->insertObject('#__content_types', $ftp); @@ -2225,9 +2239,9 @@ class com_componentbuilderInstallerScript $help_document->type_title = 'Componentbuilder Help_document'; $help_document->type_alias = 'com_componentbuilder.help_document'; $help_document->table = '{"special": {"dbtable": "#__componentbuilder_help_document","key": "id","type": "Help_document","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","target":"target","content":"content","alias":"alias","article":"article","url":"url","not_required":"not_required"}}'; + $help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","target":"target","content":"content","alias":"alias","article":"article","url":"url","not_required":"not_required"}}'; $help_document->router = 'ComponentbuilderHelperRoute::getHelp_documentRoute'; - $help_document->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","location","target","article","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}'; + $help_document->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","location","target","article","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}'; // Set the object into the content types table. $help_document_Inserted = $db->insertObject('#__content_types', $help_document); @@ -2237,9 +2251,9 @@ class com_componentbuilderInstallerScript $admin_fields->type_title = 'Componentbuilder Admin_fields'; $admin_fields->type_alias = 'com_componentbuilder.admin_fields'; $admin_fields->table = '{"special": {"dbtable": "#__componentbuilder_admin_fields","key": "id","type": "Admin_fields","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_fields->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "admin_view","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"admin_view":"admin_view"}}'; + $admin_fields->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "admin_view","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"admin_view":"admin_view"}}'; $admin_fields->router = 'ComponentbuilderHelperRoute::getAdmin_fieldsRoute'; - $admin_fields->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_fields.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","admin_view"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "admin_view","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; + $admin_fields->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_fields.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","admin_view"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "admin_view","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; // Set the object into the content types table. $admin_fields_Inserted = $db->insertObject('#__content_types', $admin_fields); @@ -2249,9 +2263,9 @@ class com_componentbuilderInstallerScript $admin_fields_conditions->type_title = 'Componentbuilder Admin_fields_conditions'; $admin_fields_conditions->type_alias = 'com_componentbuilder.admin_fields_conditions'; $admin_fields_conditions->table = '{"special": {"dbtable": "#__componentbuilder_admin_fields_conditions","key": "id","type": "Admin_fields_conditions","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_fields_conditions->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "admin_view","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"admin_view":"admin_view"}}'; + $admin_fields_conditions->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "admin_view","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"admin_view":"admin_view"}}'; $admin_fields_conditions->router = 'ComponentbuilderHelperRoute::getAdmin_fields_conditionsRoute'; - $admin_fields_conditions->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_fields_conditions.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","admin_view"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "admin_view","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; + $admin_fields_conditions->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_fields_conditions.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","admin_view"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "admin_view","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; // Set the object into the content types table. $admin_fields_conditions_Inserted = $db->insertObject('#__content_types', $admin_fields_conditions); @@ -2316,9 +2330,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Check if admin_view type is already in content_type DB. $admin_view_id = null; @@ -2345,9 +2359,9 @@ class com_componentbuilderInstallerScript $custom_admin_view->type_title = 'Componentbuilder Custom_admin_view'; $custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view'; $custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_php_jview":"add_php_jview","add_php_view":"add_php_view","add_css_document":"add_css_document","icon":"icon","add_php_jview_display":"add_php_jview_display","add_js_document":"add_js_document","php_controller":"php_controller","add_css":"add_css","default":"default","add_php_document":"add_php_document","php_model":"php_model","not_required":"not_required","php_document":"php_document","custom_get":"custom_get","php_view":"php_view","main_get":"main_get","php_jview_display":"php_jview_display","dynamic_get":"dynamic_get","php_jview":"php_jview","js_document":"js_document","add_custom_button":"add_custom_button","css_document":"css_document","css":"css"}}'; + $custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_php_jview":"add_php_jview","add_php_view":"add_php_view","add_css_document":"add_css_document","icon":"icon","add_php_jview_display":"add_php_jview_display","add_js_document":"add_js_document","php_controller":"php_controller","add_css":"add_css","default":"default","add_php_document":"add_php_document","php_model":"php_model","not_required":"not_required","php_document":"php_document","custom_get":"custom_get","php_view":"php_view","main_get":"main_get","php_jview_display":"php_jview_display","dynamic_get":"dynamic_get","php_jview":"php_jview","js_document":"js_document","add_custom_button":"add_custom_button","css_document":"css_document","css":"css"}}'; $custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute'; - $custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_jview","add_php_view","add_css_document","add_php_jview_display","add_js_document","add_css","add_php_document","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; + $custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_jview","add_php_view","add_css_document","add_php_jview_display","add_js_document","add_css","add_php_document","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; // Check if custom_admin_view type is already in content_type DB. $custom_admin_view_id = null; @@ -2374,9 +2388,9 @@ class com_componentbuilderInstallerScript $site_view->type_title = 'Componentbuilder Site_view'; $site_view->type_alias = 'com_componentbuilder.site_view'; $site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css":"css","add_php_document":"add_php_document","js_document":"js_document","css_document":"css_document","default":"default","php_ajaxmethod":"php_ajaxmethod","add_php_jview_display":"add_php_jview_display","add_php_view":"add_php_view","php_model":"php_model","add_php_jview":"add_php_jview","not_required":"not_required","custom_get":"custom_get","add_js_document":"add_js_document","main_get":"main_get","add_css_document":"add_css_document","dynamic_get":"dynamic_get","add_css":"add_css","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","button_position":"button_position","php_document":"php_document","php_view":"php_view","php_jview_display":"php_jview_display","php_controller":"php_controller","php_jview":"php_jview"}}'; + $site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css":"css","add_php_document":"add_php_document","js_document":"js_document","css_document":"css_document","default":"default","php_ajaxmethod":"php_ajaxmethod","add_php_jview_display":"add_php_jview_display","add_php_view":"add_php_view","php_model":"php_model","add_php_jview":"add_php_jview","not_required":"not_required","custom_get":"custom_get","add_js_document":"add_js_document","main_get":"main_get","add_css_document":"add_css_document","dynamic_get":"dynamic_get","add_css":"add_css","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","button_position":"button_position","php_document":"php_document","php_view":"php_view","php_jview_display":"php_jview_display","php_controller":"php_controller","php_jview":"php_jview"}}'; $site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute'; - $site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_js_document","main_get","add_css_document","dynamic_get","add_css","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; + $site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_js_document","main_get","add_css_document","dynamic_get","add_css","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; // Check if site_view type is already in content_type DB. $site_view_id = null; @@ -2403,9 +2417,9 @@ class com_componentbuilderInstallerScript $template->type_title = 'Componentbuilder Template'; $template->type_alias = 'com_componentbuilder.template'; $template->table = '{"special": {"dbtable": "#__componentbuilder_template","key": "id","type": "Template","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","dynamic_get":"dynamic_get","add_php_view":"add_php_view","template":"template","not_required":"not_required","php_view":"php_view"}}'; + $template->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","snippet":"snippet","dynamic_get":"dynamic_get","add_php_view":"add_php_view","template":"template","not_required":"not_required","php_view":"php_view"}}'; $template->router = 'ComponentbuilderHelperRoute::getTemplateRoute'; - $template->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/template.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","dynamic_get","add_php_view","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; + $template->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/template.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","dynamic_get","add_php_view","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; // Check if template type is already in content_type DB. $template_id = null; @@ -2432,9 +2446,9 @@ class com_componentbuilderInstallerScript $layout->type_title = 'Componentbuilder Layout'; $layout->type_alias = 'com_componentbuilder.layout'; $layout->table = '{"special": {"dbtable": "#__componentbuilder_layout","key": "id","type": "Layout","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","add_php_view":"add_php_view","layout":"layout","not_required":"not_required","php_view":"php_view"}}'; + $layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","add_php_view":"add_php_view","layout":"layout","not_required":"not_required","php_view":"php_view"}}'; $layout->router = 'ComponentbuilderHelperRoute::getLayoutRoute'; - $layout->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/layout.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","dynamic_get","snippet","add_php_view","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"}]}'; + $layout->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/layout.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","dynamic_get","snippet","add_php_view","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"}]}'; // Check if layout type is already in content_type DB. $layout_id = null; @@ -2461,9 +2475,9 @@ class com_componentbuilderInstallerScript $dynamic_get->type_title = 'Componentbuilder Dynamic_get'; $dynamic_get->type_alias = 'com_componentbuilder.dynamic_get'; $dynamic_get->table = '{"special": {"dbtable": "#__componentbuilder_dynamic_get","key": "id","type": "Dynamic_get","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","add_php_before_getitem":"add_php_before_getitem","addcalculation":"addcalculation","db_selection":"db_selection","add_php_getlistquery":"add_php_getlistquery","view_table_main":"view_table_main","add_php_after_getitem":"add_php_after_getitem","db_table_main":"db_table_main","php_custom_get":"php_custom_get","view_selection":"view_selection","php_before_getitem":"php_before_getitem","add_php_before_getitems":"add_php_before_getitems","php_after_getitem":"php_after_getitem","add_php_after_getitems":"add_php_after_getitems","php_getlistquery":"php_getlistquery","getcustom":"getcustom","php_before_getitems":"php_before_getitems","pagination":"pagination","php_after_getitems":"php_after_getitems","not_required":"not_required","php_calculation":"php_calculation"}}'; + $dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","add_php_before_getitem":"add_php_before_getitem","addcalculation":"addcalculation","db_selection":"db_selection","add_php_getlistquery":"add_php_getlistquery","view_table_main":"view_table_main","add_php_after_getitem":"add_php_after_getitem","db_table_main":"db_table_main","php_custom_get":"php_custom_get","view_selection":"view_selection","php_before_getitem":"php_before_getitem","add_php_before_getitems":"add_php_before_getitems","php_after_getitem":"php_after_getitem","add_php_after_getitems":"add_php_after_getitems","php_getlistquery":"php_getlistquery","getcustom":"getcustom","php_before_getitems":"php_before_getitems","pagination":"pagination","php_after_getitems":"php_after_getitems","not_required":"not_required","php_calculation":"php_calculation"}}'; $dynamic_get->router = 'ComponentbuilderHelperRoute::getDynamic_getRoute'; - $dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","main_source","gettype","add_php_before_getitem","add_php_getlistquery","view_table_main","add_php_after_getitem","add_php_before_getitems","add_php_after_getitems","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; + $dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","main_source","gettype","add_php_before_getitem","add_php_getlistquery","view_table_main","add_php_after_getitem","add_php_before_getitems","add_php_after_getitems","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; // Check if dynamic_get type is already in content_type DB. $dynamic_get_id = null; @@ -2490,9 +2504,9 @@ class com_componentbuilderInstallerScript $custom_code->type_title = 'Componentbuilder Custom_code'; $custom_code->type_alias = 'com_componentbuilder.custom_code'; $custom_code->table = '{"special": {"dbtable": "#__componentbuilder_custom_code","key": "id","type": "Custom_code","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","hashtarget":"hashtarget","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","function_name":"function_name","from_line":"from_line","system_name":"system_name","not_required":"not_required"}}'; + $custom_code->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "component","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"component":"component","path":"path","target":"target","type":"type","comment_type":"comment_type","hashtarget":"hashtarget","code":"code","hashendtarget":"hashendtarget","to_line":"to_line","function_name":"function_name","from_line":"from_line","system_name":"system_name","not_required":"not_required"}}'; $custom_code->router = 'ComponentbuilderHelperRoute::getCustom_codeRoute'; - $custom_code->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_code.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","component","target","type","comment_type","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "component","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}'; + $custom_code->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_code.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","component","target","type","comment_type","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "component","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}'; // Check if custom_code type is already in content_type DB. $custom_code_id = null; @@ -2519,9 +2533,9 @@ class com_componentbuilderInstallerScript $snippet->type_title = 'Componentbuilder Snippet'; $snippet->type_alias = 'com_componentbuilder.snippet'; $snippet->table = '{"special": {"dbtable": "#__componentbuilder_snippet","key": "id","type": "Snippet","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $snippet->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","url":"url","type":"type","heading":"heading","description":"description","usage":"usage","snippet":"snippet"}}'; + $snippet->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","url":"url","type":"type","heading":"heading","description":"description","usage":"usage","snippet":"snippet"}}'; $snippet->router = 'ComponentbuilderHelperRoute::getSnippetRoute'; - $snippet->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/snippet.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $snippet->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/snippet.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Check if snippet type is already in content_type DB. $snippet_id = null; @@ -2548,9 +2562,9 @@ class com_componentbuilderInstallerScript $field->type_title = 'Componentbuilder Field'; $field->type_alias = 'com_componentbuilder.field'; $field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datalenght_other":"datalenght_other","datadefault":"datadefault","add_css_view":"add_css_view","datadefault_other":"datadefault_other","datalenght":"datalenght","add_css_views":"add_css_views","add_javascript_view_footer":"add_javascript_view_footer","xml":"xml","add_javascript_views_footer":"add_javascript_views_footer","not_required":"not_required","css_view":"css_view","css_views":"css_views","store":"store","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer"}}'; + $field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datalenght_other":"datalenght_other","datadefault":"datadefault","add_css_view":"add_css_view","datadefault_other":"datadefault_other","datalenght":"datalenght","add_css_views":"add_css_views","add_javascript_view_footer":"add_javascript_view_footer","xml":"xml","add_javascript_views_footer":"add_javascript_views_footer","not_required":"not_required","css_view":"css_view","css_views":"css_views","store":"store","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer"}}'; $field->router = 'ComponentbuilderHelperRoute::getFieldRoute'; - $field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_css_view","add_css_views","add_javascript_view_footer","add_javascript_views_footer","not_required","catid","store"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}'; + $field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_css_view","add_css_views","add_javascript_view_footer","add_javascript_views_footer","not_required","catid","store"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}'; // Check if field type is already in content_type DB. $field_id = null; @@ -2606,9 +2620,9 @@ class com_componentbuilderInstallerScript $fieldtype->type_title = 'Componentbuilder Fieldtype'; $fieldtype->type_alias = 'com_componentbuilder.fieldtype'; $fieldtype->table = '{"special": {"dbtable": "#__componentbuilder_fieldtype","key": "id","type": "Fieldtype","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $fieldtype->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","description":"description","short_description":"short_description"}}'; + $fieldtype->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","description":"description","short_description":"short_description"}}'; $fieldtype->router = 'ComponentbuilderHelperRoute::getFieldtypeRoute'; - $fieldtype->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/fieldtype.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","catid"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $fieldtype->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/fieldtype.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","catid"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Check if fieldtype type is already in content_type DB. $fieldtype_id = null; @@ -2664,9 +2678,9 @@ class com_componentbuilderInstallerScript $language_translation->type_title = 'Componentbuilder Language_translation'; $language_translation->type_alias = 'com_componentbuilder.language_translation'; $language_translation->table = '{"special": {"dbtable": "#__componentbuilder_language_translation","key": "id","type": "Language_translation","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $language_translation->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "entranslation","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"entranslation":"entranslation","components":"components"}}'; + $language_translation->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "entranslation","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"entranslation":"entranslation","components":"components"}}'; $language_translation->router = 'ComponentbuilderHelperRoute::getLanguage_translationRoute'; - $language_translation->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/language_translation.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "components","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}'; + $language_translation->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/language_translation.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "components","targetTable": "#__componentbuilder_joomla_component","targetColumn": "id","displayColumn": "system_name"}]}'; // Check if language_translation type is already in content_type DB. $language_translation_id = null; @@ -2693,9 +2707,9 @@ class com_componentbuilderInstallerScript $language->type_title = 'Componentbuilder Language'; $language->type_alias = 'com_componentbuilder.language'; $language->table = '{"special": {"dbtable": "#__componentbuilder_language","key": "id","type": "Language","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $language->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","langtag":"langtag"}}'; + $language->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","langtag":"langtag"}}'; $language->router = 'ComponentbuilderHelperRoute::getLanguageRoute'; - $language->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/language.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $language->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/language.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Check if language type is already in content_type DB. $language_id = null; @@ -2722,9 +2736,9 @@ class com_componentbuilderInstallerScript $ftp->type_title = 'Componentbuilder Ftp'; $ftp->type_alias = 'com_componentbuilder.ftp'; $ftp->table = '{"special": {"dbtable": "#__componentbuilder_ftp","key": "id","type": "Ftp","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $ftp->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","signature":"signature"}}'; + $ftp->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","signature":"signature"}}'; $ftp->router = 'ComponentbuilderHelperRoute::getFtpRoute'; - $ftp->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/ftp.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $ftp->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/ftp.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Check if ftp type is already in content_type DB. $ftp_id = null; @@ -2751,9 +2765,9 @@ class com_componentbuilderInstallerScript $help_document->type_title = 'Componentbuilder Help_document'; $help_document->type_alias = 'com_componentbuilder.help_document'; $help_document->table = '{"special": {"dbtable": "#__componentbuilder_help_document","key": "id","type": "Help_document","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","target":"target","content":"content","alias":"alias","article":"article","url":"url","not_required":"not_required"}}'; + $help_document->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "title","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "content","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"title":"title","type":"type","groups":"groups","location":"location","admin_view":"admin_view","site_view":"site_view","target":"target","content":"content","alias":"alias","article":"article","url":"url","not_required":"not_required"}}'; $help_document->router = 'ComponentbuilderHelperRoute::getHelp_documentRoute'; - $help_document->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","location","target","article","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}'; + $help_document->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","location","target","article","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}'; // Check if help_document type is already in content_type DB. $help_document_id = null; @@ -2780,9 +2794,9 @@ class com_componentbuilderInstallerScript $admin_fields->type_title = 'Componentbuilder Admin_fields'; $admin_fields->type_alias = 'com_componentbuilder.admin_fields'; $admin_fields->table = '{"special": {"dbtable": "#__componentbuilder_admin_fields","key": "id","type": "Admin_fields","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_fields->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "admin_view","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"admin_view":"admin_view"}}'; + $admin_fields->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "admin_view","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"admin_view":"admin_view"}}'; $admin_fields->router = 'ComponentbuilderHelperRoute::getAdmin_fieldsRoute'; - $admin_fields->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_fields.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","admin_view"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "admin_view","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; + $admin_fields->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_fields.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","admin_view"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "admin_view","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; // Check if admin_fields type is already in content_type DB. $admin_fields_id = null; @@ -2809,9 +2823,9 @@ class com_componentbuilderInstallerScript $admin_fields_conditions->type_title = 'Componentbuilder Admin_fields_conditions'; $admin_fields_conditions->type_alias = 'com_componentbuilder.admin_fields_conditions'; $admin_fields_conditions->table = '{"special": {"dbtable": "#__componentbuilder_admin_fields_conditions","key": "id","type": "Admin_fields_conditions","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_fields_conditions->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "admin_view","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"admin_view":"admin_view"}}'; + $admin_fields_conditions->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "admin_view","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"admin_view":"admin_view"}}'; $admin_fields_conditions->router = 'ComponentbuilderHelperRoute::getAdmin_fields_conditionsRoute'; - $admin_fields_conditions->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_fields_conditions.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","admin_view"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "admin_view","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; + $admin_fields_conditions->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_fields_conditions.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","admin_view"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "admin_view","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}'; // Check if admin_fields_conditions type is already in content_type DB. $admin_fields_conditions_id = null; diff --git a/site/assets/css/site.css b/site/assets/css/site.css index 3d8340fdc..e4660bd83 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 0b300c7c0..0b9f8a9c5 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.js diff --git a/site/componentbuilder.php b/site/componentbuilder.php index 0b633ee76..3938a7874 100644 --- a/site/componentbuilder.php +++ b/site/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/controller.php b/site/controller.php index d33552c34..7f97061dd 100644 --- a/site/controller.php +++ b/site/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/site/controllers/api.php b/site/controllers/api.php index 35e43642c..56193db55 100644 --- a/site/controllers/api.php +++ b/site/controllers/api.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage api.php diff --git a/site/controllers/help.php b/site/controllers/help.php index 06ec927fb..7f9ebbc7d 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/site/helpers/category.php b/site/helpers/category.php index 8a0d69c7d..f108f5b92 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage category.php diff --git a/site/helpers/categoryfields.php b/site/helpers/categoryfields.php index a37a3f101..5547a0efd 100644 --- a/site/helpers/categoryfields.php +++ b/site/helpers/categoryfields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfields.php diff --git a/site/helpers/categoryfieldtypes.php b/site/helpers/categoryfieldtypes.php index 951454a39..e10473df5 100644 --- a/site/helpers/categoryfieldtypes.php +++ b/site/helpers/categoryfieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfieldtypes.php diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index 1d68364ac..7d48a0a04 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 42aa47aa5..fda934257 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 4fa374d5e..79a6e8e37 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage route.php diff --git a/site/router.php b/site/router.php index 94ca5231f..243c9cdc8 100644 --- a/site/router.php +++ b/site/router.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage router.php diff --git a/site/views/api/submitbutton.js b/site/views/api/submitbutton.js index 911dd5f65..98cc09745 100644 --- a/site/views/api/submitbutton.js +++ b/site/views/api/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 16th October, 2017 + @build 18th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js -- 2.40.1 From d6965f304c0bff8611c83504d077131f7d8f6099 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 20 Oct 2017 18:17:46 +0200 Subject: [PATCH 13/14] Fixed JCB package Import. Fixed snippet display in site view. Imporved export of JCB packages. --- README.md | 4 +- admin/README.txt | 4 +- admin/assets/css/admin.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/dynamic_get.css | 4 +- admin/assets/css/dynamic_gets.css | 4 +- admin/assets/css/joomla_component.css | 4 +- admin/assets/css/joomla_components.css | 4 +- admin/assets/js/admin.js | 2 +- admin/componentbuilder.php | 2 +- admin/controller.php | 2 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/componentbuilder.php | 2 +- admin/controllers/dynamic_get.php | 4 +- admin/controllers/dynamic_gets.php | 4 +- admin/controllers/help.php | 2 +- admin/controllers/import.php | 2 +- .../controllers/import_joomla_components.php | 2 +- admin/controllers/joomla_component.php | 4 +- admin/controllers/joomla_components.php | 4 +- admin/helpers/compiler/a_Get.php | 2 +- admin/helpers/componentbuilder.php | 2 +- admin/helpers/componentbuilderemail.php | 2 +- admin/helpers/headercheck.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/indenter.php | 2 +- admin/helpers/js.php | 2 +- admin/helpers/minify.php | 2 +- .../en-GB/en-GB.com_componentbuilder.ini | 14 +- admin/layouts/admin_fields/fields_above.php | 2 +- .../layouts/admin_fields/fields_fullwidth.php | 2 +- admin/layouts/admin_fields/publishing.php | 2 +- admin/layouts/admin_fields/publlshing.php | 2 +- .../conditions_above.php | 2 +- .../conditions_fullwidth.php | 2 +- .../admin_fields_conditions/publishing.php | 2 +- .../admin_fields_conditions/publlshing.php | 2 +- admin/layouts/admin_view/css_fullwidth.php | 2 +- .../admin_view/custom_buttons_fullwidth.php | 2 +- .../admin_view/custom_buttons_left.php | 2 +- .../admin_view/custom_import_fullwidth.php | 2 +- admin/layouts/admin_view/details_above.php | 2 +- admin/layouts/admin_view/details_left.php | 2 +- admin/layouts/admin_view/details_right.php | 2 +- admin/layouts/admin_view/details_under.php | 2 +- .../fields_conditions_fullwidth.php | 2 +- .../admin_view/fields_conditions_left.php | 2 +- .../admin_view/fields_conditions_right.php | 2 +- .../admin_view/javascript_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_left.php | 2 +- admin/layouts/admin_view/php_fullwidth.php | 2 +- admin/layouts/admin_view/publishing.php | 2 +- admin/layouts/admin_view/publlshing.php | 2 +- .../layouts/admin_view/settings_fullwidth.php | 2 +- admin/layouts/batchselection.php | 2 +- .../custom_buttons_fullwidth.php | 2 +- .../custom_admin_view/custom_buttons_left.php | 2 +- .../custom_script_fullwidth.php | 2 +- .../custom_admin_view/details_above.php | 2 +- .../custom_admin_view/details_fullwidth.php | 2 +- .../custom_admin_view/details_left.php | 2 +- .../custom_admin_view/details_right.php | 2 +- .../custom_admin_view/details_rightside.php | 2 +- .../custom_admin_view/details_under.php | 2 +- .../linked_components_fullwidth.php | 2 +- .../layouts/custom_admin_view/publishing.php | 2 +- .../layouts/custom_admin_view/publlshing.php | 2 +- admin/layouts/custom_code/details_above.php | 2 +- .../layouts/custom_code/details_fullwidth.php | 2 +- admin/layouts/custom_code/details_left.php | 2 +- admin/layouts/custom_code/details_right.php | 2 +- admin/layouts/custom_code/details_under.php | 2 +- admin/layouts/custom_code/publishing.php | 2 +- admin/layouts/custom_code/publlshing.php | 2 +- .../layouts/dynamic_get/abacus_fullwidth.php | 2 +- admin/layouts/dynamic_get/abacus_left.php | 2 +- .../dynamic_get/custom_script_fullwidth.php | 2 +- admin/layouts/dynamic_get/joint_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_above.php | 2 +- admin/layouts/dynamic_get/main_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_left.php | 2 +- admin/layouts/dynamic_get/main_right.php | 2 +- admin/layouts/dynamic_get/main_under.php | 2 +- admin/layouts/dynamic_get/publishing.php | 2 +- admin/layouts/dynamic_get/publlshing.php | 2 +- admin/layouts/field/details_fullwidth.php | 2 +- admin/layouts/field/details_left.php | 2 +- admin/layouts/field/details_right.php | 2 +- admin/layouts/field/details_under.php | 2 +- admin/layouts/field/publishing.php | 2 +- admin/layouts/field/publlshing.php | 2 +- admin/layouts/field/scripts_left.php | 2 +- admin/layouts/field/scripts_right.php | 2 +- admin/layouts/fieldtype/details_fullwidth.php | 2 +- admin/layouts/fieldtype/details_left.php | 2 +- admin/layouts/fieldtype/details_right.php | 2 +- admin/layouts/fieldtype/fields_fullwidth.php | 2 +- admin/layouts/fieldtype/publishing.php | 2 +- admin/layouts/fieldtype/publlshing.php | 2 +- admin/layouts/ftp/details_above.php | 2 +- admin/layouts/ftp/details_fullwidth.php | 2 +- .../ftp/linked_components_fullwidth.php | 2 +- admin/layouts/ftp/publishing.php | 2 +- admin/layouts/ftp/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- .../admin_views_fullwidth.php | 2 +- .../custom_admin_views_fullwidth.php | 2 +- .../joomla_component/details_above.php | 2 +- .../layouts/joomla_component/details_left.php | 2 +- .../joomla_component/details_right.php | 2 +- .../joomla_component/details_under.php | 2 +- .../dynamic_build_beta_fullwidth.php | 2 +- .../dynamic_integration_fullwidth.php | 2 +- .../libs_helpers_fullwidth.php | 2 +- admin/layouts/joomla_component/metadata.php | 2 +- .../joomla_component/mysql_fullwidth.php | 2 +- .../joomla_component/php_fullwidth.php | 2 +- admin/layouts/joomla_component/publishing.php | 2 +- .../layouts/joomla_component/readme_left.php | 2 +- .../layouts/joomla_component/readme_right.php | 2 +- .../joomla_component/settings_left.php | 2 +- .../joomla_component/settings_right.php | 2 +- .../joomla_component/site_views_fullwidth.php | 2 +- .../translation_fullwidth.php | 2 +- admin/layouts/language/details_left.php | 2 +- admin/layouts/language/details_right.php | 2 +- admin/layouts/language/publishing.php | 2 +- admin/layouts/language/publlshing.php | 2 +- .../language_translation/details_above.php | 2 +- .../details_fullwidth.php | 2 +- .../language_translation/publishing.php | 2 +- .../language_translation/publlshing.php | 2 +- .../layout/custom_script_fullwidth.php | 2 +- admin/layouts/layout/details_fullwidth.php | 2 +- admin/layouts/layout/details_left.php | 2 +- admin/layouts/layout/details_right.php | 2 +- admin/layouts/layout/details_rightside.php | 2 +- admin/layouts/layout/details_under.php | 2 +- admin/layouts/layout/publishing.php | 2 +- admin/layouts/layout/publlshing.php | 2 +- .../site_view/custom_buttons_fullwidth.php | 2 +- .../layouts/site_view/custom_buttons_left.php | 2 +- .../site_view/custom_buttons_right.php | 2 +- admin/layouts/site_view/details_above.php | 2 +- admin/layouts/site_view/details_fullwidth.php | 2 +- admin/layouts/site_view/details_left.php | 2 +- admin/layouts/site_view/details_right.php | 2 +- admin/layouts/site_view/details_rightside.php | 2 +- admin/layouts/site_view/details_under.php | 2 +- .../site_view/javascript_css_fullwidth.php | 2 +- .../site_view/linked_components_fullwidth.php | 2 +- admin/layouts/site_view/php_fullwidth.php | 2 +- admin/layouts/site_view/publishing.php | 2 +- admin/layouts/site_view/publlshing.php | 2 +- admin/layouts/snippet/details_above.php | 2 +- admin/layouts/snippet/details_left.php | 2 +- admin/layouts/snippet/details_right.php | 2 +- admin/layouts/snippet/publishing.php | 2 +- admin/layouts/snippet/publlshing.php | 2 +- .../template/custom_script_fullwidth.php | 2 +- admin/layouts/template/details_fullwidth.php | 2 +- admin/layouts/template/details_left.php | 2 +- admin/layouts/template/details_right.php | 2 +- admin/layouts/template/details_rightside.php | 2 +- admin/layouts/template/details_under.php | 2 +- admin/layouts/template/publishing.php | 2 +- admin/layouts/template/publlshing.php | 2 +- admin/models/ajax.php | 4 +- admin/models/componentbuilder.php | 2 +- admin/models/dynamic_get.php | 4 +- admin/models/dynamic_gets.php | 4 +- admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/adminviews.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/component.php | 2 +- admin/models/fields/components.php | 2 +- admin/models/fields/customadminviews.php | 2 +- admin/models/fields/customfilelist.php | 2 +- admin/models/fields/customfolderlist.php | 2 +- admin/models/fields/customgets.php | 2 +- admin/models/fields/dbtables.php | 2 +- admin/models/fields/dynamicget.php | 2 +- admin/models/fields/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldtypes.php | 2 +- admin/models/fields/ftps.php | 2 +- admin/models/fields/lang.php | 2 +- admin/models/fields/maingets.php | 2 +- admin/models/fields/matchfield.php | 2 +- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/fields/siteviews.php | 2 +- admin/models/fields/snippets.php | 2 +- admin/models/fields/targetfields.php | 2 +- admin/models/fields/viewtabs.php | 2 +- admin/models/forms/dynamic_get.js | 4 +- admin/models/forms/joomla_component.js | 4 +- admin/models/import.php | 2 +- admin/models/import_joomla_components.php | 735 +++++++++--------- admin/models/joomla_component.php | 4 +- admin/models/joomla_components.php | 146 ++-- admin/tables/dynamic_get.php | 4 +- admin/tables/joomla_component.php | 4 +- admin/views/componentbuilder/tmpl/default.php | 2 +- ...ult_issues_the_closed_issues_on_github.php | 2 +- ...fault_issues_the_open_issues_on_github.php | 2 +- .../componentbuilder/tmpl/default_main.php | 2 +- .../tmpl/default_readme_information.php | 2 +- .../tmpl/default_releases_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../componentbuilder/tmpl/default_vdm.php | 2 +- .../tmpl/default_wiki_tutorials.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/dynamic_get/submitbutton.js | 4 +- admin/views/dynamic_get/tmpl/edit.php | 4 +- admin/views/dynamic_get/view.html.php | 4 +- admin/views/dynamic_gets/tmpl/default.php | 4 +- .../dynamic_gets/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/dynamic_gets/tmpl/default_body.php | 4 +- .../views/dynamic_gets/tmpl/default_foot.php | 4 +- .../views/dynamic_gets/tmpl/default_head.php | 4 +- .../dynamic_gets/tmpl/default_toolbar.php | 4 +- admin/views/dynamic_gets/view.html.php | 4 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- .../import_joomla_components/tmpl/default.php | 2 +- .../import_joomla_components/view.html.php | 2 +- admin/views/joomla_component/submitbutton.js | 4 +- admin/views/joomla_component/tmpl/edit.php | 4 +- admin/views/joomla_component/view.html.php | 4 +- .../views/joomla_components/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../joomla_components/tmpl/default_body.php | 4 +- .../joomla_components/tmpl/default_foot.php | 4 +- .../joomla_components/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/joomla_components/view.html.php | 4 +- componentbuilder.xml | 2 +- script.php | 2 +- site/assets/css/site.css | 2 +- site/assets/js/site.js | 2 +- site/componentbuilder.php | 2 +- site/controller.php | 2 +- site/controllers/api.php | 2 +- site/controllers/help.php | 2 +- site/helpers/category.php | 2 +- site/helpers/categoryfields.php | 2 +- site/helpers/categoryfieldtypes.php | 2 +- site/helpers/componentbuilder.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- site/router.php | 2 +- site/views/api/submitbutton.js | 2 +- 262 files changed, 753 insertions(+), 740 deletions(-) diff --git a/README.md b/README.md index 8b29db15c..4cce98539 100644 --- a/README.md +++ b/README.md @@ -110,11 +110,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 18th October, 2017 ++ *Last Build*: 20th October, 2017 + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **125731** ++ *Line count*: **125744** + *File count*: **742** + *Folder count*: **129** diff --git a/admin/README.txt b/admin/README.txt index 8b29db15c..4cce98539 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -110,11 +110,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 18th October, 2017 ++ *Last Build*: 20th October, 2017 + *Version*: 2.5.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **125731** ++ *Line count*: **125744** + *File count*: **742** + *Folder count*: **129** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index d40af0500..bfd5d74e8 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index bd4174456..21790800d 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/dynamic_get.css b/admin/assets/css/dynamic_get.css index e0e69cc8f..46879470f 100644 --- a/admin/assets/css/dynamic_get.css +++ b/admin/assets/css/dynamic_get.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.css diff --git a/admin/assets/css/dynamic_gets.css b/admin/assets/css/dynamic_gets.css index 90aa92346..aa575fae5 100644 --- a/admin/assets/css/dynamic_gets.css +++ b/admin/assets/css/dynamic_gets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.css diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index 4e81ea98e..3ffeda6e0 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.css diff --git a/admin/assets/css/joomla_components.css b/admin/assets/css/joomla_components.css index ad88aa789..a2f003053 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index fd3b3493e..e365d231c 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.js diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 4cb07f498..6838233b8 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 8dea4a695..1a6c50d24 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 8f3faa2c4..349e822a2 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 9d0432ac6..e8c6ffc16 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index 6189df66a..6d799bfbd 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index d6f1725cb..81c77b8e8 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index c04591f67..fc73a9b6f 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index ae3b0d585..e9735891e 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index 9ba5ea2db..fbdc1be7f 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index 7e8f2a8e7..e3fbb2369 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index 19f85a8ed..a379ac037 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 0573cce2b..64e040c4f 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -1703,7 +1703,7 @@ class Get * * @param int $id The view ID * @param string $table The view table - * + * * @return oject The view data * */ diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 8f806661a..0f302b720 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index dff973ffb..11220b47a 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilderemail.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index fda934257..fb57b6bcf 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index a867826ec..b3b44346e 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index efd1ebc21..2622fb522 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index eec7ea1d1..a37ea87e9 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 6c1f3addb..abe7b43ed 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 1fe68482e..504b6648a 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -856,28 +856,22 @@ COM_COMPONENTBUILDER_BACKUP_LOCAL_DATA_FIRST="Backup Local Data First" COM_COMPONENTBUILDER_BACKUP_WAS_DONE_SUCCESSFULLY="Backup was done successfully" COM_COMPONENTBUILDER_BADMIN_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED="Admin view in %s has id mismatch of selected admin view. So the id:%s was removed!" COM_COMPONENTBUILDER_BASIC_METHOD="Basic Method" -COM_COMPONENTBUILDER_BCOMPONENT_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BCOMPONENTB_SO_THE_IDS_WAS_REMOVED="Component in %s has id mismatch of selected component. So the id:%s was removed!" COM_COMPONENTBUILDER_BCONFIG_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMOVED="Config in %s has id mismatch of selected field. So the id:%s was removed!" COM_COMPONENTBUILDER_BCUSTOM_ADMIN_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BCUSTOM_ADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED="Custom admin view in %s has id mismatch of selected custom admin view. So the id:%s was removed!" COM_COMPONENTBUILDER_BCUSTOM_FILESB_NOT_MOVE_TO_CORRECT_LOCATION="Custom files not move to correct location!" -COM_COMPONENTBUILDER_BCUSTOM_GET_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BDYNAMIC_GETB_SO_THE_IDS_WAS_REMOVED="Custom get in %s has id mismatch of selected dynamic get. So the id:%s was removed!" -COM_COMPONENTBUILDER_BDYNAMIC_GETB_IDS_MISMATCH_IN_BSB="Dynamic get id:%s mismatch in %s." COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE="Be cautious! Do not continue unless you trust the origin of this package!" -COM_COMPONENTBUILDER_BFIELD_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED="Field in %s has id mismatch of selected admin view. So the id:%s was removed!" COM_COMPONENTBUILDER_BFIELD_TYPEB_IDS_MISMATCH_IN_BSB="Field type id:%s mismatch in %s." COM_COMPONENTBUILDER_BFIELD_TYPEB_NOT_SET_FOR_BSB="Field type not set for %s." COM_COMPONENTBUILDER_BGET_THE_KEY_FROMB_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA="Get the key from %s" COM_COMPONENTBUILDER_BIMAGESB_NOT_MOVE_TO_CORRECT_LOCATION="Images not move to correct location!" -COM_COMPONENTBUILDER_BMAIN_GETB_IDS_MISMATCH_IN_BSB="Main get id:%s mismatch in %s." -COM_COMPONENTBUILDER_BMAIN_GETB_NOT_SET_FOR_BSB="Main get not set for %s." -COM_COMPONENTBUILDER_BREPEATABLEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD="Repeatable id:%s mismatch in field:%s, and was removed from the field." +COM_COMPONENTBUILDER_BMULTIPLE_FIELD_REPEATABLE_MODEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD="Multiple Field (repeatable mode) id:%s mismatch in field:%s, and was removed from the field." +COM_COMPONENTBUILDER_BSBS_IN_BSB_HAS_ID_MISMATCH_SO_THE_BSB_WAS_REMOVED="%s->%s in %s has id mismatch. So the %s was removed!" COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS="%s could not be imported%s" COM_COMPONENTBUILDER_BSB_EMCOMPONENT_DETAILSEM="%s component details" -COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED="%s has id mismatch. So the id:%s was removed!" +COM_COMPONENTBUILDER_BSB_HAS_BEEN_IMPORTED="%s has been imported!" +COM_COMPONENTBUILDER_BSB_HAS_BEEN_UPDATED="%s has been updated!" COM_COMPONENTBUILDER_BSITE_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BSITE_VIEWB_SO_THE_IDS_WAS_REMOVED="Site view in %s has id mismatch of selected site view. So the id:%s was removed!" -COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB="Snippet id:%s mismatch in %s." COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED_FOR_THE_FIRST_TIME="Button to create %s will show once %s is saved for the first time." -COM_COMPONENTBUILDER_BVIEW_TABLE_MAINB_IDS_MISMATCH_IN_BSB="View table main id:%s mismatch in %s." COM_COMPONENTBUILDER_CHAIN="Chain" COM_COMPONENTBUILDER_CHECK_YOUR_OWNER_DETAILS_IT_HAS_NOT_BEEN_SET_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="Check your owner details, it has not been set. Open the JCB Global Options, go to the Company tab and add the correct company details there." COM_COMPONENTBUILDER_CLEAR_TMP="Clear tmp" diff --git a/admin/layouts/admin_fields/fields_above.php b/admin/layouts/admin_fields/fields_above.php index 99c1e6aa7..9e61e72a7 100644 --- a/admin/layouts/admin_fields/fields_above.php +++ b/admin/layouts/admin_fields/fields_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_above.php diff --git a/admin/layouts/admin_fields/fields_fullwidth.php b/admin/layouts/admin_fields/fields_fullwidth.php index 45b638211..c70763c94 100644 --- a/admin/layouts/admin_fields/fields_fullwidth.php +++ b/admin/layouts/admin_fields/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_fields/publishing.php b/admin/layouts/admin_fields/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/admin_fields/publishing.php +++ b/admin/layouts/admin_fields/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields/publlshing.php b/admin/layouts/admin_fields/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/admin_fields/publlshing.php +++ b/admin/layouts/admin_fields/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_fields_conditions/conditions_above.php b/admin/layouts/admin_fields_conditions/conditions_above.php index 913d8aa96..1c8421ef8 100644 --- a/admin/layouts/admin_fields_conditions/conditions_above.php +++ b/admin/layouts/admin_fields_conditions/conditions_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_above.php diff --git a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php index b838137d1..68e5f629c 100644 --- a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php +++ b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_fullwidth.php diff --git a/admin/layouts/admin_fields_conditions/publishing.php b/admin/layouts/admin_fields_conditions/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/admin_fields_conditions/publishing.php +++ b/admin/layouts/admin_fields_conditions/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields_conditions/publlshing.php b/admin/layouts/admin_fields_conditions/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/admin_fields_conditions/publlshing.php +++ b/admin/layouts/admin_fields_conditions/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index b31527ac6..98c56d307 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php index 32182a945..524507c63 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index 5140fe1eb..1943b6a00 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index fc256068d..5c54400db 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/details_above.php b/admin/layouts/admin_view/details_above.php index 3f0d3cf5f..c3abf1866 100644 --- a/admin/layouts/admin_view/details_above.php +++ b/admin/layouts/admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/admin_view/details_left.php b/admin/layouts/admin_view/details_left.php index 5594a83fa..beeeb1249 100644 --- a/admin/layouts/admin_view/details_left.php +++ b/admin/layouts/admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/admin_view/details_right.php b/admin/layouts/admin_view/details_right.php index 57269517c..c9eb90ea3 100644 --- a/admin/layouts/admin_view/details_right.php +++ b/admin/layouts/admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/admin_view/details_under.php b/admin/layouts/admin_view/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/admin_view/details_under.php +++ b/admin/layouts/admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/admin_view/fields_conditions_fullwidth.php b/admin/layouts/admin_view/fields_conditions_fullwidth.php index 4721808b4..4746a0da3 100644 --- a/admin/layouts/admin_view/fields_conditions_fullwidth.php +++ b/admin/layouts/admin_view/fields_conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_fullwidth.php diff --git a/admin/layouts/admin_view/fields_conditions_left.php b/admin/layouts/admin_view/fields_conditions_left.php index 4a8369360..45454fb0c 100644 --- a/admin/layouts/admin_view/fields_conditions_left.php +++ b/admin/layouts/admin_view/fields_conditions_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_left.php diff --git a/admin/layouts/admin_view/fields_conditions_right.php b/admin/layouts/admin_view/fields_conditions_right.php index 1b398833c..ffcc671de 100644 --- a/admin/layouts/admin_view/fields_conditions_right.php +++ b/admin/layouts/admin_view/fields_conditions_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_right.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 26bf0bcf2..d0c7bab24 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php index f51512ab9..4745da795 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index 9e1ce3c36..861df5159 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index ab6fe7518..f857eb5bd 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index 96d96c163..b2ec70ebc 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_fullwidth.php b/admin/layouts/admin_view/settings_fullwidth.php index 20a1397fa..449100827 100644 --- a/admin/layouts/admin_view/settings_fullwidth.php +++ b/admin/layouts/admin_view/settings_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_fullwidth.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 215533f39..e5f637e40 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 0ce7624d4..31bc44240 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index 5140fe1eb..1943b6a00 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index 78cc790a9..025b27fd0 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index 3f0d3cf5f..c3abf1866 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index 1249082a5..21b529eed 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index b9627de85..356259a6e 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index 709b247ea..cea59422e 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index a4e820159..2feb0423b 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index c949bc189..eddee645d 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index d765da109..185c82ce8 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index b961095e9..a9f1bcabc 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index d27972f4c..4593d0445 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index bd88cd8d8..4c691af70 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index 9667a78c9..bc2352829 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index 787910eea..30be370b9 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index 7930df713..8805741e7 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/joint_fullwidth.php b/admin/layouts/dynamic_get/joint_fullwidth.php index 12f29a181..e48658bf3 100644 --- a/admin/layouts/dynamic_get/joint_fullwidth.php +++ b/admin/layouts/dynamic_get/joint_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage joint_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_above.php b/admin/layouts/dynamic_get/main_above.php index 961a49c79..883efc488 100644 --- a/admin/layouts/dynamic_get/main_above.php +++ b/admin/layouts/dynamic_get/main_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_above.php diff --git a/admin/layouts/dynamic_get/main_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php index adba39823..2c4e298db 100644 --- a/admin/layouts/dynamic_get/main_fullwidth.php +++ b/admin/layouts/dynamic_get/main_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_left.php b/admin/layouts/dynamic_get/main_left.php index ca665cf03..b2e0c254e 100644 --- a/admin/layouts/dynamic_get/main_left.php +++ b/admin/layouts/dynamic_get/main_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_left.php diff --git a/admin/layouts/dynamic_get/main_right.php b/admin/layouts/dynamic_get/main_right.php index 360932843..073d79db6 100644 --- a/admin/layouts/dynamic_get/main_right.php +++ b/admin/layouts/dynamic_get/main_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_right.php diff --git a/admin/layouts/dynamic_get/main_under.php b/admin/layouts/dynamic_get/main_under.php index a89f15030..7963b0e95 100644 --- a/admin/layouts/dynamic_get/main_under.php +++ b/admin/layouts/dynamic_get/main_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index 9ee3eb8e7..a1ebb183b 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index 1cfb02f0b..559c834e0 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index 7f6781020..20d2a7278 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index 67e79798e..260d306f6 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index 50337b63c..d910ef3f8 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_fullwidth.php b/admin/layouts/fieldtype/details_fullwidth.php index 82d15dd76..dc37cfa90 100644 --- a/admin/layouts/fieldtype/details_fullwidth.php +++ b/admin/layouts/fieldtype/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 9227835c0..7edd5c76b 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index 5dbbc4049..d485a61cc 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 0b0d7e544..e648ba43e 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/ftp/details_above.php b/admin/layouts/ftp/details_above.php index 1a0e4d787..63a78bd5a 100644 --- a/admin/layouts/ftp/details_above.php +++ b/admin/layouts/ftp/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/ftp/details_fullwidth.php b/admin/layouts/ftp/details_fullwidth.php index 1cb2131d7..4efc112fd 100644 --- a/admin/layouts/ftp/details_fullwidth.php +++ b/admin/layouts/ftp/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index b15977a4c..8fbecd518 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/ftp/publishing.php b/admin/layouts/ftp/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/ftp/publishing.php +++ b/admin/layouts/ftp/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/ftp/publlshing.php b/admin/layouts/ftp/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/ftp/publlshing.php +++ b/admin/layouts/ftp/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index c2054f3af..2f4a2fe4f 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 5fd45c230..c21aa69f1 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index f2b12ed4e..a36ceed8d 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index d559e943a..6e6d6c87b 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php index 20f8c31da..affd61f9e 100644 --- a/admin/layouts/joomla_component/admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index 4dc374cf3..c8ef5d768 100644 --- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index 3f0d3cf5f..c3abf1866 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index a554d1acb..6de7dd96a 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index 7e7571990..39721c8f3 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php index ba3fbcbab..61c9b35ab 100644 --- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index a5c2ab8fe..33e0137a1 100644 --- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php index 8006650fb..c4914ff90 100644 --- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php +++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/metadata.php b/admin/layouts/joomla_component/metadata.php index e4fbf9487..174f1a19b 100644 --- a/admin/layouts/joomla_component/metadata.php +++ b/admin/layouts/joomla_component/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage metadata.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index 6751d3424..f9c2695f6 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php index 64355465d..b64ec0ccd 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php index 7a82c1c75..90be72273 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index 944d41330..3e2221aff 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php index 661d3e022..3fa3b302b 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php index c9b474957..0bdc0287a 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index 264d3dce0..a27ecca0e 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index 49b290bd5..d27b37289 100644 --- a/admin/layouts/joomla_component/site_views_fullwidth.php +++ b/admin/layouts/joomla_component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php index f2c3317d2..8ee24c7da 100644 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ b/admin/layouts/joomla_component/translation_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage translation_fullwidth.php diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index d69ac871d..259fa1157 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php index af652e5f5..386c4044f 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/language_translation/details_above.php b/admin/layouts/language_translation/details_above.php index 77ebff8e1..1af7819cb 100644 --- a/admin/layouts/language_translation/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php index e87180fef..3c68a0536 100644 --- a/admin/layouts/language_translation/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/language_translation/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/language_translation/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index d77820355..6b68deade 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index 8fe98ce36..27249e024 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index 7c7cf9e46..1c99798ab 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index fdf234cbb..fae90925f 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index f40f46d70..0110e2439 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index aa27bef37..4bbfa9ec5 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php index 353e66db0..093c249f0 100644 --- a/admin/layouts/site_view/custom_buttons_left.php +++ b/admin/layouts/site_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php index cdabf8dab..7e7b82d32 100644 --- a/admin/layouts/site_view/custom_buttons_right.php +++ b/admin/layouts/site_view/custom_buttons_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_right.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index 3f0d3cf5f..c3abf1866 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index 1249082a5..21b529eed 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index b9627de85..356259a6e 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index fdf234cbb..fae90925f 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index a4e820159..2feb0423b 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index 784418553..7b897e9f3 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index eb6f25487..4c33f5016 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index fa49bcd45..9bef8eede 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index e63a33228..d1c38ca9d 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index 5ee6b611e..0eefb5500 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index 5e2fc19ca..e47dc84a8 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index d77820355..6b68deade 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index 7e8b67097..83df7489e 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index 7c7cf9e46..1c99798ab 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index fdf234cbb..fae90925f 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index f40f46d70..0110e2439 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index b42fbc32c..3075281bc 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -1169,7 +1169,7 @@ class ComponentbuilderModelAjax extends JModelList unset($result->php_calculation); } // name the main var based on view - if ($view == 'template') + if ('template' === $view || 'site_view' === $view) { switch ($result->gettype) { diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index afe2e4d49..d815ef3e4 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 0f8403f14..0c561c3a0 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php index 6c07983eb..5ecc96b95 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 77f3a9749..948ab3331 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 6ac5ba989..720337861 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 67e9c86bf..49c387925 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index f76f01deb..907468023 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php index 89a695c53..0e8712c79 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 9d3f8bee9..ef032fc95 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index 2bf7bc6ce..bebe5e3f3 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 0af3853e9..0e2cce6b8 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index d561ff363..452988d33 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index 370071deb..86b027ccc 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php index 4f53d0d01..90f70d3f3 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicget.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 2e29a5392..fa24590dc 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 4cfe4f1b9..f37c14ab7 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 86af29bb7..98c2e8746 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/ftps.php b/admin/models/fields/ftps.php index 09bcdd966..045b42153 100644 --- a/admin/models/fields/ftps.php +++ b/admin/models/fields/ftps.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ftps.php diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php index fd352cce7..d025e410c 100644 --- a/admin/models/fields/lang.php +++ b/admin/models/fields/lang.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage lang.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index c32c1747f..a3bdccab3 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/matchfield.php b/admin/models/fields/matchfield.php index d9e06f843..4b143d0a2 100644 --- a/admin/models/fields/matchfield.php +++ b/admin/models/fields/matchfield.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage matchfield.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 6caeef95b..b86f93a79 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index a4fd6d283..4c128b10c 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index d05fb9add..9975c16af 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fields/targetfields.php b/admin/models/fields/targetfields.php index a7665e834..20f358dd6 100644 --- a/admin/models/fields/targetfields.php +++ b/admin/models/fields/targetfields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage targetfields.php diff --git a/admin/models/fields/viewtabs.php b/admin/models/fields/viewtabs.php index bbd258cdf..ec6b94c81 100644 --- a/admin/models/fields/viewtabs.php +++ b/admin/models/fields/viewtabs.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage viewtabs.php diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js index 518d54d1a..ab9cf8720 100644 --- a/admin/models/forms/dynamic_get.js +++ b/admin/models/forms/dynamic_get.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.js diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js index fcc62509e..023c73b8f 100644 --- a/admin/models/forms/joomla_component.js +++ b/admin/models/forms/joomla_component.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.js diff --git a/admin/models/import.php b/admin/models/import.php index cb7b7583e..2bddbf916 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index 94d54f3a3..dfedd2285 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php @@ -81,6 +81,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } protected $app; + protected $dir = false; + protected $data = false; protected $target = false; protected $newID = array(); protected $forceUpdate = 0; @@ -241,11 +243,11 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // get the zip adapter $zip = JArchive::getAdapter('zip'); // set the directory name - $dir = JFile::stripExt($package['dir']); + $this->dir = JFile::stripExt($package['dir']); // unzip the package - $zip->extract($package['dir'], $dir); + $zip->extract($package['dir'], $this->dir); // check for database file - $infoFile = $dir . '/info.vdm'; + $infoFile = $this->dir . '/info.vdm'; if (JFile::exists($infoFile)) { // load the data @@ -264,7 +266,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } } } - ComponentbuilderHelper::removeFolder($dir); + ComponentbuilderHelper::removeFolder($this->dir); } } return false; @@ -549,15 +551,15 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy if (JFile::exists($package['dir'])) { // set the directory name - $dir = JFile::stripExt($package['dir']); + $this->dir = JFile::stripExt($package['dir']); // check for database file - $dbFile = $dir . '/db.vdm'; + $dbFile = $this->dir . '/db.vdm'; if (!JFile::exists($dbFile)) { // get the zip adapter $zip = JArchive::getAdapter('zip'); // unzip the package - $zip->extract($package['dir'], $dir); + $zip->extract($package['dir'], $this->dir); } // check again if (JFile::exists($dbFile)) @@ -566,21 +568,21 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy if ($data = @file_get_contents($dbFile)) { // prep the data - if ($data = $this->extractData($data)) + if ($this->extractData($data)) { - if (isset($data['joomla_component']) && ComponentbuilderHelper::checkArray($data['joomla_component'])) + if (isset($this->data['joomla_component']) && ComponentbuilderHelper::checkArray($this->data['joomla_component'])) { // save the smart data - if ($this->saveSmartComponents($data, $dir)) + if ($this->saveSmartComponents()) { - ComponentbuilderHelper::removeFolder($dir); + ComponentbuilderHelper::removeFolder($this->dir); return true; } } } } } - ComponentbuilderHelper::removeFolder($dir); + ComponentbuilderHelper::removeFolder($this->dir); } } } @@ -617,7 +619,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy $data = @unserialize($data); if ($data !== false) { - return $data; + // set the data global + $this->data = $data; + return true; } $this->app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_HTWODATA_IS_CORRUPTHTWOTHIS_COULD_BE_DUE_TO_KEY_ERROR_OR_BROKEN_PACKAGE'), 'error'); return false; @@ -629,89 +633,87 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy /** * Save the smart components * - * @param array $data The values to save - * * @return boolean false on failure * **/ - protected function saveSmartComponents($data, $dir) + protected function saveSmartComponents() { // get user object $this->user = JFactory::getUser(); // set some defaults $this->today = JFactory::getDate()->toSql(); // we first store the fieldtype - if (!$this->saveSmartItems($data, 'fieldtype')) + if (!$this->saveSmartItems('fieldtype')) { return false; } // we then store the field - if (!$this->saveSmartItems($data, 'field')) + if (!$this->saveSmartItems('field')) { return false; } // we then store the admin_view - if (!$this->saveSmartItems($data, 'admin_view')) - { - return false; - } - // we then store the admin_fields - if (!$this->saveSmartItems($data, 'admin_fields')) - { - return false; - } - // we then store the admin_fields_conditions - if (!$this->saveSmartItems($data, 'admin_fields_conditions')) + if (!$this->saveSmartItems('admin_view')) { return false; } // we then store the snippet - if (!$this->saveSmartItems($data, 'snippet')) + if (!$this->saveSmartItems('snippet')) { return false; } // we then store the dynamic_get - if (!$this->saveSmartItems($data, 'dynamic_get')) + if (!$this->saveSmartItems('dynamic_get')) { return false; } // we then store the custom_admin_view - if (!$this->saveSmartItems($data, 'custom_admin_view')) + if (!$this->saveSmartItems('custom_admin_view')) { return false; } // we then store the site_view - if (!$this->saveSmartItems($data, 'site_view')) + if (!$this->saveSmartItems('site_view')) { return false; } // we then store the template - if (!$this->saveSmartItems($data, 'template')) + if (!$this->saveSmartItems('template')) { return false; } // we then store the layout - if (!$this->saveSmartItems($data, 'layout')) + if (!$this->saveSmartItems('layout')) { return false; } // we then store the components - if (!$this->saveSmartItems($data, 'joomla_component')) + if (!$this->saveSmartItems('joomla_component')) { return false; } // we then store the languages - if (!$this->saveSmartItems($data, 'language')) + if (!$this->saveSmartItems('language')) { return false; } // we then store the language translations - if (!$this->saveSmartItems($data, 'language_translation')) + if (!$this->saveSmartItems('language_translation')) { return false; } // we then store the custom_code - if (!$this->saveSmartItems($data, 'custom_code')) + if (!$this->saveSmartItems('custom_code')) + { + return false; + } + // we then store the admin_fields + if (!$this->saveSmartItems('admin_fields')) + { + return false; + } + // we then store the admin_fields_conditions + if (!$this->saveSmartItems('admin_fields_conditions')) { return false; } @@ -720,7 +722,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // finally move the old datasets $this->moveDivergedData(); // lets move all the files to its correct location - if (!$this->moveSmartStuff($dir)) + if (!$this->moveSmartStuff()) { return false; } @@ -728,17 +730,102 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } /** - * Move the smart content (files & folders) into place + * Save the smart items * - * @param string $dir The path to the folders + * @param string $type The type of values * * @return boolean false on failure * **/ - protected function moveSmartStuff($dir) + protected function saveSmartItems($table) + { + $success = true; + if (isset($this->data[$table]) && ComponentbuilderHelper::checkArray($this->data[$table])) + { + // get global action permissions + $canDo = ComponentbuilderHelper::getActions($table); + $canEdit = $canDo->get('core.edit'); + $canState = $canDo->get('core.edit.state'); + $canCreate = $canDo->get('core.create'); + // set id keeper + if (!isset($this->newID[$table])) + { + $this->newID[$table] = array(); + } + foreach ($this->data[$table] as $item) + { + $oldID = (int) $item->id; + // first check if exist + if ($local = $this->getLocalItem($item, $table, 1)) + { + $dbDate = strtotime($item->modified); + $localDate = strtotime($local->modified); + // okay we have it local (check if the version is newer) + if ($this->forceUpdate == 1 || $dbDate > $localDate) + { + // add some local values to item to combine + if ($table === 'language_translation') + { + $item->localComponents = $local->components; + $item->localTranslation = $local->translation; + } + // make sure we have the correct ID set + $item->id = $local->id; + // yes it is newer, lets update (or is being forced) + if ($canEdit && $id = $this->updateLocalItem($item, $table, $canState)) + { + // we had success in + $this->newID[$table][$oldID] = (int) $id; + // to debug if your mismatching is to much (TODO) we can add a debugging switch later + // $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_BEEN_UPDATED', $table.' id:'.$oldID . '->' . $id), 'success'); + } + else + { + $notice = '!'; + if (!$canEdit) + { + $notice = JText::sprintf("COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_EDIT_S", $table); + } + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS', $table.' id:'.$oldID, $notice), 'error'); + } + } + // insure to load the local ID to link imported values with it + if (!isset($this->newID[$table][$oldID])) + { + $this->newID[$table][$oldID] = (int) $local->id; + } + } + elseif ($canCreate && $id = $this->addLocalItem($item, $table)) + { + // not found in local db so add + $this->newID[$table][$oldID] = (int) $id; + // to debug if your mismatching is to much + // $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_BEEN_IMPORTED', $table.' id:'.$oldID . '->' . $id), 'success'); + } + else + { + $notice = '!'; + if (!$canCreate) + { + $notice = JText::sprintf("COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_CREATE_S", $table); + } + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS', $table.' id:'.$oldID, $notice), 'error'); + } + } + } + return $success; + } + + /** + * Move the smart content (files & folders) into place + * + * @return boolean false on failure + * + **/ + protected function moveSmartStuff() { // make sure to first unlock files - $this->unLockFiles($dir); + $this->unLockFiles($this->dir); // set params $params = JComponentHelper::getParams('com_componentbuilder'); // set custom folder path @@ -746,7 +833,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy $imagesPath = str_replace('//', '/', JPATH_SITE . '/images'); $success = true; // check if we have custom files - $customDir = str_replace('//', '/', $dir . '/custom'); + $customDir = str_replace('//', '/', $this->dir . '/custom'); if (JFolder::exists($customDir)) { // great we have some custom stuff lets move it @@ -757,7 +844,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } } // check if we have images - $imageDir = str_replace('//', '/', $dir . '/images'); + $imageDir = str_replace('//', '/', $this->dir . '/images'); if (JFolder::exists($imageDir)) { // great we have some images lets move them @@ -775,7 +862,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy * * @return void */ - protected function unLockFiles(&$dir) + protected function unLockFiles() { // lock the data if set if(ComponentbuilderHelper::checkString($this->sleutle) && strlen($this->sleutle) == 32) @@ -784,14 +871,14 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // we must first store the current working directory $joomla = getcwd(); // setup the type path - $customPath = str_replace('//', '/', $dir . '/custom'); + $customPath = str_replace('//', '/', $this->dir . '/custom'); // go to the custom folder if found if (JFolder::exists($customPath)) { $this->unlock($customPath, $unlocker); } // setup the type path - $imagesPath = str_replace('//', '/', $dir . '/images'); + $imagesPath = str_replace('//', '/', $this->dir . '/images'); // go to the custom folder if found if (JFolder::exists($imagesPath)) { @@ -830,92 +917,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } } - /** - * Save the smart items - * - * @param array $items The values to save - * @param string $type The type of values - * - * @return boolean false on failure - * - **/ - protected function saveSmartItems(&$items, $type) - { - $success = true; - if (isset($items[$type]) && ComponentbuilderHelper::checkArray($items[$type])) - { - // get global action permissions - $canDo = ComponentbuilderHelper::getActions($type); - $canEdit = $canDo->get('core.edit'); - $canState = $canDo->get('core.edit.state'); - $canCreate = $canDo->get('core.create'); - // set id keeper - if (!isset($this->newID[$type])) - { - $this->newID[$type] = array(); - } - foreach ($items[$type] as $item) - { - $oldID = $item->id; - // first check if exist - if ($local = $this->getLocalItem($item, $type, 1)) - { - $dbDate = strtotime($item->modified); - $localDate = strtotime($local->modified); - // okay we have it local (check if the version is newer) - if ($this->forceUpdate == 1 || $dbDate > $localDate) - { - // add some local values to item to combine - if ($type === 'language_translation') - { - $item->localComponents = $local->components; - $item->localTranslation = $local->translation; - } - // make sure we have the correct ID set - $item->id = $local->id; - // yes it is newer, lets update (or is being forced) - if ($canEdit && $id = $this->updateLocalItem($item, $type, $canState)) - { - $this->newID[$type][$oldID] = $id; - } - else - { - $notice = '!'; - if (!$canEdit) - { - $notice = JText::sprintf("COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_EDIT_S", $type); - } - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS', $type.' id:'.$oldID, $notice), 'error'); - } - } - else - { - $this->newID[$type][$oldID] = $local->id; - } - } - elseif ($canCreate && $id = $this->addLocalItem($item, $type)) - { - // not found in local db so add - $this->newID[$type][$oldID] = $id; - } - else - { - $notice = '!'; - if (!$canCreate) - { - $notice = JText::sprintf("COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_CREATE_S", $type); - } - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS', $type.' id:'.$oldID, $notice), 'error'); - } - } - } - return $success; - } - /** * Update some items after all * - * * @return void * **/ @@ -954,13 +958,13 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy $bucket = array(); foreach ($fieldsSets as $id) { - if (isset($this->newID['field'][$id])) + if (isset($this->newID['field'][(int) $id])) { - $bucket[] = $this->newID['field'][$id]; + $bucket[] = $this->newID['field'][(int) $id]; } else { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BREPEATABLEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD', $id, $field), 'warning'); + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BMULTIPLE_FIELD_REPEATABLE_MODEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD', $id, $field), 'warning'); } } if (ComponentbuilderHelper::checkArray($bucket)) @@ -988,9 +992,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // update the addlinked_views foreach ($this->updateAfter['adminview'] as $adminview) { - if (isset($this->newID['admin_view'][$adminview])) + if (isset($this->newID['admin_view'][(int) $adminview])) { - $adminview = $this->newID['admin_view'][$adminview]; + $adminview = $this->newID['admin_view'][(int) $adminview]; } // get the field from db if ($addlinked_views = ComponentbuilderHelper::getVar('admin_view', $adminview, 'id', 'addlinked_views')) @@ -1050,27 +1054,32 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy /* * Convert repeatable field to subform * - * @param array $array The array to convert + * @param array $item The array to convert * @param string $name The main field name * @param array $updater The updater (dynamic) option * * @return array */ - protected function convertRepeatable($array, $name) + protected function convertRepeatable($item, $name) { - $bucket = array(); - foreach ($array as $key => $values) + // continue only if we have an array + if (ComponentbuilderHelper::checkArray($item)) { - foreach ($values as $nr => $value) + $bucket = array(); + foreach ($item as $key => $values) { - if (!isset($bucket[$name . $nr]) || !ComponentbuilderHelper::checkArray($bucket[$name . $nr])) + foreach ($values as $nr => $value) { - $bucket[$name . $nr] = array(); + if (!isset($bucket[$name . $nr]) || !ComponentbuilderHelper::checkArray($bucket[$name . $nr])) + { + $bucket[$name . $nr] = array(); + } + $bucket[$name . $nr][$key] = $value; } - $bucket[$name . $nr][$key] = $value; } + return $bucket; } - return $bucket; + return $item; } /* @@ -1081,26 +1090,27 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy * * @return void */ - protected function convertRepeatableFields(&$item, $updater) + protected function convertRepeatableFields($object, $updater) { // update the repeatable fields foreach ($updater as $up => $sleutel) { - if (isset($item->{$up}) && ComponentbuilderHelper::checkJson($item->{$up})) + if (isset($object->{$up}) && ComponentbuilderHelper::checkJson($object->{$up})) { - $updateArray = json_decode($item->{$up}, true); + $updateArray = json_decode($object->{$up}, true); // check if this is old values for repeatable fields if (ComponentbuilderHelper::checkArray($updateArray) && isset($updateArray[$sleutel])) { // load it back - $item->{$up} = json_encode($this->convertRepeatable($updateArray, $up)); + $object->{$up} = json_encode($this->convertRepeatable($updateArray, $up)); } } - elseif (isset($item->{$up})) + elseif (isset($object->{$up})) { - unset($item->{$up}); + unset($object->{$up}); } } + return $object; } /** @@ -1155,45 +1165,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy { if (isset($value[$target])) { - // update the target - if (!ComponentbuilderHelper::checkArray($value[$target])) - { - if (isset($this->newID[$target_type][$value[$target]])) - { - $value[$target] = $this->newID[$target_type][$value[$target]]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED', ComponentbuilderHelper::safeString($target_type, 'Ww') . '->' . ComponentbuilderHelper::safeString($target, 'Ww') .' in ('.ComponentbuilderHelper::safeString($table, 'w').':'.$item->id.')', $value[$target]), 'warning'); - $value[$target] = ''; - } - } - elseif (ComponentbuilderHelper::checkArray($value[$target])) - { - // the bucket to load the items back - $bucket = array(); - foreach ($value[$target] as $id) - { - if (!is_numeric($id)) - { - continue; - } - if (isset($this->newID[$target_type][$id])) - { - $bucket[] = $this->newID[$target_type][$id]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED', ComponentbuilderHelper::safeString($target_type, 'Ww') . '->' . ComponentbuilderHelper::safeString($target, 'Ww') .' in ('.ComponentbuilderHelper::safeString($table, 'w').':'.$item->id.')', $id), 'warning'); - $bucket[] = ''; - } - } - // set ids back - if (ComponentbuilderHelper::checkArray($bucket)) - { - $value[$target] = $bucket; - } - } + $value = $this->setNewID($value, $target, $target_type, $table); } } } @@ -1205,6 +1177,169 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy return $values; } + /** + * Set the new ID + * + * @param array $item The values to update the IDs in + * @param string $target The target field + * @param string $type The table of that field + * @param string $table The table these values belong to + * + * @return boolean True on success + * + */ + protected function setNewID($item, $target, $type, $table) + { + $isJson = false; + if (ComponentbuilderHelper::checkJson($item)) + { + $item = json_decode($item, true); + $isJson = true; + } + if (ComponentbuilderHelper::checkArray($item)) + { + // set item ID + $itemId = (isset($item['id'])) ? $item['id'] : 'newItem'; + // check if it is json + $isJsonTarget = false; + if (ComponentbuilderHelper::checkJson($item[$target])) + { + $item[$target] = json_decode($item[$target], true); + $isJsonTarget = true; + } + // update the target + if (ComponentbuilderHelper::checkString($item[$target]) || is_numeric($item[$target])) + { + if ($item[$target] == 0) + { + $item[$target] = ''; + } + elseif (isset($this->newID[$type][(int) $item[$target]])) + { + $item[$target] = $this->newID[$type][(int) $item[$target]]; + } + else + { + $this->enqueueIdMismatchMessage($item[$target], $itemId, $target, $type, $table); + $item[$target] = ''; + } + } + elseif (ComponentbuilderHelper::checkArray($item[$target])) + { + // the bucket to load the items back + $bucket = array(); + foreach ($item[$target] as $nr => $id) + { + if ($id == 0) + { + continue; + } + elseif ((ComponentbuilderHelper::checkString($id) || is_numeric($id)) && isset($this->newID[$type][(int) $id])) + { + $bucket[] = $this->newID[$type][(int) $id]; + } + else + { + $this->enqueueIdMismatchMessage($id, $itemId, $target, $type, $table); + } + } + // set ids back + if (ComponentbuilderHelper::checkArray($bucket)) + { + $item[$target] = $bucket; + } + } + // convert back to json + if ($isJsonTarget) + { + $item[$target] = json_encode($item[$target]); + } + } + elseif (ComponentbuilderHelper::checkObject($item)) + { + // set item ID + $itemId = (isset($item->id)) ? $item->id : 'newItem'; + // check if it is json + $isJsonTarget = false; + if (ComponentbuilderHelper::checkJson($item->{$target})) + { + $item->{$target} = json_decode($item->{$target}, true); + $isJsonTarget = true; + } + // update the target + if (ComponentbuilderHelper::checkString($item->{$target}) || is_numeric($item->{$target})) + { + if ($item->{$target} == 0) + { + $item->{$target} = ''; + } + elseif (isset($this->newID[$type][(int) $item->{$target}])) + { + $item->{$target} = $this->newID[$type][(int) $item->{$target}]; + } + else + { + $this->enqueueIdMismatchMessage($item->{$target}, $itemId, $target, $type, $table); + $item->{$target} = ''; + } + } + elseif (ComponentbuilderHelper::checkArray($item->{$target})) + { + // the bucket to load the items back + $bucket = array(); + foreach ($item->{$target} as $id) + { + if ($id == 0) + { + continue; + } + elseif ((ComponentbuilderHelper::checkString($id) || is_numeric($id)) && isset($this->newID[$type][(int) $id])) + { + $bucket[] = $this->newID[$type][(int) $id]; + } + else + { + $this->enqueueIdMismatchMessage($id, $itemId, $target, $type, $table); + $bucket[] = ''; + } + } + // set ids back + if (ComponentbuilderHelper::checkArray($bucket)) + { + $item->{$target} = $bucket; + } + } + // convert back to json + if ($isJsonTarget) + { + $item->{$target} = json_encode($item->{$target}); + } + } + // return as json if received as json + if ($isJson) + { + return json_encode($item); + } + return $item; + } + + /** + * Set the new ID + * + * @param int $id The field ID + * @param int $itemId The item ID + * @param string $target The target field + * @param string $type The table of that field + * @param string $table The table these values belong to + * + * @return void + * + */ + protected function enqueueIdMismatchMessage($id, $itemId, $target, $type, $table) + { + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSBS_IN_BSB_HAS_ID_MISMATCH_SO_THE_BSB_WAS_REMOVED', ComponentbuilderHelper::safeString($type, 'Ww'), ComponentbuilderHelper::safeString($target, 'Ww') , ComponentbuilderHelper::safeString($table, 'w').':'.$itemId, $type . ':' . $id), 'warning'); + } + /** * Prep the item * @@ -1241,13 +1376,13 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy 'properties' => 'name' ); // update the repeatable fields - $this->convertRepeatableFields($item, $updaterR); + $item = $this->convertRepeatableFields($item, $updaterR); break; case 'field': // update the fieldtype - if (isset($item->fieldtype) && is_numeric($item->fieldtype) && $item->fieldtype > 0 && isset($this->newID['fieldtype'][$item->fieldtype])) + if (isset($item->fieldtype) && is_numeric($item->fieldtype) && $item->fieldtype > 0 && isset($this->newID['fieldtype'][(int) $item->fieldtype])) { - $item->fieldtype = $this->newID['fieldtype'][$item->fieldtype]; + $item->fieldtype = $this->newID['fieldtype'][(int) $item->fieldtype]; // update multi field values if ($this->checkMultiFields($item->fieldtype)) { @@ -1267,17 +1402,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy break; case 'dynamic_get': // update the view_table_main ID - if (isset($item->main_source) && $item->main_source == 1 && isset($item->view_table_main) && is_numeric($item->view_table_main) && $item->view_table_main > 0) + if (isset($item->main_source) && $item->main_source == 1) { - if (isset($this->newID['admin_view'][$item->view_table_main])) - { - $item->view_table_main = $this->newID['admin_view'][$item->view_table_main]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BVIEW_TABLE_MAINB_IDS_MISMATCH_IN_BSB', $item->view_table_main, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'error'); - return false; - } + $item = $this->setNewID($item, 'view_table_main', 'admin_view', $type); } // repeatable fields to update $updaterR = array( @@ -1290,7 +1417,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy 'filter' => 'filter_type' ); // update the repeatable fields - $this->convertRepeatableFields($item, $updaterR); + $item = $this->convertRepeatableFields($item, $updaterR); // subform fields to target $updaterT = array( // subformfield => field => type_value @@ -1302,114 +1429,20 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy case 'layout': case 'template': // update the dynamic_get - if (isset($item->dynamic_get) && is_numeric($item->dynamic_get) && $item->dynamic_get > 0 && isset($this->newID['dynamic_get'][$item->dynamic_get])) - { - $item->dynamic_get = $this->newID['dynamic_get'][$item->dynamic_get]; - } - elseif (!is_numeric($item->dynamic_get) || $item->dynamic_get == 0) - { - unset($item->dynamic_get); - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BDYNAMIC_GETB_IDS_MISMATCH_IN_BSB', $item->dynamic_get, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'warning'); - unset($item->dynamic_get); - } + $item = $this->setNewID($item, 'dynamic_get', 'dynamic_get', $type); // update the snippet - if (isset($item->snippet) && is_numeric($item->snippet) && $item->snippet > 0 && isset($this->newID['snippet'][$item->snippet])) - { - $item->snippet = $this->newID['snippet'][$item->snippet]; - } - elseif (!is_numeric($item->snippet) || $item->snippet == 0) - { - unset($item->snippet); - } - else - { - // $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB', $item->snippet, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'warning'); - // unset($item->snippet); - } + $item = $this->setNewID($item, 'snippet', 'snippet', $type); break; case 'custom_admin_view': case 'site_view': // update the main_get - if (isset($item->main_get) && is_numeric($item->main_get) && $item->main_get > 0 && isset($this->newID['dynamic_get'][$item->main_get])) - { - $item->main_get = $this->newID['dynamic_get'][$item->main_get]; - } - elseif (!is_numeric($item->main_get) || $item->main_get == 0) - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BMAIN_GETB_NOT_SET_FOR_BSB', ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'warning'); - unset($item->main_get); - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BMAIN_GETB_IDS_MISMATCH_IN_BSB', $item->main_get, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'error'); - return false; - } + $item = $this->setNewID($item, 'main_get', 'dynamic_get', $type); // update the dynamic_get - if (isset($item->dynamic_get) && is_numeric($item->dynamic_get) && $item->dynamic_get > 0 && isset($this->newID['dynamic_get'][$item->dynamic_get])) - { - $item->dynamic_get = $this->newID['dynamic_get'][$item->dynamic_get]; - } - elseif (!is_numeric($item->dynamic_get) || $item->dynamic_get == 0) - { - unset($item->dynamic_get); - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BDYNAMIC_GETB_IDS_MISMATCH_IN_BSB', $item->dynamic_get, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'warning'); - unset($item->dynamic_get); - } + $item = $this->setNewID($item, 'dynamic_get', 'dynamic_get', $type); // update the custom_get - if (isset($item->custom_get) && ComponentbuilderHelper::checkJson($item->custom_get)) - { - $custom_get = json_decode($item->custom_get, true); - foreach ($custom_get as $nr => $get) - { - if (!is_numeric($get)) - { - continue; - } - // update the custom_get - if (isset($this->newID['dynamic_get'][$get])) - { - $custom_get[$nr] = $this->newID['dynamic_get'][$get]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BCUSTOM_GET_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BDYNAMIC_GETB_SO_THE_IDS_WAS_REMOVED', '('.ComponentbuilderHelper::safeString($type, 'w').':'.$item->id.')', $get), 'warning'); - unset($custom_get[$nr]); - } - } - // load it back if there is any remaining - if (ComponentbuilderHelper::checkArray($custom_get)) - { - $item->custom_get = json_encode( (object) $custom_get); - } - else - { - unset($item->custom_get); - } - } - else - { - unset($item->custom_get); - } + $item = $this->setNewID($item, 'custom_get', 'dynamic_get', $type); // update the snippet - if (isset($item->snippet) && is_numeric($item->snippet) && $item->snippet > 0 && isset($this->newID['snippet'][$item->snippet])) - { - $item->snippet = $this->newID['snippet'][$item->snippet]; - } - elseif (!is_numeric($item->snippet) || $item->snippet == 0) - { - unset($item->snippet); - } - else - { - // $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB', $item->snippet, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'warning'); - // unset($item->snippet); - } + $item = $this->setNewID($item, 'snippet', 'snippet', $type); // repeatable fields to update $updaterR = array( // repeatablefield => checker @@ -1417,7 +1450,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy 'custom_button' => 'name' ); // update the repeatable fields - $this->convertRepeatableFields($item, $updaterR); + $item = $this->convertRepeatableFields($item, $updaterR); break; case 'admin_view': // we must clear the demo content (since it was not moved as far as we know) TODO @@ -1476,7 +1509,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy 'addpermissions' => 'action' ); // update the repeatable fields - $this->convertRepeatableFields($item, $updaterR); + $item = $this->convertRepeatableFields($item, $updaterR); break; case 'joomla_component': // update the addconfig @@ -1490,9 +1523,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy continue; } // update the addconfig - if (isset($this->newID['field'][$id])) + if (isset($this->newID['field'][(int) $id])) { - $addconfig['field'][$nr] = $this->newID['field'][$id]; + $addconfig['field'][$nr] = $this->newID['field'][(int) $id]; } else { @@ -1514,9 +1547,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy continue; } // update the addadmin_views - if (isset($this->newID['admin_view'][$id])) + if (isset($this->newID['admin_view'][(int) $id])) { - $addadmin_views['adminview'][$nr] = $this->newID['admin_view'][$id]; + $addadmin_views['adminview'][$nr] = $this->newID['admin_view'][(int) $id]; } else { @@ -1542,9 +1575,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy continue; } // update the addcustom_admin_views - if (isset($this->newID['custom_admin_view'][$id])) + if (isset($this->newID['custom_admin_view'][(int) $id])) { - $addcustom_admin_views['customadminview'][$nr] = $this->newID['custom_admin_view'][$id]; + $addcustom_admin_views['customadminview'][$nr] = $this->newID['custom_admin_view'][(int) $id]; } else { @@ -1566,9 +1599,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy continue; } // update the addsite_views - if (isset($this->newID['site_view'][$id])) + if (isset($this->newID['site_view'][(int) $id])) { - $addsite_views['siteview'][$nr] = $this->newID['site_view'][$id]; + $addsite_views['siteview'][$nr] = $this->newID['site_view'][(int) $id]; } else { @@ -1582,47 +1615,18 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy break; case 'custom_code': // update the component ID where needed - if (isset($item->component) && $item->component > 0) - { - if (isset($this->newID['joomla_component'][$item->component])) - { - $item->component = $this->newID['joomla_component'][$item->component]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BCOMPONENT_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BCOMPONENTB_SO_THE_IDS_WAS_REMOVED', '('.ComponentbuilderHelper::safeString($type, 'w').':'.$item->id.')', $item->component), 'warning'); - unset($item->component); - } - } + $item = $this->setNewID($item, 'component', 'joomla_component', $type); break; case 'language_translation': // update the component ID where needed - if (isset($item->components) && ComponentbuilderHelper::checkJson($item->components)) - { - $components = json_decode($item->components, true); - foreach ($components as $nr => $id) - { - if (!is_numeric($id)) - { - continue; - } - // update the components - if (isset($this->newID['joomla_component'][$id])) - { - $components[$nr] = $this->newID['joomla_component'][$id]; - } - else - { - unset($components[$nr]); - } - } - } + $item = $this->setNewID($item, 'component', 'joomla_component', $type); // load the local components if found if (isset($item->localComponents) && ComponentbuilderHelper::checkJson($item->localComponents)) { - if (!isset($components)) + $components = array(); + if (isset($item->components) && ComponentbuilderHelper::checkJson($item->components)) { - $components= array(); + $components = json_decode($item->components, true); } $localComponents = json_decode($item->localComponents, true); foreach ($localComponents as $lid) @@ -1725,18 +1729,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy case 'admin_fields': case 'admin_fields_conditions': // update the admin_view ID where needed - if (isset($item->admin_view) && $item->admin_view > 0) - { - if (isset($this->newID['admin_view'][$item->admin_view])) - { - $item->admin_view = $this->newID['admin_view'][$item->admin_view]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BFIELD_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED', '('.ComponentbuilderHelper::safeString($type, 'w').':'.$item->id.')', $item->admin_view), 'warning'); - unset($item->admin_view); - } - } + $item = $this->setNewID($item, 'admin_view', 'admin_view', $type); + // set the updater if ('admin_fields' === $type) { // repeatable fields to update @@ -1770,7 +1764,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } // update the repeatable fields - $this->convertRepeatableFields($item, $updaterR); + $item = $this->convertRepeatableFields($item, $updaterR); // update the subform ids $this->updateSubformsIDs($item, $type, $updaterT); @@ -1791,7 +1785,10 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy break; case 'add': // remove the ID - unset($item->id); + if (isset($item->id)) + { + unset($item->id); + } // set values to follow the adding conventions $item->created_by = $this->user->id; $item->modified_by = $this->user->id; @@ -2101,7 +2098,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // get by admin_view (since there should only be one of each name) $getter = array('admin_view'); $this->specialValue = array(); - $this->specialValue['admin_view'] = $this->newID['admin_view'][$item->admin_view]; + $this->specialValue['admin_view'] = $this->newID['admin_view'][(int) $item->admin_view]; break; case 'fieldtype': // get by name (since there should only be one of each name) @@ -2119,11 +2116,11 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // get by id name.. $getter = array('name','datatype','store','indexes','null_switch'); // lets try to add the fieldtype - if (isset($item->fieldtype) && is_numeric($item->fieldtype) && $item->fieldtype > 0 && isset($this->newID['fieldtype'][$item->fieldtype]) && $this->newID['fieldtype'][$item->fieldtype] > 0) + if (isset($item->fieldtype) && is_numeric($item->fieldtype) && $item->fieldtype > 0 && isset($this->newID['fieldtype'][(int) $item->fieldtype]) && $this->newID['fieldtype'][(int) $item->fieldtype] > 0) { $getter[] = 'fieldtype'; $this->specialValue = array(); - $this->specialValue['fieldtype'] = $this->newID['fieldtype'][$item->fieldtype]; + $this->specialValue['fieldtype'] = $this->newID['fieldtype'][(int) $item->fieldtype]; $retryAgain = 2; } else @@ -2137,11 +2134,11 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // get by name, system_name and codename $getter = array('name', 'system_name', 'codename'); // lets try to add the main_get - if (isset($item->main_get) && is_numeric($item->main_get) && $item->main_get > 0 && isset($this->newID['dynamic_get'][$item->main_get]) && $this->newID['dynamic_get'][$item->main_get] > 0) + if (isset($item->main_get) && is_numeric($item->main_get) && $item->main_get > 0 && isset($this->newID['dynamic_get'][(int) $item->main_get]) && $this->newID['dynamic_get'][(int) $item->main_get] > 0) { $getter[] = 'main_get'; $this->specialValue = array(); - $this->specialValue['main_get'] = $this->newID['dynamic_get'][$item->main_get]; + $this->specialValue['main_get'] = $this->newID['dynamic_get'][(int) $item->main_get]; } break; case 'template': diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index f233a1a7c..e278b814d 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index 7b6e7bac2..35bdc87b1 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php @@ -81,16 +81,10 @@ class ComponentbuilderModelJoomla_components extends JModelList protected $tempPath; protected $customPath; protected $smartExport = array(); - protected $templateIds = array(); - protected $dynamicGetIds = array(); - protected $adminViewIds = array(); - protected $fieldTypeIds = array(); - protected $snippetIds = array(); - protected $layoutIds = array(); - protected $customCodeIds = array(); + protected $exportIDs = array(); protected $customCodeM = array(); - protected $fieldTypes = array(); - protected $isMultiple = array(); + protected $fieldTypes = array(); + protected $isMultiple = array(); /** * Method to build the export package @@ -280,43 +274,43 @@ class ComponentbuilderModelJoomla_components extends JModelList $this->smartExport['joomla_component'][$item->id] = $item; } // add fields and conditions - if (ComponentbuilderHelper::checkArray($this->adminViewIds)) + if (isset($this->exportIDs['admin_view']) && ComponentbuilderHelper::checkArray($this->exportIDs['admin_view'])) { - $this->setData('admin_fields', $this->adminViewIds, 'id'); - $this->setData('admin_fields_conditions', $this->adminViewIds, 'id'); + $this->setData('admin_fields', array_values($this->exportIDs['admin_view']), 'admin_view'); + $this->setData('admin_fields_conditions', array_values($this->exportIDs['admin_view']), 'admin_view'); } // add field types - if (ComponentbuilderHelper::checkArray($this->fieldTypeIds)) + if (isset($this->exportIDs['fieldtype']) && ComponentbuilderHelper::checkArray($this->exportIDs['fieldtype'])) { - $this->setData('fieldtype', $this->fieldTypeIds, 'id'); - } - // add dynamic get - if (ComponentbuilderHelper::checkArray($this->dynamicGetIds)) - { - $this->setData('dynamic_get', $this->dynamicGetIds, 'id'); - } - // add snippets - if (ComponentbuilderHelper::checkArray($this->snippetIds)) - { - $this->setData('snippet', $this->snippetIds, 'id'); + $this->setData('fieldtype', array_values($this->exportIDs['fieldtype']), 'id'); } // add templates - if (ComponentbuilderHelper::checkArray($this->templateIds)) + if (isset($this->exportIDs['template']) && ComponentbuilderHelper::checkArray($this->exportIDs['template'])) { - $this->setData('template', $this->templateIds, 'id'); + $this->setData('template', array_values($this->exportIDs['template']), 'id'); } // add layouts - if (ComponentbuilderHelper::checkArray($this->layoutIds)) + if (isset($this->exportIDs['layout']) && ComponentbuilderHelper::checkArray($this->exportIDs['layout'])) { - $this->setData('layout', $this->layoutIds, 'id'); + $this->setData('layout', array_values($this->exportIDs['layout']), 'id'); + } + // add dynamic get + if (isset($this->exportIDs['dynamic_get']) && ComponentbuilderHelper::checkArray($this->exportIDs['dynamic_get'])) + { + $this->setData('dynamic_get', array_values($this->exportIDs['dynamic_get']), 'id'); + } + // add snippets + if (isset($this->exportIDs['snippet']) && ComponentbuilderHelper::checkArray($this->exportIDs['snippet'])) + { + $this->setData('snippet', array_values($this->exportIDs['snippet']), 'id'); } // add custom code - if (ComponentbuilderHelper::checkArray($this->customCodeIds)) + if (isset($this->exportIDs['custom_code']) && ComponentbuilderHelper::checkArray($this->exportIDs['custom_code'])) { - $this->setData('custom_code', $this->customCodeIds, 'id'); + $this->setData('custom_code', array_values($this->exportIDs['custom_code']), 'id'); } // has any data been set - if (ComponentbuilderHelper::checkArray($this->smartExport['joomla_component'])) + if (isset($this->smartExport['joomla_component']) && ComponentbuilderHelper::checkArray($this->smartExport['joomla_component'])) { // set the folder and move the files of each component to the folder return $this->smartExportBuilder(); @@ -327,6 +321,39 @@ class ComponentbuilderModelJoomla_components extends JModelList return false; } + /** + * Set export IDs. + * + * @return void. + */ + protected function setExportIDs($value, $table) + { + // check if table has been set + if (!isset($this->exportIDs[$table])) + { + $this->exportIDs[$table] = array(); + } + // convert if value is in json + if (ComponentbuilderHelper::checkJson($value)) + { + $value = json_decode($value, true); + } + // now update the fields + if (ComponentbuilderHelper::checkArray($value)) + { + foreach ($value as $id) + { + if ((ComponentbuilderHelper::checkString($id) || is_numeric($id)) && 0 !== (int) $id) + { + $this->exportIDs[$table][(int) $id] = (int) $id; + } + } + } + elseif ((ComponentbuilderHelper::checkString($value) || is_numeric($value)) && 0 !== (int) $value) + { + $this->exportIDs[$table][(int) $value] = (int) $value; + } + } /** * Method to get ids. @@ -439,11 +466,11 @@ class ComponentbuilderModelJoomla_components extends JModelList // reset the global array if ('template' === $table) { - $this->templateIds = array(); + $this->exportIDs['template'] = array(); } elseif ('layout' === $table) { - $this->layoutIds = array(); + $this->exportIDs['layout'] = array(); } // start loading the data if (!isset($this->smartExport[$table])) @@ -454,7 +481,7 @@ class ComponentbuilderModelJoomla_components extends JModelList foreach ($items as $nr => &$item) { // set the data per id only once - if (isset($this->smartExport[$table][$item->id])) + if (!isset($item->id) || 0 === (int) $item->id || isset($this->smartExport[$table][$item->id])) { continue; } @@ -466,7 +493,7 @@ class ComponentbuilderModelJoomla_components extends JModelList if ('admin_view' === $table) { // add fields & conditions - $this->adminViewIds[$item->id] = $item->id; + $this->setExportIDs($item->id, 'admin_view'); // admin icon $this->moveIt(array('image' => array($item->icon)), 'image'); // admin icon_add @@ -484,7 +511,7 @@ class ComponentbuilderModelJoomla_components extends JModelList if ('field' === $table) { // add field types - $this->fieldTypeIds[$item->fieldtype] = $item->fieldtype; + $this->setExportIDs($item->fieldtype, 'fieldtype'); // check if this field has multiple fields if ($this->checkMultiFields($item->fieldtype)) { @@ -517,30 +544,27 @@ class ComponentbuilderModelJoomla_components extends JModelList { if (isset($item->{'add_'.$scripter}) && $item->{'add_'.$scripter} == 1) { - $this->getTemplateLayout($item->$scripter); + $this->getTemplateLayout($item->{$scripter}); } } // add dynamic gets - $this->dynamicGetIds[$item->main_get] = $item->main_get; - if (ComponentbuilderHelper::checkArray($item->custom_get)) - { - foreach ($item->custom_get as $custom_get) - { - // add dynamic gets - $this->dynamicGetIds[$custom_get] = $custom_get; - } - } + $this->setExportIDs($item->main_get, 'dynamic_get'); + $this->setExportIDs($item->custom_get, 'dynamic_get'); + $this->setExportIDs($item->dynamic_get, 'dynamic_get'); + // move the icon if ('custom_admin_view' === $table && isset($item->icon)) { // view icon $this->moveIt(array('image' => array($item->icon)), 'image'); } // add snippets - $this->snippetIds[$item->snippet] = $item->snippet; + $this->setExportIDs((int) $item->snippet, 'snippet'); } // actions to take if table is template and layout if ('layout' === $table || 'template' === $table) { + // add snippets + $this->setExportIDs((int) $item->snippet, 'snippet'); // search for templates & layouts $this->getTemplateLayout(base64_decode($item->$table), $this->user); // add search array templates and layouts @@ -549,9 +573,7 @@ class ComponentbuilderModelJoomla_components extends JModelList $this->getTemplateLayout($item->php_view, $this->user); } // add dynamic gets - $this->dynamicGetIds[$item->dynamic_get] = $item->dynamic_get; - // add snippets - $this->snippetIds[$item->snippet] = $item->snippet; + $this->setExportIDs((int) $item->dynamic_get, 'dynamic_get'); } } } @@ -882,9 +904,9 @@ class ComponentbuilderModelJoomla_components extends JModelList $data = $this->getDataWithAlias($template, 'template'); if (ComponentbuilderHelper::checkArray($data)) { - if (!isset($this->templateIds[$data['id']])) + if (!isset($this->exportIDs['template']) || !isset($this->exportIDs['template'][$data['id']])) { - $this->templateIds[$data['id']] = $data['id']; + $this->setExportIDs($data['id'], 'template'); // call self to get child data $again[] = $data['html']; $again[] = $data['php_view']; @@ -917,9 +939,9 @@ class ComponentbuilderModelJoomla_components extends JModelList $data = $this->getDataWithAlias($layout, 'layout'); if (ComponentbuilderHelper::checkArray($data)) { - if (!isset($this->layoutIds[$data['id']])) + if (!isset($this->exportIDs['layout']) && !isset($this->exportIDs['layout'][$data['id']])) { - $this->layoutIds[$data['id']] = $data['id']; + $this->setExportIDs($data['id'], 'layout'); // call self to get child data $again[] = $data['html']; $again[] = $data['php_view']; @@ -938,14 +960,14 @@ class ComponentbuilderModelJoomla_components extends JModelList if ($user) { // add templates - if (ComponentbuilderHelper::checkArray($this->templateIds)) + if (isset($this->exportIDs['template']) && ComponentbuilderHelper::checkArray($this->exportIDs['template'])) { - $this->setData('template', $this->templateIds, 'id'); + $this->setData('template', array_values($this->exportIDs['template']), 'id'); } // add layouts - if (ComponentbuilderHelper::checkArray($this->layoutIds)) + if (isset($this->exportIDs['layout']) && ComponentbuilderHelper::checkArray($this->exportIDs['layout'])) { - $this->setData('layout', $this->layoutIds, 'id'); + $this->setData('layout', array_values($this->exportIDs['layout']), 'id'); } } } @@ -1029,13 +1051,13 @@ class ComponentbuilderModelJoomla_components extends JModelList // if numeric add to ids if (is_numeric($func)) { - $this->customCodeIds[$func] = (int) $func; + $this->setExportIDs($func, 'custom_code'); } elseif (ComponentbuilderHelper::checkString($func)) { if ($funcID = ComponentbuilderHelper::getVar('custom_code', $func, 'function_name', 'id')) { - $this->customCodeIds[$funcID] = (int) $funcID; + $this->setExportIDs($funcID, 'custom_code'); } } } diff --git a/admin/tables/dynamic_get.php b/admin/tables/dynamic_get.php index 6fe77d5fd..569080be3 100644 --- a/admin/tables/dynamic_get.php +++ b/admin/tables/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php index 1a5df82a1..2e129bbbd 100644 --- a/admin/tables/joomla_component.php +++ b/admin/tables/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index afb5df3e4..d070d81d3 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php index 7a3e5eac9..d4c143a11 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php index deeab391e..09fd300f2 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index 1a7e61c5e..188a3c016 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index 0f353921a..97984f9c7 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_releases_information.php b/admin/views/componentbuilder/tmpl/default_releases_information.php index cdae5540c..00dcad660 100644 --- a/admin/views/componentbuilder/tmpl/default_releases_information.php +++ b/admin/views/componentbuilder/tmpl/default_releases_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_releases_information.php diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index ec851c2f6..09ec04782 100644 --- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index da8c1f34c..0e3ccfe49 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php index f54c4d1d6..ade771655 100644 --- a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php +++ b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_wiki_tutorials.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 63cbe4226..6d3128558 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/dynamic_get/submitbutton.js b/admin/views/dynamic_get/submitbutton.js index 1f5ef61de..4256a50ee 100644 --- a/admin/views/dynamic_get/submitbutton.js +++ b/admin/views/dynamic_get/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/dynamic_get/tmpl/edit.php b/admin/views/dynamic_get/tmpl/edit.php index 0584172a1..11b9abff4 100644 --- a/admin/views/dynamic_get/tmpl/edit.php +++ b/admin/views/dynamic_get/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php index 35f860f47..98084a69a 100644 --- a/admin/views/dynamic_get/view.html.php +++ b/admin/views/dynamic_get/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/dynamic_gets/tmpl/default.php b/admin/views/dynamic_gets/tmpl/default.php index 60f659741..8a6e00fed 100644 --- a/admin/views/dynamic_gets/tmpl/default.php +++ b/admin/views/dynamic_gets/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/dynamic_gets/tmpl/default_batch_body.php b/admin/views/dynamic_gets/tmpl/default_batch_body.php index 0f29180ff..636c62ce5 100644 --- a/admin/views/dynamic_gets/tmpl/default_batch_body.php +++ b/admin/views/dynamic_gets/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/dynamic_gets/tmpl/default_batch_footer.php b/admin/views/dynamic_gets/tmpl/default_batch_footer.php index 039cf167c..50bcb4568 100644 --- a/admin/views/dynamic_gets/tmpl/default_batch_footer.php +++ b/admin/views/dynamic_gets/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/dynamic_gets/tmpl/default_body.php b/admin/views/dynamic_gets/tmpl/default_body.php index bef9e6c3d..977d59b04 100644 --- a/admin/views/dynamic_gets/tmpl/default_body.php +++ b/admin/views/dynamic_gets/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/dynamic_gets/tmpl/default_foot.php b/admin/views/dynamic_gets/tmpl/default_foot.php index 8b4593900..384434b17 100644 --- a/admin/views/dynamic_gets/tmpl/default_foot.php +++ b/admin/views/dynamic_gets/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/dynamic_gets/tmpl/default_head.php b/admin/views/dynamic_gets/tmpl/default_head.php index d30f1a7c7..c526367de 100644 --- a/admin/views/dynamic_gets/tmpl/default_head.php +++ b/admin/views/dynamic_gets/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/dynamic_gets/tmpl/default_toolbar.php b/admin/views/dynamic_gets/tmpl/default_toolbar.php index 0e30a2b12..85d6e8c09 100644 --- a/admin/views/dynamic_gets/tmpl/default_toolbar.php +++ b/admin/views/dynamic_gets/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php index 8eaecfdc7..939ed3918 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index bfacaef2d..ddbeb00c6 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 585f7e5e3..eb4ef9fc7 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php index 839a1b049..923ea5f7b 100644 --- a/admin/views/import_joomla_components/tmpl/default.php +++ b/admin/views/import_joomla_components/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index 69be01db1..86bb54a0e 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_component/submitbutton.js b/admin/views/joomla_component/submitbutton.js index 34dd5862e..30b1c09f4 100644 --- a/admin/views/joomla_component/submitbutton.js +++ b/admin/views/joomla_component/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php index 08c810165..70bca640f 100644 --- a/admin/views/joomla_component/tmpl/edit.php +++ b/admin/views/joomla_component/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php index 32040e236..23fec6c0e 100644 --- a/admin/views/joomla_component/view.html.php +++ b/admin/views/joomla_component/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_components/tmpl/default.php b/admin/views/joomla_components/tmpl/default.php index 1a8ca16ed..060cd0bac 100644 --- a/admin/views/joomla_components/tmpl/default.php +++ b/admin/views/joomla_components/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/joomla_components/tmpl/default_batch_body.php b/admin/views/joomla_components/tmpl/default_batch_body.php index b0e06ce45..e216ec82c 100644 --- a/admin/views/joomla_components/tmpl/default_batch_body.php +++ b/admin/views/joomla_components/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/joomla_components/tmpl/default_batch_footer.php b/admin/views/joomla_components/tmpl/default_batch_footer.php index cfc51b604..6c3189335 100644 --- a/admin/views/joomla_components/tmpl/default_batch_footer.php +++ b/admin/views/joomla_components/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/joomla_components/tmpl/default_body.php b/admin/views/joomla_components/tmpl/default_body.php index 27a982194..d7bcd56a0 100644 --- a/admin/views/joomla_components/tmpl/default_body.php +++ b/admin/views/joomla_components/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/joomla_components/tmpl/default_foot.php b/admin/views/joomla_components/tmpl/default_foot.php index c9a950003..42c5cac83 100644 --- a/admin/views/joomla_components/tmpl/default_foot.php +++ b/admin/views/joomla_components/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/joomla_components/tmpl/default_head.php b/admin/views/joomla_components/tmpl/default_head.php index 9313296c1..cdde05eba 100644 --- a/admin/views/joomla_components/tmpl/default_head.php +++ b/admin/views/joomla_components/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/joomla_components/tmpl/default_toolbar.php b/admin/views/joomla_components/tmpl/default_toolbar.php index 5939a38e5..68c44225e 100644 --- a/admin/views/joomla_components/tmpl/default_toolbar.php +++ b/admin/views/joomla_components/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index 2a3fedddd..a81803343 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/componentbuilder.xml b/componentbuilder.xml index 7424f69dc..2844fd5a7 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 18th October, 2017 + 20th October, 2017 Llewellyn van der Merwe joomla@vdm.io http://vdm.bz/component-builder diff --git a/script.php b/script.php index adf9ad29c..8bf896ae5 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage script.php diff --git a/site/assets/css/site.css b/site/assets/css/site.css index e4660bd83..8bac53ad4 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 0b9f8a9c5..265fa5103 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.js diff --git a/site/componentbuilder.php b/site/componentbuilder.php index 3938a7874..2db24e62d 100644 --- a/site/componentbuilder.php +++ b/site/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/controller.php b/site/controller.php index 7f97061dd..e01169c0e 100644 --- a/site/controller.php +++ b/site/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/site/controllers/api.php b/site/controllers/api.php index 56193db55..79dcfc636 100644 --- a/site/controllers/api.php +++ b/site/controllers/api.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage api.php diff --git a/site/controllers/help.php b/site/controllers/help.php index 7f9ebbc7d..658f89394 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/site/helpers/category.php b/site/helpers/category.php index f108f5b92..9b1366222 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage category.php diff --git a/site/helpers/categoryfields.php b/site/helpers/categoryfields.php index 5547a0efd..9f47db8f2 100644 --- a/site/helpers/categoryfields.php +++ b/site/helpers/categoryfields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfields.php diff --git a/site/helpers/categoryfieldtypes.php b/site/helpers/categoryfieldtypes.php index e10473df5..43d88f2e7 100644 --- a/site/helpers/categoryfieldtypes.php +++ b/site/helpers/categoryfieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfieldtypes.php diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index 7d48a0a04..7695a6846 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index fda934257..fb57b6bcf 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 79a6e8e37..d8ba7868d 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage route.php diff --git a/site/router.php b/site/router.php index 243c9cdc8..8cfc83224 100644 --- a/site/router.php +++ b/site/router.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage router.php diff --git a/site/views/api/submitbutton.js b/site/views/api/submitbutton.js index 98cc09745..4b42d026f 100644 --- a/site/views/api/submitbutton.js +++ b/site/views/api/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js -- 2.40.1 From a19b410adca88ef15ea619921d3bf965d26077c0 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sat, 21 Oct 2017 01:53:13 +0200 Subject: [PATCH 14/14] Stable Release To Upgrade https://youtu.be/YaycQcsMpOs --- admin/assets/css/custom_admin_view.css | 2 +- admin/assets/css/custom_admin_views.css | 2 +- admin/assets/css/site_view.css | 2 +- admin/assets/css/site_views.css | 2 +- admin/controllers/custom_admin_view.php | 2 +- admin/controllers/custom_admin_views.php | 2 +- admin/controllers/site_view.php | 2 +- admin/controllers/site_views.php | 2 +- admin/helpers/compiler/b_Structure.php | 1 + admin/models/custom_admin_view.php | 2 +- admin/models/custom_admin_views.php | 2 +- admin/models/forms/custom_admin_view.js | 2 +- admin/models/forms/site_view.js | 2 +- admin/models/site_view.php | 2 +- admin/models/site_views.php | 2 +- admin/tables/custom_admin_view.php | 2 +- admin/tables/site_view.php | 2 +- admin/views/custom_admin_view/submitbutton.js | 2 +- admin/views/custom_admin_view/tmpl/edit.php | 2 +- admin/views/custom_admin_view/view.html.php | 2 +- admin/views/custom_admin_views/tmpl/default.php | 2 +- admin/views/custom_admin_views/tmpl/default_batch_body.php | 2 +- admin/views/custom_admin_views/tmpl/default_batch_footer.php | 2 +- admin/views/custom_admin_views/tmpl/default_body.php | 2 +- admin/views/custom_admin_views/tmpl/default_foot.php | 2 +- admin/views/custom_admin_views/tmpl/default_head.php | 2 +- admin/views/custom_admin_views/tmpl/default_toolbar.php | 2 +- admin/views/custom_admin_views/view.html.php | 2 +- admin/views/site_view/submitbutton.js | 2 +- admin/views/site_view/tmpl/edit.php | 2 +- admin/views/site_view/view.html.php | 2 +- admin/views/site_views/tmpl/default.php | 2 +- admin/views/site_views/tmpl/default_batch_body.php | 2 +- admin/views/site_views/tmpl/default_batch_footer.php | 2 +- admin/views/site_views/tmpl/default_body.php | 2 +- admin/views/site_views/tmpl/default_foot.php | 2 +- admin/views/site_views/tmpl/default_head.php | 2 +- admin/views/site_views/tmpl/default_toolbar.php | 2 +- admin/views/site_views/view.html.php | 2 +- site/assets/css/api.css | 2 +- site/models/api.php | 2 +- site/views/api/tmpl/default.php | 2 +- site/views/api/view.html.php | 2 +- 43 files changed, 43 insertions(+), 42 deletions(-) diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index 626d5b601..22ffc7e4d 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.css diff --git a/admin/assets/css/custom_admin_views.css b/admin/assets/css/custom_admin_views.css index 50da3947f..c82eee70b 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.css diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index 86aa48888..c4130729a 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.css diff --git a/admin/assets/css/site_views.css b/admin/assets/css/site_views.css index a0549fc13..8a73448ff 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.css diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index 8ba87a505..c7bd3893a 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index 353cf2c82..e164ff3bd 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index 8357e755f..28de35c78 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index ca3cd1857..4e7bee7b9 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php index 3c3383f6d..f217787fc 100644 --- a/admin/helpers/compiler/b_Structure.php +++ b/admin/helpers/compiler/b_Structure.php @@ -320,6 +320,7 @@ class Structure extends Get $this->componentSalesName = 'com_'.$this->componentData->sales_name.'__J'.$this->joomlaVersion; $this->componentBackupName = 'com_'.$this->componentData->sales_name.'_v'.str_replace('.','_',$this->componentData->component_version).'__J'.$this->joomlaVersion; $this->componentFolderName = 'com_'.$this->componentData->name_code.'_v'.str_replace('.','_',$this->componentData->component_version).'__J'.$this->joomlaVersion; + // set component folder path $this->componentPath = $this->compilerPath.'/'.$this->componentFolderName; // set the template path for custom diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index a91c9f59d..eac01ceb5 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index ba7015b95..0287d9644 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js index 9eaa7515d..f45ce7e5d 100644 --- a/admin/models/forms/custom_admin_view.js +++ b/admin/models/forms/custom_admin_view.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.js diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js index bf18c52b9..74f730bf1 100644 --- a/admin/models/forms/site_view.js +++ b/admin/models/forms/site_view.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.js diff --git a/admin/models/site_view.php b/admin/models/site_view.php index 9b5ddddcd..1667d48c9 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/models/site_views.php b/admin/models/site_views.php index 08efc2497..7a08c7ffb 100644 --- a/admin/models/site_views.php +++ b/admin/models/site_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/tables/custom_admin_view.php b/admin/tables/custom_admin_view.php index a9a55ed01..7ad8c5275 100644 --- a/admin/tables/custom_admin_view.php +++ b/admin/tables/custom_admin_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/tables/site_view.php b/admin/tables/site_view.php index 716580355..03be1d5fe 100644 --- a/admin/tables/site_view.php +++ b/admin/tables/site_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/views/custom_admin_view/submitbutton.js b/admin/views/custom_admin_view/submitbutton.js index 891e291bb..999c0d15c 100644 --- a/admin/views/custom_admin_view/submitbutton.js +++ b/admin/views/custom_admin_view/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php index 67dfd1aed..487d58c35 100644 --- a/admin/views/custom_admin_view/tmpl/edit.php +++ b/admin/views/custom_admin_view/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index a30d018ad..bd0542bc8 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_admin_views/tmpl/default.php b/admin/views/custom_admin_views/tmpl/default.php index bb7078318..50dd1ca0f 100644 --- a/admin/views/custom_admin_views/tmpl/default.php +++ b/admin/views/custom_admin_views/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/custom_admin_views/tmpl/default_batch_body.php b/admin/views/custom_admin_views/tmpl/default_batch_body.php index 1590608c2..79493b84e 100644 --- a/admin/views/custom_admin_views/tmpl/default_batch_body.php +++ b/admin/views/custom_admin_views/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/custom_admin_views/tmpl/default_batch_footer.php b/admin/views/custom_admin_views/tmpl/default_batch_footer.php index 62b8df28c..4a832c2e1 100644 --- a/admin/views/custom_admin_views/tmpl/default_batch_footer.php +++ b/admin/views/custom_admin_views/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/custom_admin_views/tmpl/default_body.php b/admin/views/custom_admin_views/tmpl/default_body.php index 59787b3c2..fcc6b6f7a 100644 --- a/admin/views/custom_admin_views/tmpl/default_body.php +++ b/admin/views/custom_admin_views/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/custom_admin_views/tmpl/default_foot.php b/admin/views/custom_admin_views/tmpl/default_foot.php index 80bad7182..2d4ebdb63 100644 --- a/admin/views/custom_admin_views/tmpl/default_foot.php +++ b/admin/views/custom_admin_views/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/custom_admin_views/tmpl/default_head.php b/admin/views/custom_admin_views/tmpl/default_head.php index 249f5b7d6..5dc213983 100644 --- a/admin/views/custom_admin_views/tmpl/default_head.php +++ b/admin/views/custom_admin_views/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/custom_admin_views/tmpl/default_toolbar.php b/admin/views/custom_admin_views/tmpl/default_toolbar.php index 79cfa975d..30720214a 100644 --- a/admin/views/custom_admin_views/tmpl/default_toolbar.php +++ b/admin/views/custom_admin_views/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index 442a935b0..ec9770eda 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 32 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 13th August, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/site_view/submitbutton.js b/admin/views/site_view/submitbutton.js index 5b3f02d4a..a95cf4756 100644 --- a/admin/views/site_view/submitbutton.js +++ b/admin/views/site_view/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php index 20fc5a94b..635f1266a 100644 --- a/admin/views/site_view/tmpl/edit.php +++ b/admin/views/site_view/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php index 2d10b8179..a19fc264b 100644 --- a/admin/views/site_view/view.html.php +++ b/admin/views/site_view/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/site_views/tmpl/default.php b/admin/views/site_views/tmpl/default.php index 4de8e9a93..773b20e37 100644 --- a/admin/views/site_views/tmpl/default.php +++ b/admin/views/site_views/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/site_views/tmpl/default_batch_body.php b/admin/views/site_views/tmpl/default_batch_body.php index 570ec83af..5d21f8ab1 100644 --- a/admin/views/site_views/tmpl/default_batch_body.php +++ b/admin/views/site_views/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/site_views/tmpl/default_batch_footer.php b/admin/views/site_views/tmpl/default_batch_footer.php index 26f293d1e..ae5950904 100644 --- a/admin/views/site_views/tmpl/default_batch_footer.php +++ b/admin/views/site_views/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/site_views/tmpl/default_body.php b/admin/views/site_views/tmpl/default_body.php index 15850ca39..6be4775e9 100644 --- a/admin/views/site_views/tmpl/default_body.php +++ b/admin/views/site_views/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/site_views/tmpl/default_foot.php b/admin/views/site_views/tmpl/default_foot.php index 89b52d8f1..aec8203e6 100644 --- a/admin/views/site_views/tmpl/default_foot.php +++ b/admin/views/site_views/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/site_views/tmpl/default_head.php b/admin/views/site_views/tmpl/default_head.php index b366f1abb..17544d0f5 100644 --- a/admin/views/site_views/tmpl/default_head.php +++ b/admin/views/site_views/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/site_views/tmpl/default_toolbar.php b/admin/views/site_views/tmpl/default_toolbar.php index 8671ade63..ed0618270 100644 --- a/admin/views/site_views/tmpl/default_toolbar.php +++ b/admin/views/site_views/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php index 46c2e8acd..b63b2c798 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 63 of this MVC - @build 14th October, 2017 + @build 20th October, 2017 @created 29th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/site/assets/css/api.css b/site/assets/css/api.css index dd4585a78..a26f3fc52 100644 --- a/site/assets/css/api.css +++ b/site/assets/css/api.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 7 of this MVC - @build 19th August, 2017 + @build 20th October, 2017 @created 19th August, 2017 @package Component Builder @subpackage api.css diff --git a/site/models/api.php b/site/models/api.php index 1948e8044..50a9c2f5c 100644 --- a/site/models/api.php +++ b/site/models/api.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 7 of this MVC - @build 19th August, 2017 + @build 20th October, 2017 @created 19th August, 2017 @package Component Builder @subpackage api.php diff --git a/site/views/api/tmpl/default.php b/site/views/api/tmpl/default.php index 72cda7977..895bf8b83 100644 --- a/site/views/api/tmpl/default.php +++ b/site/views/api/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 7 of this MVC - @build 19th August, 2017 + @build 20th October, 2017 @created 19th August, 2017 @package Component Builder @subpackage default.php diff --git a/site/views/api/view.html.php b/site/views/api/view.html.php index 41a9d2cf4..1225fcfd9 100644 --- a/site/views/api/view.html.php +++ b/site/views/api/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 7 of this MVC - @build 19th August, 2017 + @build 20th October, 2017 @created 19th August, 2017 @package Component Builder @subpackage view.html.php -- 2.40.1