From ea2b2ea4c417c2ab55ddb99adf31495677f9ae5f Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 20 Jan 2017 02:16:50 +0200 Subject: [PATCH] added feature to remove site folder if not needed, also some linked to component tabs to fields, admin views, site views, and custom admin views --- README.md | 6 +- admin/README.txt | 6 +- admin/assets/css/admin.css | 2 +- admin/assets/css/admin_view.css | 2 +- admin/assets/css/admin_views.css | 2 +- admin/assets/css/component.css | 2 +- admin/assets/css/components.css | 2 +- 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 | 2 +- admin/assets/css/dynamic_gets.css | 2 +- admin/assets/css/field.css | 2 +- admin/assets/css/fields.css | 2 +- admin/assets/css/fieldtype.css | 2 +- admin/assets/css/fieldtypes.css | 2 +- admin/assets/css/help_document.css | 2 +- admin/assets/css/help_documents.css | 2 +- admin/assets/css/layout.css | 2 +- admin/assets/css/layouts.css | 2 +- admin/assets/css/site_view.css | 2 +- admin/assets/css/site_views.css | 2 +- admin/assets/css/snippet.css | 2 +- admin/assets/css/snippets.css | 2 +- admin/assets/css/template.css | 2 +- admin/assets/css/templates.css | 2 +- admin/componentbuilder.php | 2 +- admin/controller.php | 2 +- admin/controllers/admin_view.php | 2 +- admin/controllers/admin_views.php | 2 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/compiler.php | 2 +- admin/controllers/component.php | 2 +- admin/controllers/componentbuilder.php | 2 +- admin/controllers/components.php | 2 +- admin/controllers/custom_admin_view.php | 2 +- admin/controllers/custom_admin_views.php | 2 +- admin/controllers/dynamic_get.php | 2 +- admin/controllers/dynamic_gets.php | 2 +- admin/controllers/field.php | 2 +- admin/controllers/fields.php | 2 +- admin/controllers/fieldtype.php | 2 +- admin/controllers/fieldtypes.php | 2 +- admin/controllers/help.php | 2 +- admin/controllers/help_document.php | 2 +- admin/controllers/help_documents.php | 2 +- admin/controllers/import.php | 2 +- admin/controllers/layout.php | 2 +- admin/controllers/layouts.php | 2 +- admin/controllers/site_view.php | 2 +- admin/controllers/site_views.php | 2 +- admin/controllers/snippet.php | 2 +- admin/controllers/snippets.php | 2 +- admin/controllers/template.php | 2 +- admin/controllers/templates.php | 2 +- admin/helpers/compiler.php | 13 + admin/helpers/compiler/e_Interpretation.php | 30 +- admin/helpers/compiler/f_Infusion.php | 6 + admin/helpers/componentbuilder.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_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 | 2 +- .../admin_view/javascript_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 138 +++ 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 | 2 +- admin/layouts/admin_view/settings_under.php | 2 +- admin/layouts/batchselection.php | 2 +- .../component/admin_views_fullwidth.php | 2 +- .../custom_admin_views_fullwidth.php | 2 +- admin/layouts/component/details_above.php | 2 +- admin/layouts/component/details_left.php | 2 +- admin/layouts/component/details_right.php | 2 +- admin/layouts/component/details_under.php | 2 +- .../dynamic_build_beta_fullwidth.php | 2 +- .../dynamic_integration_fullwidth.php | 2 +- .../component/libs_helpers_fullwidth.php | 2 +- admin/layouts/component/mysql_fullwidth.php | 2 +- admin/layouts/component/php_fullwidth.php | 2 +- admin/layouts/component/publishing.php | 2 +- admin/layouts/component/publlshing.php | 2 +- admin/layouts/component/readme_left.php | 2 +- admin/layouts/component/readme_right.php | 2 +- admin/layouts/component/settings_left.php | 2 +- admin/layouts/component/settings_right.php | 2 +- .../component/site_views_fullwidth.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 | 138 +++ .../layouts/custom_admin_view/publishing.php | 2 +- .../layouts/custom_admin_view/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/gettable_above.php | 2 +- .../dynamic_get/gettable_fullwidth.php | 2 +- admin/layouts/dynamic_get/gettable_left.php | 2 +- admin/layouts/dynamic_get/gettable_right.php | 2 +- admin/layouts/dynamic_get/gettable_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_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/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 +- .../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 +- 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 | 138 +++ 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 | 85 +- admin/models/admin_views.php | 2 +- admin/models/ajax.php | 2 +- admin/models/compiler.php | 2 +- admin/models/component.php | 17 +- admin/models/componentbuilder.php | 2 +- admin/models/components.php | 2 +- admin/models/custom_admin_view.php | 80 +- admin/models/custom_admin_views.php | 2 +- admin/models/dynamic_get.php | 2 +- admin/models/dynamic_gets.php | 2 +- admin/models/field.php | 12 +- admin/models/fields.php | 2 +- admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/adminviews.php | 2 +- admin/models/fields/articles.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/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldsmulti.php | 2 +- admin/models/fields/fieldtypes.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 | 28 +- admin/models/fieldtypes.php | 2 +- admin/models/forms/admin_view.js | 2 +- admin/models/forms/component.js | 2 +- admin/models/forms/custom_admin_view.js | 90 +- admin/models/forms/dynamic_get.js | 182 +-- admin/models/forms/field.js | 82 +- admin/models/forms/fieldtype.js | 2 +- admin/models/forms/help_document.js | 62 +- admin/models/forms/layout.js | 12 +- admin/models/forms/site_view.js | 102 +- admin/models/forms/snippet.js | 2 +- admin/models/forms/template.js | 12 +- admin/models/help_document.php | 2 +- admin/models/help_documents.php | 2 +- admin/models/import.php | 2 +- admin/models/layout.php | 2 +- admin/models/layouts.php | 2 +- admin/models/site_view.php | 80 +- admin/models/site_views.php | 2 +- admin/models/snippet.php | 2 +- admin/models/snippets.php | 2 +- admin/models/template.php | 2 +- admin/models/templates.php | 2 +- admin/tables/admin_view.php | 2 +- admin/tables/component.php | 2 +- admin/tables/custom_admin_view.php | 2 +- admin/tables/dynamic_get.php | 2 +- admin/tables/field.php | 2 +- admin/tables/fieldtype.php | 2 +- admin/tables/help_document.php | 2 +- admin/tables/layout.php | 2 +- admin/tables/site_view.php | 2 +- admin/tables/snippet.php | 2 +- admin/tables/template.php | 2 +- admin/views/admin_view/submitbutton.js | 2 +- admin/views/admin_view/tmpl/edit.php | 12 +- admin/views/admin_view/view.html.php | 7 +- 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/tmpl/default.php | 2 +- admin/views/compiler/view.html.php | 2 +- admin/views/component/submitbutton.js | 2 +- admin/views/component/tmpl/edit.php | 2 +- admin/views/component/view.html.php | 2 +- admin/views/componentbuilder/tmpl/default.php | 2 +- ...sed_issues_the_closed_issues_on_github.php | 2 +- .../componentbuilder/tmpl/default_main.php | 2 +- ..._open_issues_the_open_issues_on_github.php | 2 +- .../tmpl/default_readme_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../componentbuilder/tmpl/default_vdm.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/components/tmpl/default.php | 2 +- .../components/tmpl/default_batch_body.php | 2 +- .../components/tmpl/default_batch_footer.php | 2 +- admin/views/components/tmpl/default_body.php | 2 +- admin/views/components/tmpl/default_foot.php | 2 +- admin/views/components/tmpl/default_head.php | 2 +- .../views/components/tmpl/default_toolbar.php | 2 +- admin/views/components/view.html.php | 2 +- admin/views/custom_admin_view/submitbutton.js | 2 +- admin/views/custom_admin_view/tmpl/edit.php | 12 +- admin/views/custom_admin_view/view.html.php | 19 +- .../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/dynamic_get/submitbutton.js | 2 +- admin/views/dynamic_get/tmpl/edit.php | 2 +- admin/views/dynamic_get/view.html.php | 2 +- admin/views/dynamic_gets/tmpl/default.php | 2 +- .../dynamic_gets/tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../views/dynamic_gets/tmpl/default_body.php | 2 +- .../views/dynamic_gets/tmpl/default_foot.php | 2 +- .../views/dynamic_gets/tmpl/default_head.php | 2 +- .../dynamic_gets/tmpl/default_toolbar.php | 2 +- admin/views/dynamic_gets/view.html.php | 2 +- admin/views/field/submitbutton.js | 2 +- admin/views/field/tmpl/edit.php | 2 +- admin/views/field/view.html.php | 4 +- admin/views/fields/tmpl/default.php | 2 +- .../views/fields/tmpl/default_batch_body.php | 2 +- .../fields/tmpl/default_batch_footer.php | 2 +- admin/views/fields/tmpl/default_body.php | 2 +- admin/views/fields/tmpl/default_foot.php | 2 +- admin/views/fields/tmpl/default_head.php | 2 +- admin/views/fields/tmpl/default_toolbar.php | 2 +- admin/views/fields/view.html.php | 2 +- admin/views/fieldtype/submitbutton.js | 2 +- admin/views/fieldtype/tmpl/edit.php | 2 +- admin/views/fieldtype/view.html.php | 4 +- admin/views/fieldtypes/tmpl/default.php | 2 +- .../fieldtypes/tmpl/default_batch_body.php | 2 +- .../fieldtypes/tmpl/default_batch_footer.php | 2 +- admin/views/fieldtypes/tmpl/default_body.php | 2 +- admin/views/fieldtypes/tmpl/default_foot.php | 2 +- admin/views/fieldtypes/tmpl/default_head.php | 2 +- .../views/fieldtypes/tmpl/default_toolbar.php | 2 +- admin/views/fieldtypes/view.html.php | 2 +- admin/views/help_document/submitbutton.js | 2 +- admin/views/help_document/tmpl/edit.php | 2 +- admin/views/help_document/view.html.php | 2 +- admin/views/help_documents/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../help_documents/tmpl/default_body.php | 2 +- .../help_documents/tmpl/default_foot.php | 2 +- .../help_documents/tmpl/default_head.php | 2 +- .../help_documents/tmpl/default_toolbar.php | 2 +- admin/views/help_documents/view.html.php | 2 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- admin/views/layout/submitbutton.js | 2 +- admin/views/layout/tmpl/edit.php | 2 +- admin/views/layout/view.html.php | 2 +- admin/views/layouts/tmpl/default.php | 2 +- .../views/layouts/tmpl/default_batch_body.php | 2 +- .../layouts/tmpl/default_batch_footer.php | 2 +- admin/views/layouts/tmpl/default_body.php | 2 +- admin/views/layouts/tmpl/default_foot.php | 2 +- admin/views/layouts/tmpl/default_head.php | 2 +- admin/views/layouts/tmpl/default_toolbar.php | 2 +- admin/views/layouts/view.html.php | 2 +- admin/views/site_view/submitbutton.js | 2 +- admin/views/site_view/tmpl/edit.php | 12 +- admin/views/site_view/view.html.php | 19 +- admin/views/site_views/tmpl/default.php | 2 +- .../site_views/tmpl/default_batch_body.php | 2 +- .../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 +- .../views/site_views/tmpl/default_toolbar.php | 2 +- admin/views/site_views/view.html.php | 2 +- admin/views/snippet/submitbutton.js | 2 +- admin/views/snippet/tmpl/edit.php | 2 +- admin/views/snippet/view.html.php | 2 +- admin/views/snippets/tmpl/default.php | 2 +- .../snippets/tmpl/default_batch_body.php | 2 +- .../snippets/tmpl/default_batch_footer.php | 2 +- admin/views/snippets/tmpl/default_body.php | 2 +- admin/views/snippets/tmpl/default_foot.php | 2 +- admin/views/snippets/tmpl/default_head.php | 2 +- admin/views/snippets/tmpl/default_toolbar.php | 2 +- admin/views/snippets/view.html.php | 2 +- admin/views/template/submitbutton.js | 2 +- admin/views/template/tmpl/edit.php | 2 +- admin/views/template/view.html.php | 2 +- admin/views/templates/tmpl/default.php | 2 +- .../templates/tmpl/default_batch_body.php | 2 +- .../templates/tmpl/default_batch_footer.php | 2 +- admin/views/templates/tmpl/default_body.php | 2 +- admin/views/templates/tmpl/default_foot.php | 2 +- admin/views/templates/tmpl/default_head.php | 2 +- .../views/templates/tmpl/default_toolbar.php | 2 +- admin/views/templates/view.html.php | 2 +- componentbuilder.xml | 20 +- script.php | 2 +- site/assets/css/index.html | 1 - site/assets/css/site.css | 31 - site/assets/images/index.html | 1 - site/assets/index.html | 1 - site/assets/js/index.html | 1 - site/assets/js/site.js | 0 site/componentbuilder.php | 49 - site/controller.php | 101 -- site/controllers/help.php | 130 -- site/controllers/index.html | 1 - site/helpers/componentbuilder.php | 1068 ----------------- site/helpers/headercheck.php | 85 -- site/helpers/index.html | 1 - site/helpers/route.php | 221 ---- site/index.html | 1 - .../en-GB/en-GB.com_componentbuilder.ini | 17 - .../en-GB/en-GB.com_componentbuilder.sys.ini | 1 - site/language/en-GB/index.html | 1 - site/language/index.html | 1 - site/layouts/index.html | 1 - site/models/index.html | 1 - site/router.php | 193 --- site/views/index.html | 1 - 397 files changed, 1433 insertions(+), 2596 deletions(-) create mode 100644 admin/layouts/admin_view/linked_components_fullwidth.php create mode 100644 admin/layouts/custom_admin_view/linked_components_fullwidth.php create mode 100644 admin/layouts/site_view/linked_components_fullwidth.php delete mode 100644 site/assets/css/index.html delete mode 100644 site/assets/css/site.css delete mode 100644 site/assets/images/index.html delete mode 100644 site/assets/index.html delete mode 100644 site/assets/js/index.html delete mode 100644 site/assets/js/site.js delete mode 100644 site/componentbuilder.php delete mode 100644 site/controller.php delete mode 100644 site/controllers/help.php delete mode 100644 site/controllers/index.html delete mode 100644 site/helpers/componentbuilder.php delete mode 100644 site/helpers/headercheck.php delete mode 100644 site/helpers/index.html delete mode 100644 site/helpers/route.php delete mode 100644 site/index.html delete mode 100644 site/language/en-GB/en-GB.com_componentbuilder.ini delete mode 100644 site/language/en-GB/en-GB.com_componentbuilder.sys.ini delete mode 100644 site/language/en-GB/index.html delete mode 100644 site/language/index.html delete mode 100644 site/layouts/index.html delete mode 100644 site/models/index.html delete mode 100644 site/router.php delete mode 100644 site/views/index.html diff --git a/README.md b/README.md index 0180a0a29..820592de3 100644 --- a/README.md +++ b/README.md @@ -104,12 +104,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 12th January, 2017 ++ *Last Build*: 20th January, 2017 + *Version*: 2.2.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*: **87400** -+ *File count*: **546** ++ *Line count*: **86216** ++ *File count*: **549** + *Folder count*: **100** > 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 0180a0a29..820592de3 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -104,12 +104,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 12th January, 2017 ++ *Last Build*: 20th January, 2017 + *Version*: 2.2.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*: **87400** -+ *File count*: **546** ++ *Line count*: **86216** ++ *File count*: **549** + *Folder count*: **100** > 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 b900b995e..ae23e28c6 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 77cf9bec7..423aff495 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 810cf5ca9..474d145be 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/component.css b/admin/assets/css/component.css index f3ecce0b4..216e0920d 100644 --- a/admin/assets/css/component.css +++ b/admin/assets/css/component.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.css diff --git a/admin/assets/css/components.css b/admin/assets/css/components.css index 4755628a0..10969eee2 100644 --- a/admin/assets/css/components.css +++ b/admin/assets/css/components.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.css diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index 0185a6919..8a709b426 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 726c716c1..c55f4f8a3 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index f3da2a458..d991a46d4 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 5704e8650..2d4db60f1 100644 --- a/admin/assets/css/dynamic_get.css +++ b/admin/assets/css/dynamic_get.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 06e5f329b..4d1ada8d7 100644 --- a/admin/assets/css/dynamic_gets.css +++ b/admin/assets/css/dynamic_gets.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.css diff --git a/admin/assets/css/field.css b/admin/assets/css/field.css index 720bc46d8..d5da69dc2 100644 --- a/admin/assets/css/field.css +++ b/admin/assets/css/field.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 3a2349e6a..c4708a217 100644 --- a/admin/assets/css/fields.css +++ b/admin/assets/css/fields.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.css diff --git a/admin/assets/css/fieldtype.css b/admin/assets/css/fieldtype.css index 7614bf9e4..03e81464a 100644 --- a/admin/assets/css/fieldtype.css +++ b/admin/assets/css/fieldtype.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 0ed0fd732..17cddc7a1 100644 --- a/admin/assets/css/fieldtypes.css +++ b/admin/assets/css/fieldtypes.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 043161e5f..a6967e4db 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 80afde0a1..e4cdab8a7 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage help_documents.css diff --git a/admin/assets/css/layout.css b/admin/assets/css/layout.css index f62e81448..23ff53344 100644 --- a/admin/assets/css/layout.css +++ b/admin/assets/css/layout.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage layout.css diff --git a/admin/assets/css/layouts.css b/admin/assets/css/layouts.css index 6f80e63f4..7d139d361 100644 --- a/admin/assets/css/layouts.css +++ b/admin/assets/css/layouts.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage layouts.css diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index 188ba962c..1d0734d08 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 a656ef044..a6988da86 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views.css diff --git a/admin/assets/css/snippet.css b/admin/assets/css/snippet.css index b7f7b9381..f1a2c89d2 100644 --- a/admin/assets/css/snippet.css +++ b/admin/assets/css/snippet.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippet.css diff --git a/admin/assets/css/snippets.css b/admin/assets/css/snippets.css index d2796ddd6..fd91116ce 100644 --- a/admin/assets/css/snippets.css +++ b/admin/assets/css/snippets.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.css diff --git a/admin/assets/css/template.css b/admin/assets/css/template.css index ac13823ca..5258bb680 100644 --- a/admin/assets/css/template.css +++ b/admin/assets/css/template.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage template.css diff --git a/admin/assets/css/templates.css b/admin/assets/css/templates.css index b0a5dcd05..e9293896e 100644 --- a/admin/assets/css/templates.css +++ b/admin/assets/css/templates.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage templates.css diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index aea9f2b44..c7ecaec73 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index c66ce01b5..1945f5c9d 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 34b382515..393cc7340 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 2edfc9197..ae338c812 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 8f8714d9e..f62752caf 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 73c5e8f40..029049bb5 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage compiler.php diff --git a/admin/controllers/component.php b/admin/controllers/component.php index 031a867fe..525e3cd70 100644 --- a/admin/controllers/component.php +++ b/admin/controllers/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 23b1fa071..7c5a28bca 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/components.php b/admin/controllers/components.php index 1b9658729..83e7abe31 100644 --- a/admin/controllers/components.php +++ b/admin/controllers/components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index 500c60659..5dbd19a68 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 2617b3e5f..796821364 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index c931b50bf..d4e26d404 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index 31047b951..d57506d51 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/controllers/field.php b/admin/controllers/field.php index 4da18eb8b..41cf0c53b 100644 --- a/admin/controllers/field.php +++ b/admin/controllers/field.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index 31c16d6e5..9632b8e11 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php index ffeac2aae..952abad38 100644 --- a/admin/controllers/fieldtype.php +++ b/admin/controllers/fieldtype.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php index b1b6edcba..faf50d75c 100644 --- a/admin/controllers/fieldtypes.php +++ b/admin/controllers/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 7d87e813f..9946b1f9d 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 0af5ed2a6..5404eb9d9 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index e662ed432..31c93b0ec 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 5890eaccb..7bf5e14b4 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php index ff86b5d85..762b56188 100644 --- a/admin/controllers/layout.php +++ b/admin/controllers/layout.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage layout.php diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php index 0c872c463..138c89707 100644 --- a/admin/controllers/layouts.php +++ b/admin/controllers/layouts.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage layouts.php diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index a27322eeb..18d87f169 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index 2048db2db..112a4ac84 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php index 06957acdf..8e3e262ed 100644 --- a/admin/controllers/snippet.php +++ b/admin/controllers/snippet.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php index 2898d22f2..73b2b5065 100644 --- a/admin/controllers/snippets.php +++ b/admin/controllers/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/controllers/template.php b/admin/controllers/template.php index 8ea22f295..f5b3e69e8 100644 --- a/admin/controllers/template.php +++ b/admin/controllers/template.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage template.php diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php index 9c3d0bb8e..c197348a8 100644 --- a/admin/controllers/templates.php +++ b/admin/controllers/templates.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage templates.php diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php index 5e31ff655..c9b2f75bb 100644 --- a/admin/helpers/compiler.php +++ b/admin/helpers/compiler.php @@ -68,6 +68,19 @@ class Compiler extends Infusion { $this->gitPath = $this->params->get('git_folder_path', null); } + // remove site folder + if ($this->removeSiteFolder) + { + // first remove the files and folders + $this->removeFolder($this->componentPath . '/site'); + // clear form component xml + $xmlPath = $this->componentPath . '/'. $this->fileContentStatic['###component###']. '.xml'; + $componentXML = JFile::read($xmlPath); + $textToSite = ComponentbuilderHelper::getBetween($componentXML,'',''); + $textToSiteLang = ComponentbuilderHelper::getBetween($componentXML,'',''); + $componentXML = str_replace(array(''.$textToSite."", ''.$textToSiteLang.""), array('',''), $componentXML); + $this->writeFile($xmlPath,$componentXML); + } // now update the files if ($this->updateFiles()) { diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 93a8ede8a..db5579faa 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -957,14 +957,10 @@ class Interpretation extends Fields $method[] = "\t\t\t\$password = self::randomkey(8);"; $method[] = "\t\t\t\$password2 = \$password;"; $method[] = "\t\t}"; - $method[] = "\t\t//".$this->setLine(__LINE__)." set username"; - $method[] = "\t\tif (isset(\$new['username']) && self::checkString(\$new['username']))"; + $method[] = "\t\t//".$this->setLine(__LINE__)." set username if not set"; + $method[] = "\t\tif (!isset(\$new['username']) || !self::checkString(\$new['username']))"; $method[] = "\t\t{"; - $method[] = "\t\t\t\$new['username'] = self::safeString(\$new['username']);"; - $method[] = "\t\t}"; - $method[] = "\t\telse"; - $method[] = "\t\t{"; - $method[] = "\t\t\t\$new['username'] = self::safeString(\$new['name']);\t\t\t"; + $method[] = "\t\t\t\$new['username'] = self::safeString(\$new['name']);"; $method[] = "\t\t}"; $method[] = "\t\t//".$this->setLine(__LINE__)." linup new user data"; $method[] = "\t\t\$data = array("; @@ -6854,6 +6850,11 @@ class Interpretation extends Fields $query .= "\n\t\t\t\t\t{"; $query .= "\n\t\t\t\t\t\t\$item->".$target." = json_decode(\$item->".$target.");"; $query .= "\n\t\t\t\t\t}"; + $query .= "\n\t\t\t\t\telse"; + $query .= "\n\t\t\t\t\t{"; + $query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= "\n\t\t\t\t\t\tcontinue;"; + $query .= "\n\t\t\t\t\t}"; $query .= "\n\t\t\t\t\tif (!in_array(\$".$globalKey.",\$item->".$target."))"; } else @@ -6862,6 +6863,11 @@ class Interpretation extends Fields $query .= "\n\t\t\t\t\t{"; $query .= "\n\t\t\t\t\t\t\$item->".$_key." = json_decode(\$item->".$_key.");"; $query .= "\n\t\t\t\t\t}"; + $query .= "\n\t\t\t\t\telse"; + $query .= "\n\t\t\t\t\t{"; + $query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= "\n\t\t\t\t\t\tcontinue;"; + $query .= "\n\t\t\t\t\t}"; $query .= "\n\t\t\t\t\tif (!in_array(\$".$globalKey.",\$item->".$_key."))"; } $query .= "\n\t\t\t\t\t{"; @@ -6894,6 +6900,11 @@ class Interpretation extends Fields $query .= "\n\t\t\t\t\t\t\tcontinue;"; $query .= "\n\t\t\t\t\t\t}"; $query .= "\n\t\t\t\t\t}"; + $query .= "\n\t\t\t\t\telse"; + $query .= "\n\t\t\t\t\t{"; + $query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= "\n\t\t\t\t\t\tcontinue;"; + $query .= "\n\t\t\t\t\t}"; $query .= "\n\t\t\t\t}"; $query .= "\n\t\t\t}"; $query .= "\n\t\t\telse"; @@ -6928,6 +6939,11 @@ class Interpretation extends Fields $query .= "\n\t\t\t\t\t\t\tcontinue;"; $query .= "\n\t\t\t\t\t\t}"; $query .= "\n\t\t\t\t\t}"; + $query .= "\n\t\t\t\t\telse"; + $query .= "\n\t\t\t\t\t{"; + $query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);"; + $query .= "\n\t\t\t\t\t\tcontinue;"; + $query .= "\n\t\t\t\t\t}"; $query .= "\n\t\t\t\t}"; $query .= "\n\t\t\t}"; $query .= "\n\t\t\telse"; diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index ac5d398e2..16685a2e0 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -34,6 +34,7 @@ class Infusion extends Interpretation public $eximportView = array(); public $importCustomScripts = array(); + public $removeSiteFolder = false; /** * Constructor @@ -1004,6 +1005,11 @@ class Infusion extends Interpretation // setup the layouts $this->setCustomViewLayouts(); } + else + { + // clear all site folder since none is needed + $this->removeSiteFolder = true; + } // ###LANG_ADMIN### $this->fileContentStatic['###LANG_ADMIN###'] = $this->setLangAdmin(); diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index dd95d0782..b88fb5300 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 51cd22b5e..dee6e720d 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 4c6876c0a..dfdf5e2bd 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index b5223bcad..a1cb1582c 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 7688ec21a..02501ff78 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 8dd1f9648..f0fa3d0a8 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -354,6 +354,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_LAST="Last" COM_COMPONENTBUILDER_ADMIN_VIEW_LEFT_IN_TAB="Left in Tab" COM_COMPONENTBUILDER_ADMIN_VIEW_LEFT_OF_TABS="Left of Tabs" COM_COMPONENTBUILDER_ADMIN_VIEW_LINK="Link" +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" @@ -1674,6 +1675,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_KEY="Key" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LAMP="Lamp" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LAST="Last" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LINK="Link" +COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIST="List" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIST_TWO="List 2" COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LOCATION="Location" @@ -2979,6 +2981,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_KEY="Key" COM_COMPONENTBUILDER_SITE_VIEW_LAMP="Lamp" COM_COMPONENTBUILDER_SITE_VIEW_LAST="Last" COM_COMPONENTBUILDER_SITE_VIEW_LINK="Link" +COM_COMPONENTBUILDER_SITE_VIEW_LINKED_COMPONENTS="Linked - Components" COM_COMPONENTBUILDER_SITE_VIEW_LIST="List" COM_COMPONENTBUILDER_SITE_VIEW_LIST_TWO="List 2" COM_COMPONENTBUILDER_SITE_VIEW_LOCATION="Location" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 0f1214cb8..3930f3387 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 3f5164213..890699292 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 b8c37f687..e84966792 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 70ccd9c88..6ae1b72c3 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 e8de3ae33..46eb50250 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 7ac68662a..92cbd2069 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 new file mode 100644 index 000000000..35208b722 --- /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->vxulinked_components; +$user = JFactory::getUser(); +$id = $displayData->item->id; +$edit = "index.php?option=com_componentbuilder&view=components&task=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('component',$item,'components'); + ?> + + + + + + + + published == 1):?> + + published == 0):?> + + published == 2):?> + + published == -2):?> + + + + + + +
+ + + + + + + + + + + + + + + +
+ get('core.edit')): ?> + escape($item->system_name); ?> + checked_out): ?> + name, $item->checked_out_time, '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 a06e25c30..414b756b8 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 9cca31dc3..00c2d2a0c 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 784527e36..91d110378 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 7a984b31a..886393e61 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d3bcdffa2..c30d201ee 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 6f66d607f..2b103728f 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 0013b75b6..4b92b7dac 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 dd3cd2e40..69e25a218 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index 730d0e55c..ab0b01d97 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 b444fe22e..4c3b60f98 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/component/admin_views_fullwidth.php b/admin/layouts/component/admin_views_fullwidth.php index 10b024ebe..f6f531c23 100644 --- a/admin/layouts/component/admin_views_fullwidth.php +++ b/admin/layouts/component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/component/custom_admin_views_fullwidth.php b/admin/layouts/component/custom_admin_views_fullwidth.php index bd8a9578d..8eeb02d2e 100644 --- a/admin/layouts/component/custom_admin_views_fullwidth.php +++ b/admin/layouts/component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/component/details_above.php b/admin/layouts/component/details_above.php index 4cd5f2ba1..542125fe4 100644 --- a/admin/layouts/component/details_above.php +++ b/admin/layouts/component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/component/details_left.php b/admin/layouts/component/details_left.php index d81e1981c..5282fbab1 100644 --- a/admin/layouts/component/details_left.php +++ b/admin/layouts/component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/component/details_right.php b/admin/layouts/component/details_right.php index 158071871..60226643b 100644 --- a/admin/layouts/component/details_right.php +++ b/admin/layouts/component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/component/details_under.php b/admin/layouts/component/details_under.php index 365ee86c0..b908f3e60 100644 --- a/admin/layouts/component/details_under.php +++ b/admin/layouts/component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/component/dynamic_build_beta_fullwidth.php b/admin/layouts/component/dynamic_build_beta_fullwidth.php index bbc5080f7..33d39bba3 100644 --- a/admin/layouts/component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/component/dynamic_integration_fullwidth.php b/admin/layouts/component/dynamic_integration_fullwidth.php index d6d1b8a28..7b95a2deb 100644 --- a/admin/layouts/component/dynamic_integration_fullwidth.php +++ b/admin/layouts/component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/component/libs_helpers_fullwidth.php b/admin/layouts/component/libs_helpers_fullwidth.php index 77c452f98..d232dcbad 100644 --- a/admin/layouts/component/libs_helpers_fullwidth.php +++ b/admin/layouts/component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/component/mysql_fullwidth.php b/admin/layouts/component/mysql_fullwidth.php index 87a65f576..185d6e0ca 100644 --- a/admin/layouts/component/mysql_fullwidth.php +++ b/admin/layouts/component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/component/php_fullwidth.php b/admin/layouts/component/php_fullwidth.php index a22080b18..8378dfb40 100644 --- a/admin/layouts/component/php_fullwidth.php +++ b/admin/layouts/component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/component/publishing.php b/admin/layouts/component/publishing.php index 7a984b31a..886393e61 100644 --- a/admin/layouts/component/publishing.php +++ b/admin/layouts/component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/component/publlshing.php b/admin/layouts/component/publlshing.php index d3bcdffa2..c30d201ee 100644 --- a/admin/layouts/component/publlshing.php +++ b/admin/layouts/component/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/component/readme_left.php b/admin/layouts/component/readme_left.php index 9dfba7e47..4b28fb55b 100644 --- a/admin/layouts/component/readme_left.php +++ b/admin/layouts/component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/component/readme_right.php b/admin/layouts/component/readme_right.php index ae4ce9285..dfbcac60d 100644 --- a/admin/layouts/component/readme_right.php +++ b/admin/layouts/component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/component/settings_left.php b/admin/layouts/component/settings_left.php index 11ffd6fc4..cc8fd490c 100644 --- a/admin/layouts/component/settings_left.php +++ b/admin/layouts/component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/component/settings_right.php b/admin/layouts/component/settings_right.php index c2a3cfc27..068c3d569 100644 --- a/admin/layouts/component/settings_right.php +++ b/admin/layouts/component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/component/site_views_fullwidth.php b/admin/layouts/component/site_views_fullwidth.php index e1bc70672..c0af1ade4 100644 --- a/admin/layouts/component/site_views_fullwidth.php +++ b/admin/layouts/component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 3f5164213..890699292 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 b8c37f687..e84966792 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 b3d0dec36..b56b14231 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 4cd5f2ba1..542125fe4 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 4a8800448..586c6d51e 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 c259f9add..95160232d 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 8b39c3ff6..fe0cc8b6c 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 11a614c91..325e5cee2 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 365ee86c0..b908f3e60 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 new file mode 100644 index 000000000..637b940f8 --- /dev/null +++ b/admin/layouts/custom_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->vyelinked_components; +$user = JFactory::getUser(); +$id = $displayData->item->id; +$edit = "index.php?option=com_componentbuilder&view=components&task=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('component',$item,'components'); + ?> + + + + + + + + published == 1):?> + + published == 0):?> + + published == 2):?> + + published == -2):?> + + + + + + +
+ + + + + + + + + + + + + + + +
+ get('core.edit')): ?> + escape($item->system_name); ?> + checked_out): ?> + name, $item->checked_out_time, '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/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 7a984b31a..886393e61 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d3bcdffa2..c30d201ee 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 73bc99fe8..a29a0fde0 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 b9caa7db6..431c5b16e 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 26674730d..ca2b51250 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.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index 5121e95c8..b2cef68fd 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_above.php diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index eb699b0be..24c842742 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index 2bd791e5e..6e5bab8d6 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_left.php diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index 748b23e2a..836056bc1 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_right.php diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index 5e75cbd09..0f77546e8 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 7a984b31a..886393e61 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d3bcdffa2..c30d201ee 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d2b0fb4c2..19c8b09bb 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 16c0513c2..c3aa2909e 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 e62e16409..31df87090 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 365ee86c0..b908f3e60 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 c9d7cf935..8a8890296 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.2.6 - @build 12th January, 2017 + @build 20th January, 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->vzplinked_admin_views; +$items = $displayData->vzslinked_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 7a984b31a..886393e61 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d3bcdffa2..c30d201ee 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 da95c1f9a..42c417949 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 2d938a162..a3d562bd5 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index c070b4922..97dd20a56 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 8f36e8251..88a7b61dd 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 10d68f70b..1255d7c2c 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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->vzqfields; +$items = $displayData->vztfields; $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 7a984b31a..886393e61 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d3bcdffa2..c30d201ee 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 b10391274..2185a5b39 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 05ef12b99..2cdd3fb63 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 735882601..0bd1de20f 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 03d306420..4ba2c869a 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 365ee86c0..b908f3e60 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 7a984b31a..886393e61 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 8165c0c9f..83d372208 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 53547efb4..a1479b688 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 bd1e0eca8..b5954f5bf 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 c259f9add..95160232d 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 df6318c7b..dd773dca8 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 08dc61235..fbf14c25f 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 365ee86c0..b908f3e60 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 7a984b31a..886393e61 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d3bcdffa2..c30d201ee 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 074a79c32..d97954493 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.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index 4cd5f2ba1..542125fe4 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 4a8800448..586c6d51e 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 c259f9add..95160232d 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 df6318c7b..dd773dca8 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 11a614c91..325e5cee2 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 365ee86c0..b908f3e60 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 eeaff67f9..94a0b16fc 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 new file mode 100644 index 000000000..6df894e47 --- /dev/null +++ b/admin/layouts/site_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->vyplinked_components; +$user = JFactory::getUser(); +$id = $displayData->item->id; +$edit = "index.php?option=com_componentbuilder&view=components&task=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('component',$item,'components'); + ?> + + + + + + + + published == 1):?> + + published == 0):?> + + published == 2):?> + + published == -2):?> + + + + + + +
+ + + + + + + + + + + + + + + +
+ get('core.edit')): ?> + escape($item->system_name); ?> + checked_out): ?> + name, $item->checked_out_time, '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/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 2f57d31cb..bf48236d8 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 7a984b31a..886393e61 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d3bcdffa2..c30d201ee 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 1f52cc15b..769595c83 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 1427495fb..171c0b5a4 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 95de9e483..90861b020 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 7a984b31a..886393e61 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d3bcdffa2..c30d201ee 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 53547efb4..a1479b688 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 c2f2ce24f..7eb7dbec0 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 c259f9add..95160232d 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 df6318c7b..dd773dca8 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 08dc61235..fbf14c25f 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 365ee86c0..b908f3e60 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 7a984b31a..886393e61 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d3bcdffa2..c30d201ee 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 0cce28fd5..44d9e8265 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -275,7 +275,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.admin_view'); } } - $this->idvvvy = $item->addfields; + $this->idvvvy = $item->addfields; + $this->addadmin_viewsvvvz = $item->id; return $item; } @@ -379,6 +380,11 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin continue; } } + else + { + unset($items[$nr]); + continue; + } } } else @@ -466,6 +472,81 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin } } return $value; + } + + /** + * Method to get list data. + * + * @return mixed An array of data items on success, false on failure. + */ + public function getVxulinked_components() + { + // 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_component table + $query->from($db->quoteName('#__componentbuilder_component', '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'); + + // Load the items + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $items = $db->loadObjectList(); + + // 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 (!in_array($this->addadmin_viewsvvvz, $tmpArray['adminview'])) + { + unset($items[$nr]); + continue; + } + } + else + { + unset($items[$nr]); + continue; + } + } + } + else + { + return false; + } + return $items; + } + return false; } /** diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 76ac60c91..6c4633428 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 7a5b29d4a..b1d5537ff 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php diff --git a/admin/models/compiler.php b/admin/models/compiler.php index 391ceda20..47c2efd13 100644 --- a/admin/models/compiler.php +++ b/admin/models/compiler.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage compiler.php diff --git a/admin/models/component.php b/admin/models/component.php index c8e0b1bcc..4b153c94b 100644 --- a/admin/models/component.php +++ b/admin/models/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php @@ -297,6 +297,11 @@ class ComponentbuilderModelComponent extends JModelAdmin continue; } } + else + { + unset($items[$nr]); + continue; + } } } else @@ -388,6 +393,11 @@ class ComponentbuilderModelComponent extends JModelAdmin continue; } } + else + { + unset($items[$nr]); + continue; + } } } else @@ -479,6 +489,11 @@ class ComponentbuilderModelComponent extends JModelAdmin continue; } } + else + { + unset($items[$nr]); + continue; + } } } else diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index d2b215c8e..0ac9cfe54 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/components.php b/admin/models/components.php index 0c4caf5e2..d782a0b01 100644 --- a/admin/models/components.php +++ b/admin/models/components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 70df75cb7..4c25a4aea 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php @@ -168,9 +168,85 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $item->tags = new JHelperTags; $item->tags->getTagIds($item->id, 'com_componentbuilder.custom_admin_view'); } - } + } + $this->addcustom_admin_viewsvvwa = $item->id; return $item; + } + + /** + * Method to get list data. + * + * @return mixed An array of data items on success, false on failure. + */ + public function getVyelinked_components() + { + // 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_component table + $query->from($db->quoteName('#__componentbuilder_component', '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'); + + // Load the items + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $items = $db->loadObjectList(); + + // 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 (!in_array($this->addcustom_admin_viewsvvwa, $tmpArray['customadminview'])) + { + unset($items[$nr]); + continue; + } + } + else + { + unset($items[$nr]); + continue; + } + } + } + else + { + return false; + } + return $items; + } + return false; } /** diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index 42cf3a586..dc6de825f 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 73696ee9b..22f42a51d 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php index 759d8d4d9..0d7d00452 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/models/field.php b/admin/models/field.php index 51da89bda..a74113191 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.php @@ -131,7 +131,7 @@ class ComponentbuilderModelField extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.field'); } } - $this->addfieldsvvvz = $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 getVzplinked_admin_views() + public function getVzslinked_admin_views() { // Get the user object. $user = JFactory::getUser(); @@ -198,15 +198,15 @@ class ComponentbuilderModelField extends JModelAdmin } } - // Filter by addfieldsvvvz in this Repetable Field - if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvvz)) + // 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 (!in_array($this->addfieldsvvvz, $tmpArray['field'])) + if (!in_array($this->addfieldsvvwc, $tmpArray['field'])) { unset($items[$nr]); continue; diff --git a/admin/models/fields.php b/admin/models/fields.php index b0474bdaf..247b3c632 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 965a42bb2..1b65de6a5 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 59ab1d638..7c2af7e42 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 88f4645ec..319f657d9 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index ace4111a2..49d956308 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 0d47ca731..24e51b0e0 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 83a39c8e3..e37b9f3c3 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d8b48dc7b..3de980cd5 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 93514daac..6ff298098 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index fd92809aa..4f0d6e1fc 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 38f024868..fd4e02eb3 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 07dc5cbbb..1c382ca0a 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 202673d4c..25232e703 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 77c51ac1d..2cc427272 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 bf0286674..70710745b 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 643d5a5e5..e354c1e47 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 077f9e051..7eb727ecd 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index acf351f1c..1818a7092 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php @@ -101,7 +101,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.fieldtype'); } } - $this->fieldtypevvwa = $item->id; + $this->fieldtypevvwd = $item->id; return $item; } @@ -111,7 +111,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVzqfields() + public function getVztfields() { // Get the user object. $user = JFactory::getUser(); @@ -131,15 +131,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 fieldtypevvwa global. - $fieldtypevvwa = $this->fieldtypevvwa; - if (is_numeric($fieldtypevvwa )) + // Filter by fieldtypevvwd global. + $fieldtypevvwd = $this->fieldtypevvwd; + if (is_numeric($fieldtypevvwd )) { - $query->where('a.fieldtype = ' . (int) $fieldtypevvwa ); + $query->where('a.fieldtype = ' . (int) $fieldtypevvwd ); } - elseif (is_string($fieldtypevvwa)) + elseif (is_string($fieldtypevvwd)) { - $query->where('a.fieldtype = ' . $db->quote($fieldtypevvwa)); + $query->where('a.fieldtype = ' . $db->quote($fieldtypevvwd)); } else { @@ -195,13 +195,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVzqfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVztfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVzqfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVztfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVzqfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVztfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVzqfields($item->store, 'store'); + $item->store = $this->selectionTranslationVztfields($item->store, 'store'); } } @@ -215,7 +215,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVzqfields($value,$name) + public function selectionTranslationVztfields($value,$name) { // Array of datatype language strings if ($name == 'datatype') diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php index fd792d9a2..c34e362d0 100644 --- a/admin/models/fieldtypes.php +++ b/admin/models/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 2145de8c9..382c93d2e 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js diff --git a/admin/models/forms/component.js b/admin/models/forms/component.js index 8b1ea72fa..cf556bca6 100644 --- a/admin/models/forms/component.js +++ b/admin/models/forms/component.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.js diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js index 45fb38e0b..2a04bfc86 100644 --- a/admin/models/forms/custom_admin_view.js +++ b/admin/models/forms/custom_admin_view.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.js @@ -23,15 +23,15 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvxzvxu_required = false; -jform_vvvvvyavxv_required = false; -jform_vvvvvybvxw_required = false; -jform_vvvvvycvxx_required = false; -jform_vvvvvydvxy_required = false; -jform_vvvvvyevxz_required = false; -jform_vvvvvyfvya_required = false; +jform_vvvvvxzvxv_required = false; +jform_vvvvvyavxw_required = false; +jform_vvvvvybvxx_required = false; +jform_vvvvvycvxy_required = false; +jform_vvvvvydvxz_required = false; +jform_vvvvvyevya_required = false; jform_vvvvvyfvyb_required = false; -jform_vvvvvygvyc_required = false; +jform_vvvvvyfvyc_required = false; +jform_vvvvvygvyd_required = false; // Initial Script jQuery(document).ready(function() @@ -68,26 +68,26 @@ function vvvvvxz(add_php_view_vvvvvxz) if (add_php_view_vvvvvxz == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvxzvxu_required) + if (jform_vvvvvxzvxv_required) { updateFieldRequired('php_view',0); jQuery('#jform_php_view').prop('required','required'); jQuery('#jform_php_view').attr('aria-required',true); jQuery('#jform_php_view').addClass('required'); - jform_vvvvvxzvxu_required = false; + jform_vvvvvxzvxv_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvxzvxu_required) + if (!jform_vvvvvxzvxv_required) { updateFieldRequired('php_view',1); jQuery('#jform_php_view').removeAttr('required'); jQuery('#jform_php_view').removeAttr('aria-required'); jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvxzvxu_required = true; + jform_vvvvvxzvxv_required = true; } } } @@ -99,26 +99,26 @@ function vvvvvya(add_php_jview_display_vvvvvya) if (add_php_jview_display_vvvvvya == 1) { jQuery('#jform_php_jview_display').closest('.control-group').show(); - if (jform_vvvvvyavxv_required) + if (jform_vvvvvyavxw_required) { updateFieldRequired('php_jview_display',0); jQuery('#jform_php_jview_display').prop('required','required'); jQuery('#jform_php_jview_display').attr('aria-required',true); jQuery('#jform_php_jview_display').addClass('required'); - jform_vvvvvyavxv_required = false; + jform_vvvvvyavxw_required = false; } } else { jQuery('#jform_php_jview_display').closest('.control-group').hide(); - if (!jform_vvvvvyavxv_required) + if (!jform_vvvvvyavxw_required) { updateFieldRequired('php_jview_display',1); jQuery('#jform_php_jview_display').removeAttr('required'); jQuery('#jform_php_jview_display').removeAttr('aria-required'); jQuery('#jform_php_jview_display').removeClass('required'); - jform_vvvvvyavxv_required = true; + jform_vvvvvyavxw_required = true; } } } @@ -130,26 +130,26 @@ function vvvvvyb(add_php_jview_vvvvvyb) if (add_php_jview_vvvvvyb == 1) { jQuery('#jform_php_jview').closest('.control-group').show(); - if (jform_vvvvvybvxw_required) + if (jform_vvvvvybvxx_required) { updateFieldRequired('php_jview',0); jQuery('#jform_php_jview').prop('required','required'); jQuery('#jform_php_jview').attr('aria-required',true); jQuery('#jform_php_jview').addClass('required'); - jform_vvvvvybvxw_required = false; + jform_vvvvvybvxx_required = false; } } else { jQuery('#jform_php_jview').closest('.control-group').hide(); - if (!jform_vvvvvybvxw_required) + if (!jform_vvvvvybvxx_required) { updateFieldRequired('php_jview',1); jQuery('#jform_php_jview').removeAttr('required'); jQuery('#jform_php_jview').removeAttr('aria-required'); jQuery('#jform_php_jview').removeClass('required'); - jform_vvvvvybvxw_required = true; + jform_vvvvvybvxx_required = true; } } } @@ -161,26 +161,26 @@ function vvvvvyc(add_php_document_vvvvvyc) if (add_php_document_vvvvvyc == 1) { jQuery('#jform_php_document').closest('.control-group').show(); - if (jform_vvvvvycvxx_required) + if (jform_vvvvvycvxy_required) { updateFieldRequired('php_document',0); jQuery('#jform_php_document').prop('required','required'); jQuery('#jform_php_document').attr('aria-required',true); jQuery('#jform_php_document').addClass('required'); - jform_vvvvvycvxx_required = false; + jform_vvvvvycvxy_required = false; } } else { jQuery('#jform_php_document').closest('.control-group').hide(); - if (!jform_vvvvvycvxx_required) + if (!jform_vvvvvycvxy_required) { updateFieldRequired('php_document',1); jQuery('#jform_php_document').removeAttr('required'); jQuery('#jform_php_document').removeAttr('aria-required'); jQuery('#jform_php_document').removeClass('required'); - jform_vvvvvycvxx_required = true; + jform_vvvvvycvxy_required = true; } } } @@ -192,26 +192,26 @@ function vvvvvyd(add_css_document_vvvvvyd) if (add_css_document_vvvvvyd == 1) { jQuery('#jform_css_document').closest('.control-group').show(); - if (jform_vvvvvydvxy_required) + if (jform_vvvvvydvxz_required) { updateFieldRequired('css_document',0); jQuery('#jform_css_document').prop('required','required'); jQuery('#jform_css_document').attr('aria-required',true); jQuery('#jform_css_document').addClass('required'); - jform_vvvvvydvxy_required = false; + jform_vvvvvydvxz_required = false; } } else { jQuery('#jform_css_document').closest('.control-group').hide(); - if (!jform_vvvvvydvxy_required) + if (!jform_vvvvvydvxz_required) { updateFieldRequired('css_document',1); jQuery('#jform_css_document').removeAttr('required'); jQuery('#jform_css_document').removeAttr('aria-required'); jQuery('#jform_css_document').removeClass('required'); - jform_vvvvvydvxy_required = true; + jform_vvvvvydvxz_required = true; } } } @@ -223,26 +223,26 @@ function vvvvvye(add_js_document_vvvvvye) if (add_js_document_vvvvvye == 1) { jQuery('#jform_js_document').closest('.control-group').show(); - if (jform_vvvvvyevxz_required) + if (jform_vvvvvyevya_required) { updateFieldRequired('js_document',0); jQuery('#jform_js_document').prop('required','required'); jQuery('#jform_js_document').attr('aria-required',true); jQuery('#jform_js_document').addClass('required'); - jform_vvvvvyevxz_required = false; + jform_vvvvvyevya_required = false; } } else { jQuery('#jform_js_document').closest('.control-group').hide(); - if (!jform_vvvvvyevxz_required) + if (!jform_vvvvvyevya_required) { updateFieldRequired('js_document',1); jQuery('#jform_js_document').removeAttr('required'); jQuery('#jform_js_document').removeAttr('aria-required'); jQuery('#jform_js_document').removeClass('required'); - jform_vvvvvyevxz_required = true; + jform_vvvvvyevya_required = true; } } } @@ -255,23 +255,23 @@ function vvvvvyf(add_custom_button_vvvvvyf) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvyfvya_required) + if (jform_vvvvvyfvyb_required) { updateFieldRequired('php_controller',0); jQuery('#jform_php_controller').prop('required','required'); jQuery('#jform_php_controller').attr('aria-required',true); jQuery('#jform_php_controller').addClass('required'); - jform_vvvvvyfvya_required = false; + jform_vvvvvyfvyb_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvyfvyb_required) + if (jform_vvvvvyfvyc_required) { updateFieldRequired('php_model',0); jQuery('#jform_php_model').prop('required','required'); jQuery('#jform_php_model').attr('aria-required',true); jQuery('#jform_php_model').addClass('required'); - jform_vvvvvyfvyb_required = false; + jform_vvvvvyfvyc_required = false; } } @@ -279,22 +279,22 @@ function vvvvvyf(add_custom_button_vvvvvyf) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvyfvya_required) + if (!jform_vvvvvyfvyb_required) { updateFieldRequired('php_controller',1); jQuery('#jform_php_controller').removeAttr('required'); jQuery('#jform_php_controller').removeAttr('aria-required'); jQuery('#jform_php_controller').removeClass('required'); - jform_vvvvvyfvya_required = true; + jform_vvvvvyfvyb_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvyfvyb_required) + if (!jform_vvvvvyfvyc_required) { updateFieldRequired('php_model',1); jQuery('#jform_php_model').removeAttr('required'); jQuery('#jform_php_model').removeAttr('aria-required'); jQuery('#jform_php_model').removeClass('required'); - jform_vvvvvyfvyb_required = true; + jform_vvvvvyfvyc_required = true; } } } @@ -306,26 +306,26 @@ function vvvvvyg(add_css_vvvvvyg) if (add_css_vvvvvyg == 1) { jQuery('#jform_css').closest('.control-group').show(); - if (jform_vvvvvygvyc_required) + if (jform_vvvvvygvyd_required) { updateFieldRequired('css',0); jQuery('#jform_css').prop('required','required'); jQuery('#jform_css').attr('aria-required',true); jQuery('#jform_css').addClass('required'); - jform_vvvvvygvyc_required = false; + jform_vvvvvygvyd_required = false; } } else { jQuery('#jform_css').closest('.control-group').hide(); - if (!jform_vvvvvygvyc_required) + if (!jform_vvvvvygvyd_required) { updateFieldRequired('css',1); jQuery('#jform_css').removeAttr('required'); jQuery('#jform_css').removeAttr('aria-required'); jQuery('#jform_css').removeClass('required'); - jform_vvvvvygvyc_required = true; + jform_vvvvvygvyd_required = true; } } } diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js index f0d7ded09..d7c759875 100644 --- a/admin/models/forms/dynamic_get.js +++ b/admin/models/forms/dynamic_get.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.js @@ -23,24 +23,24 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvysvyp_required = false; -jform_vvvvvytvyq_required = false; -jform_vvvvvyuvyr_required = false; -jform_vvvvvyvvys_required = false; -jform_vvvvvywvyt_required = false; -jform_vvvvvyxvyu_required = false; -jform_vvvvvzcvyv_required = false; -jform_vvvvvzevyw_required = false; -jform_vvvvvzfvyx_required = false; -jform_vvvvvzhvyy_required = false; -jform_vvvvvzhvyz_required = false; -jform_vvvvvzivza_required = false; -jform_vvvvvzjvzb_required = false; -jform_vvvvvzkvzc_required = false; -jform_vvvvvzmvzd_required = false; -jform_vvvvvzmvze_required = false; -jform_vvvvvzmvzf_required = false; -jform_vvvvvznvzg_required = false; +jform_vvvvvysvys_required = false; +jform_vvvvvytvyt_required = false; +jform_vvvvvyuvyu_required = false; +jform_vvvvvyvvyv_required = false; +jform_vvvvvywvyw_required = false; +jform_vvvvvyxvyx_required = false; +jform_vvvvvzcvyy_required = false; +jform_vvvvvzevyz_required = false; +jform_vvvvvzfvza_required = false; +jform_vvvvvzhvzb_required = false; +jform_vvvvvzhvzc_required = false; +jform_vvvvvzivzd_required = false; +jform_vvvvvzjvze_required = false; +jform_vvvvvzkvzf_required = false; +jform_vvvvvzmvzg_required = false; +jform_vvvvvzmvzh_required = false; +jform_vvvvvzmvzi_required = false; +jform_vvvvvznvzj_required = false; // Initial Script jQuery(document).ready(function() @@ -127,26 +127,26 @@ function vvvvvys(gettype_vvvvvys) if (gettype) { jQuery('#jform_getcustom').closest('.control-group').show(); - if (jform_vvvvvysvyp_required) + if (jform_vvvvvysvys_required) { updateFieldRequired('getcustom',0); jQuery('#jform_getcustom').prop('required','required'); jQuery('#jform_getcustom').attr('aria-required',true); jQuery('#jform_getcustom').addClass('required'); - jform_vvvvvysvyp_required = false; + jform_vvvvvysvys_required = false; } } else { jQuery('#jform_getcustom').closest('.control-group').hide(); - if (!jform_vvvvvysvyp_required) + if (!jform_vvvvvysvys_required) { updateFieldRequired('getcustom',1); jQuery('#jform_getcustom').removeAttr('required'); jQuery('#jform_getcustom').removeAttr('aria-required'); jQuery('#jform_getcustom').removeClass('required'); - jform_vvvvvysvyp_required = true; + jform_vvvvvysvys_required = true; } } } @@ -182,26 +182,26 @@ function vvvvvyt(main_source_vvvvvyt) if (main_source) { jQuery('#jform_view_table_main').closest('.control-group').show(); - if (jform_vvvvvytvyq_required) + if (jform_vvvvvytvyt_required) { updateFieldRequired('view_table_main',0); jQuery('#jform_view_table_main').prop('required','required'); jQuery('#jform_view_table_main').attr('aria-required',true); jQuery('#jform_view_table_main').addClass('required'); - jform_vvvvvytvyq_required = false; + jform_vvvvvytvyt_required = false; } } else { jQuery('#jform_view_table_main').closest('.control-group').hide(); - if (!jform_vvvvvytvyq_required) + if (!jform_vvvvvytvyt_required) { updateFieldRequired('view_table_main',1); jQuery('#jform_view_table_main').removeAttr('required'); jQuery('#jform_view_table_main').removeAttr('aria-required'); jQuery('#jform_view_table_main').removeClass('required'); - jform_vvvvvytvyq_required = true; + jform_vvvvvytvyt_required = true; } } } @@ -237,26 +237,26 @@ function vvvvvyu(main_source_vvvvvyu) if (main_source) { jQuery('#jform_view_selection').closest('.control-group').show(); - if (jform_vvvvvyuvyr_required) + if (jform_vvvvvyuvyu_required) { updateFieldRequired('view_selection',0); jQuery('#jform_view_selection').prop('required','required'); jQuery('#jform_view_selection').attr('aria-required',true); jQuery('#jform_view_selection').addClass('required'); - jform_vvvvvyuvyr_required = false; + jform_vvvvvyuvyu_required = false; } } else { jQuery('#jform_view_selection').closest('.control-group').hide(); - if (!jform_vvvvvyuvyr_required) + if (!jform_vvvvvyuvyu_required) { updateFieldRequired('view_selection',1); jQuery('#jform_view_selection').removeAttr('required'); jQuery('#jform_view_selection').removeAttr('aria-required'); jQuery('#jform_view_selection').removeClass('required'); - jform_vvvvvyuvyr_required = true; + jform_vvvvvyuvyu_required = true; } } } @@ -292,26 +292,26 @@ function vvvvvyv(main_source_vvvvvyv) if (main_source) { jQuery('#jform_db_table_main').closest('.control-group').show(); - if (jform_vvvvvyvvys_required) + if (jform_vvvvvyvvyv_required) { updateFieldRequired('db_table_main',0); jQuery('#jform_db_table_main').prop('required','required'); jQuery('#jform_db_table_main').attr('aria-required',true); jQuery('#jform_db_table_main').addClass('required'); - jform_vvvvvyvvys_required = false; + jform_vvvvvyvvyv_required = false; } } else { jQuery('#jform_db_table_main').closest('.control-group').hide(); - if (!jform_vvvvvyvvys_required) + if (!jform_vvvvvyvvyv_required) { updateFieldRequired('db_table_main',1); jQuery('#jform_db_table_main').removeAttr('required'); jQuery('#jform_db_table_main').removeAttr('aria-required'); jQuery('#jform_db_table_main').removeClass('required'); - jform_vvvvvyvvys_required = true; + jform_vvvvvyvvyv_required = true; } } } @@ -347,26 +347,26 @@ function vvvvvyw(main_source_vvvvvyw) if (main_source) { jQuery('#jform_db_selection').closest('.control-group').show(); - if (jform_vvvvvywvyt_required) + if (jform_vvvvvywvyw_required) { updateFieldRequired('db_selection',0); jQuery('#jform_db_selection').prop('required','required'); jQuery('#jform_db_selection').attr('aria-required',true); jQuery('#jform_db_selection').addClass('required'); - jform_vvvvvywvyt_required = false; + jform_vvvvvywvyw_required = false; } } else { jQuery('#jform_db_selection').closest('.control-group').hide(); - if (!jform_vvvvvywvyt_required) + if (!jform_vvvvvywvyw_required) { updateFieldRequired('db_selection',1); jQuery('#jform_db_selection').removeAttr('required'); jQuery('#jform_db_selection').removeAttr('aria-required'); jQuery('#jform_db_selection').removeClass('required'); - jform_vvvvvywvyt_required = true; + jform_vvvvvywvyw_required = true; } } } @@ -389,26 +389,26 @@ function vvvvvyx(addcalculation_vvvvvyx) if (addcalculation_vvvvvyx == 1) { jQuery('#jform_php_calculation').closest('.control-group').show(); - if (jform_vvvvvyxvyu_required) + if (jform_vvvvvyxvyx_required) { updateFieldRequired('php_calculation',0); jQuery('#jform_php_calculation').prop('required','required'); jQuery('#jform_php_calculation').attr('aria-required',true); jQuery('#jform_php_calculation').addClass('required'); - jform_vvvvvyxvyu_required = false; + jform_vvvvvyxvyx_required = false; } } else { jQuery('#jform_php_calculation').closest('.control-group').hide(); - if (!jform_vvvvvyxvyu_required) + if (!jform_vvvvvyxvyx_required) { updateFieldRequired('php_calculation',1); jQuery('#jform_php_calculation').removeAttr('required'); jQuery('#jform_php_calculation').removeAttr('aria-required'); jQuery('#jform_php_calculation').removeClass('required'); - jform_vvvvvyxvyu_required = true; + jform_vvvvvyxvyx_required = true; } } } @@ -555,26 +555,26 @@ function vvvvvzc(main_source_vvvvvzc) if (main_source) { jQuery('#jform_php_custom_get').closest('.control-group').show(); - if (jform_vvvvvzcvyv_required) + if (jform_vvvvvzcvyy_required) { updateFieldRequired('php_custom_get',0); jQuery('#jform_php_custom_get').prop('required','required'); jQuery('#jform_php_custom_get').attr('aria-required',true); jQuery('#jform_php_custom_get').addClass('required'); - jform_vvvvvzcvyv_required = false; + jform_vvvvvzcvyy_required = false; } } else { jQuery('#jform_php_custom_get').closest('.control-group').hide(); - if (!jform_vvvvvzcvyv_required) + if (!jform_vvvvvzcvyy_required) { updateFieldRequired('php_custom_get',1); jQuery('#jform_php_custom_get').removeAttr('required'); jQuery('#jform_php_custom_get').removeAttr('aria-required'); jQuery('#jform_php_custom_get').removeClass('required'); - jform_vvvvvzcvyv_required = true; + jform_vvvvvzcvyy_required = true; } } } @@ -668,26 +668,26 @@ function vvvvvze(add_php_before_getitem_vvvvvze,gettype_vvvvvze) if (add_php_before_getitem && gettype) { jQuery('#jform_php_before_getitem').closest('.control-group').show(); - if (jform_vvvvvzevyw_required) + if (jform_vvvvvzevyz_required) { updateFieldRequired('php_before_getitem',0); jQuery('#jform_php_before_getitem').prop('required','required'); jQuery('#jform_php_before_getitem').attr('aria-required',true); jQuery('#jform_php_before_getitem').addClass('required'); - jform_vvvvvzevyw_required = false; + jform_vvvvvzevyz_required = false; } } else { jQuery('#jform_php_before_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzevyw_required) + if (!jform_vvvvvzevyz_required) { updateFieldRequired('php_before_getitem',1); jQuery('#jform_php_before_getitem').removeAttr('required'); jQuery('#jform_php_before_getitem').removeAttr('aria-required'); jQuery('#jform_php_before_getitem').removeClass('required'); - jform_vvvvvzevyw_required = true; + jform_vvvvvzevyz_required = true; } } } @@ -746,26 +746,26 @@ function vvvvvzf(add_php_after_getitem_vvvvvzf,gettype_vvvvvzf) if (add_php_after_getitem && gettype) { jQuery('#jform_php_after_getitem').closest('.control-group').show(); - if (jform_vvvvvzfvyx_required) + if (jform_vvvvvzfvza_required) { updateFieldRequired('php_after_getitem',0); jQuery('#jform_php_after_getitem').prop('required','required'); jQuery('#jform_php_after_getitem').attr('aria-required',true); jQuery('#jform_php_after_getitem').addClass('required'); - jform_vvvvvzfvyx_required = false; + jform_vvvvvzfvza_required = false; } } else { jQuery('#jform_php_after_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzfvyx_required) + if (!jform_vvvvvzfvza_required) { updateFieldRequired('php_after_getitem',1); jQuery('#jform_php_after_getitem').removeAttr('required'); jQuery('#jform_php_after_getitem').removeAttr('aria-required'); jQuery('#jform_php_after_getitem').removeClass('required'); - jform_vvvvvzfvyx_required = true; + jform_vvvvvzfvza_required = true; } } } @@ -812,45 +812,45 @@ function vvvvvzh(gettype_vvvvvzh) if (gettype) { jQuery('#jform_add_php_after_getitem').closest('.control-group').show(); - if (jform_vvvvvzhvyy_required) + if (jform_vvvvvzhvzb_required) { updateFieldRequired('add_php_after_getitem',0); jQuery('#jform_add_php_after_getitem').prop('required','required'); jQuery('#jform_add_php_after_getitem').attr('aria-required',true); jQuery('#jform_add_php_after_getitem').addClass('required'); - jform_vvvvvzhvyy_required = false; + jform_vvvvvzhvzb_required = false; } jQuery('#jform_add_php_before_getitem').closest('.control-group').show(); - if (jform_vvvvvzhvyz_required) + if (jform_vvvvvzhvzc_required) { updateFieldRequired('add_php_before_getitem',0); jQuery('#jform_add_php_before_getitem').prop('required','required'); jQuery('#jform_add_php_before_getitem').attr('aria-required',true); jQuery('#jform_add_php_before_getitem').addClass('required'); - jform_vvvvvzhvyz_required = false; + jform_vvvvvzhvzc_required = false; } } else { jQuery('#jform_add_php_after_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzhvyy_required) + if (!jform_vvvvvzhvzb_required) { updateFieldRequired('add_php_after_getitem',1); jQuery('#jform_add_php_after_getitem').removeAttr('required'); jQuery('#jform_add_php_after_getitem').removeAttr('aria-required'); jQuery('#jform_add_php_after_getitem').removeClass('required'); - jform_vvvvvzhvyy_required = true; + jform_vvvvvzhvzb_required = true; } jQuery('#jform_add_php_before_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzhvyz_required) + if (!jform_vvvvvzhvzc_required) { updateFieldRequired('add_php_before_getitem',1); jQuery('#jform_add_php_before_getitem').removeAttr('required'); jQuery('#jform_add_php_before_getitem').removeAttr('aria-required'); jQuery('#jform_add_php_before_getitem').removeClass('required'); - jform_vvvvvzhvyz_required = true; + jform_vvvvvzhvzc_required = true; } } } @@ -898,26 +898,26 @@ function vvvvvzi(add_php_getlistquery_vvvvvzi,gettype_vvvvvzi) if (add_php_getlistquery && gettype) { jQuery('#jform_php_getlistquery').closest('.control-group').show(); - if (jform_vvvvvzivza_required) + if (jform_vvvvvzivzd_required) { updateFieldRequired('php_getlistquery',0); jQuery('#jform_php_getlistquery').prop('required','required'); jQuery('#jform_php_getlistquery').attr('aria-required',true); jQuery('#jform_php_getlistquery').addClass('required'); - jform_vvvvvzivza_required = false; + jform_vvvvvzivzd_required = false; } } else { jQuery('#jform_php_getlistquery').closest('.control-group').hide(); - if (!jform_vvvvvzivza_required) + if (!jform_vvvvvzivzd_required) { updateFieldRequired('php_getlistquery',1); jQuery('#jform_php_getlistquery').removeAttr('required'); jQuery('#jform_php_getlistquery').removeAttr('aria-required'); jQuery('#jform_php_getlistquery').removeClass('required'); - jform_vvvvvzivza_required = true; + jform_vvvvvzivzd_required = true; } } } @@ -976,26 +976,26 @@ function vvvvvzj(add_php_before_getitems_vvvvvzj,gettype_vvvvvzj) if (add_php_before_getitems && gettype) { jQuery('#jform_php_before_getitems').closest('.control-group').show(); - if (jform_vvvvvzjvzb_required) + if (jform_vvvvvzjvze_required) { updateFieldRequired('php_before_getitems',0); jQuery('#jform_php_before_getitems').prop('required','required'); jQuery('#jform_php_before_getitems').attr('aria-required',true); jQuery('#jform_php_before_getitems').addClass('required'); - jform_vvvvvzjvzb_required = false; + jform_vvvvvzjvze_required = false; } } else { jQuery('#jform_php_before_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzjvzb_required) + if (!jform_vvvvvzjvze_required) { updateFieldRequired('php_before_getitems',1); jQuery('#jform_php_before_getitems').removeAttr('required'); jQuery('#jform_php_before_getitems').removeAttr('aria-required'); jQuery('#jform_php_before_getitems').removeClass('required'); - jform_vvvvvzjvzb_required = true; + jform_vvvvvzjvze_required = true; } } } @@ -1054,26 +1054,26 @@ function vvvvvzk(add_php_after_getitems_vvvvvzk,gettype_vvvvvzk) if (add_php_after_getitems && gettype) { jQuery('#jform_php_after_getitems').closest('.control-group').show(); - if (jform_vvvvvzkvzc_required) + if (jform_vvvvvzkvzf_required) { updateFieldRequired('php_after_getitems',0); jQuery('#jform_php_after_getitems').prop('required','required'); jQuery('#jform_php_after_getitems').attr('aria-required',true); jQuery('#jform_php_after_getitems').addClass('required'); - jform_vvvvvzkvzc_required = false; + jform_vvvvvzkvzf_required = false; } } else { jQuery('#jform_php_after_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzkvzc_required) + if (!jform_vvvvvzkvzf_required) { updateFieldRequired('php_after_getitems',1); jQuery('#jform_php_after_getitems').removeAttr('required'); jQuery('#jform_php_after_getitems').removeAttr('aria-required'); jQuery('#jform_php_after_getitems').removeClass('required'); - jform_vvvvvzkvzc_required = true; + jform_vvvvvzkvzf_required = true; } } } @@ -1120,64 +1120,64 @@ function vvvvvzm(gettype_vvvvvzm) if (gettype) { jQuery('#jform_add_php_after_getitems').closest('.control-group').show(); - if (jform_vvvvvzmvzd_required) + if (jform_vvvvvzmvzg_required) { updateFieldRequired('add_php_after_getitems',0); jQuery('#jform_add_php_after_getitems').prop('required','required'); jQuery('#jform_add_php_after_getitems').attr('aria-required',true); jQuery('#jform_add_php_after_getitems').addClass('required'); - jform_vvvvvzmvzd_required = false; + jform_vvvvvzmvzg_required = false; } jQuery('#jform_add_php_before_getitems').closest('.control-group').show(); - if (jform_vvvvvzmvze_required) + if (jform_vvvvvzmvzh_required) { updateFieldRequired('add_php_before_getitems',0); jQuery('#jform_add_php_before_getitems').prop('required','required'); jQuery('#jform_add_php_before_getitems').attr('aria-required',true); jQuery('#jform_add_php_before_getitems').addClass('required'); - jform_vvvvvzmvze_required = false; + jform_vvvvvzmvzh_required = false; } jQuery('#jform_add_php_getlistquery').closest('.control-group').show(); - if (jform_vvvvvzmvzf_required) + if (jform_vvvvvzmvzi_required) { updateFieldRequired('add_php_getlistquery',0); jQuery('#jform_add_php_getlistquery').prop('required','required'); jQuery('#jform_add_php_getlistquery').attr('aria-required',true); jQuery('#jform_add_php_getlistquery').addClass('required'); - jform_vvvvvzmvzf_required = false; + jform_vvvvvzmvzi_required = false; } } else { jQuery('#jform_add_php_after_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzmvzd_required) + if (!jform_vvvvvzmvzg_required) { updateFieldRequired('add_php_after_getitems',1); jQuery('#jform_add_php_after_getitems').removeAttr('required'); jQuery('#jform_add_php_after_getitems').removeAttr('aria-required'); jQuery('#jform_add_php_after_getitems').removeClass('required'); - jform_vvvvvzmvzd_required = true; + jform_vvvvvzmvzg_required = true; } jQuery('#jform_add_php_before_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzmvze_required) + if (!jform_vvvvvzmvzh_required) { updateFieldRequired('add_php_before_getitems',1); jQuery('#jform_add_php_before_getitems').removeAttr('required'); jQuery('#jform_add_php_before_getitems').removeAttr('aria-required'); jQuery('#jform_add_php_before_getitems').removeClass('required'); - jform_vvvvvzmvze_required = true; + jform_vvvvvzmvzh_required = true; } jQuery('#jform_add_php_getlistquery').closest('.control-group').hide(); - if (!jform_vvvvvzmvzf_required) + if (!jform_vvvvvzmvzi_required) { updateFieldRequired('add_php_getlistquery',1); jQuery('#jform_add_php_getlistquery').removeAttr('required'); jQuery('#jform_add_php_getlistquery').removeAttr('aria-required'); jQuery('#jform_add_php_getlistquery').removeClass('required'); - jform_vvvvvzmvzf_required = true; + jform_vvvvvzmvzi_required = true; } } } @@ -1213,26 +1213,26 @@ function vvvvvzn(gettype_vvvvvzn) if (gettype) { jQuery('#jform_pagination').closest('.control-group').show(); - if (jform_vvvvvznvzg_required) + if (jform_vvvvvznvzj_required) { updateFieldRequired('pagination',0); jQuery('#jform_pagination').prop('required','required'); jQuery('#jform_pagination').attr('aria-required',true); jQuery('#jform_pagination').addClass('required'); - jform_vvvvvznvzg_required = false; + jform_vvvvvznvzj_required = false; } } else { jQuery('#jform_pagination').closest('.control-group').hide(); - if (!jform_vvvvvznvzg_required) + if (!jform_vvvvvznvzj_required) { updateFieldRequired('pagination',1); jQuery('#jform_pagination').removeAttr('required'); jQuery('#jform_pagination').removeAttr('aria-required'); jQuery('#jform_pagination').removeClass('required'); - jform_vvvvvznvzg_required = true; + jform_vvvvvznvzj_required = true; } } } diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js index 84f414fa3..7257c40d7 100644 --- a/admin/models/forms/field.js +++ b/admin/models/forms/field.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.js @@ -23,14 +23,14 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvzovzh_required = false; -jform_vvvvvzpvzi_required = false; -jform_vvvvvzqvzj_required = false; -jform_vvvvvzrvzk_required = false; -jform_vvvvvzuvzl_required = false; -jform_vvvvvzvvzm_required = false; -jform_vvvvvzwvzn_required = false; -jform_vvvvvzxvzo_required = false; +jform_vvvvvzovzk_required = false; +jform_vvvvvzpvzl_required = false; +jform_vvvvvzqvzm_required = false; +jform_vvvvvzrvzn_required = false; +jform_vvvvvzuvzo_required = false; +jform_vvvvvzvvzp_required = false; +jform_vvvvvzwvzq_required = false; +jform_vvvvvzxvzr_required = false; // Initial Script jQuery(document).ready(function() @@ -84,26 +84,26 @@ function vvvvvzo(datalenght_vvvvvzo) if (datalenght) { jQuery('#jform_datalenght_other').closest('.control-group').show(); - if (jform_vvvvvzovzh_required) + if (jform_vvvvvzovzk_required) { updateFieldRequired('datalenght_other',0); jQuery('#jform_datalenght_other').prop('required','required'); jQuery('#jform_datalenght_other').attr('aria-required',true); jQuery('#jform_datalenght_other').addClass('required'); - jform_vvvvvzovzh_required = false; + jform_vvvvvzovzk_required = false; } } else { jQuery('#jform_datalenght_other').closest('.control-group').hide(); - if (!jform_vvvvvzovzh_required) + if (!jform_vvvvvzovzk_required) { updateFieldRequired('datalenght_other',1); jQuery('#jform_datalenght_other').removeAttr('required'); jQuery('#jform_datalenght_other').removeAttr('aria-required'); jQuery('#jform_datalenght_other').removeClass('required'); - jform_vvvvvzovzh_required = true; + jform_vvvvvzovzk_required = true; } } } @@ -139,26 +139,26 @@ function vvvvvzp(datadefault_vvvvvzp) if (datadefault) { jQuery('#jform_datadefault_other').closest('.control-group').show(); - if (jform_vvvvvzpvzi_required) + if (jform_vvvvvzpvzl_required) { updateFieldRequired('datadefault_other',0); jQuery('#jform_datadefault_other').prop('required','required'); jQuery('#jform_datadefault_other').attr('aria-required',true); jQuery('#jform_datadefault_other').addClass('required'); - jform_vvvvvzpvzi_required = false; + jform_vvvvvzpvzl_required = false; } } else { jQuery('#jform_datadefault_other').closest('.control-group').hide(); - if (!jform_vvvvvzpvzi_required) + if (!jform_vvvvvzpvzl_required) { updateFieldRequired('datadefault_other',1); jQuery('#jform_datadefault_other').removeAttr('required'); jQuery('#jform_datadefault_other').removeAttr('aria-required'); jQuery('#jform_datadefault_other').removeClass('required'); - jform_vvvvvzpvzi_required = true; + jform_vvvvvzpvzl_required = true; } } } @@ -196,13 +196,13 @@ function vvvvvzq(datatype_vvvvvzq) jQuery('#jform_datadefault').closest('.control-group').show(); jQuery('#jform_datalenght').closest('.control-group').show(); jQuery('#jform_indexes').closest('.control-group').show(); - if (jform_vvvvvzqvzj_required) + if (jform_vvvvvzqvzm_required) { updateFieldRequired('indexes',0); jQuery('#jform_indexes').prop('required','required'); jQuery('#jform_indexes').attr('aria-required',true); jQuery('#jform_indexes').addClass('required'); - jform_vvvvvzqvzj_required = false; + jform_vvvvvzqvzm_required = false; } } @@ -211,13 +211,13 @@ function vvvvvzq(datatype_vvvvvzq) jQuery('#jform_datadefault').closest('.control-group').hide(); jQuery('#jform_datalenght').closest('.control-group').hide(); jQuery('#jform_indexes').closest('.control-group').hide(); - if (!jform_vvvvvzqvzj_required) + if (!jform_vvvvvzqvzm_required) { updateFieldRequired('indexes',1); jQuery('#jform_indexes').removeAttr('required'); jQuery('#jform_indexes').removeAttr('aria-required'); jQuery('#jform_indexes').removeClass('required'); - jform_vvvvvzqvzj_required = true; + jform_vvvvvzqvzm_required = true; } } } @@ -253,26 +253,26 @@ function vvvvvzr(datatype_vvvvvzr) if (datatype) { jQuery('#jform_store').closest('.control-group').show(); - if (jform_vvvvvzrvzk_required) + if (jform_vvvvvzrvzn_required) { updateFieldRequired('store',0); jQuery('#jform_store').prop('required','required'); jQuery('#jform_store').attr('aria-required',true); jQuery('#jform_store').addClass('required'); - jform_vvvvvzrvzk_required = false; + jform_vvvvvzrvzn_required = false; } } else { jQuery('#jform_store').closest('.control-group').hide(); - if (!jform_vvvvvzrvzk_required) + if (!jform_vvvvvzrvzn_required) { updateFieldRequired('store',1); jQuery('#jform_store').removeAttr('required'); jQuery('#jform_store').removeAttr('aria-required'); jQuery('#jform_store').removeClass('required'); - jform_vvvvvzrvzk_required = true; + jform_vvvvvzrvzn_required = true; } } } @@ -356,26 +356,26 @@ function vvvvvzu(add_css_view_vvvvvzu) if (add_css_view_vvvvvzu == 1) { jQuery('#jform_css_view').closest('.control-group').show(); - if (jform_vvvvvzuvzl_required) + if (jform_vvvvvzuvzo_required) { updateFieldRequired('css_view',0); jQuery('#jform_css_view').prop('required','required'); jQuery('#jform_css_view').attr('aria-required',true); jQuery('#jform_css_view').addClass('required'); - jform_vvvvvzuvzl_required = false; + jform_vvvvvzuvzo_required = false; } } else { jQuery('#jform_css_view').closest('.control-group').hide(); - if (!jform_vvvvvzuvzl_required) + if (!jform_vvvvvzuvzo_required) { updateFieldRequired('css_view',1); jQuery('#jform_css_view').removeAttr('required'); jQuery('#jform_css_view').removeAttr('aria-required'); jQuery('#jform_css_view').removeClass('required'); - jform_vvvvvzuvzl_required = true; + jform_vvvvvzuvzo_required = true; } } } @@ -387,26 +387,26 @@ function vvvvvzv(add_css_views_vvvvvzv) if (add_css_views_vvvvvzv == 1) { jQuery('#jform_css_views').closest('.control-group').show(); - if (jform_vvvvvzvvzm_required) + if (jform_vvvvvzvvzp_required) { updateFieldRequired('css_views',0); jQuery('#jform_css_views').prop('required','required'); jQuery('#jform_css_views').attr('aria-required',true); jQuery('#jform_css_views').addClass('required'); - jform_vvvvvzvvzm_required = false; + jform_vvvvvzvvzp_required = false; } } else { jQuery('#jform_css_views').closest('.control-group').hide(); - if (!jform_vvvvvzvvzm_required) + if (!jform_vvvvvzvvzp_required) { updateFieldRequired('css_views',1); jQuery('#jform_css_views').removeAttr('required'); jQuery('#jform_css_views').removeAttr('aria-required'); jQuery('#jform_css_views').removeClass('required'); - jform_vvvvvzvvzm_required = true; + jform_vvvvvzvvzp_required = true; } } } @@ -418,26 +418,26 @@ function vvvvvzw(add_javascript_view_footer_vvvvvzw) if (add_javascript_view_footer_vvvvvzw == 1) { jQuery('#jform_javascript_view_footer').closest('.control-group').show(); - if (jform_vvvvvzwvzn_required) + if (jform_vvvvvzwvzq_required) { updateFieldRequired('javascript_view_footer',0); jQuery('#jform_javascript_view_footer').prop('required','required'); jQuery('#jform_javascript_view_footer').attr('aria-required',true); jQuery('#jform_javascript_view_footer').addClass('required'); - jform_vvvvvzwvzn_required = false; + jform_vvvvvzwvzq_required = false; } } else { jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); - if (!jform_vvvvvzwvzn_required) + if (!jform_vvvvvzwvzq_required) { updateFieldRequired('javascript_view_footer',1); jQuery('#jform_javascript_view_footer').removeAttr('required'); jQuery('#jform_javascript_view_footer').removeAttr('aria-required'); jQuery('#jform_javascript_view_footer').removeClass('required'); - jform_vvvvvzwvzn_required = true; + jform_vvvvvzwvzq_required = true; } } } @@ -449,26 +449,26 @@ function vvvvvzx(add_javascript_views_footer_vvvvvzx) if (add_javascript_views_footer_vvvvvzx == 1) { jQuery('#jform_javascript_views_footer').closest('.control-group').show(); - if (jform_vvvvvzxvzo_required) + if (jform_vvvvvzxvzr_required) { updateFieldRequired('javascript_views_footer',0); jQuery('#jform_javascript_views_footer').prop('required','required'); jQuery('#jform_javascript_views_footer').attr('aria-required',true); jQuery('#jform_javascript_views_footer').addClass('required'); - jform_vvvvvzxvzo_required = false; + jform_vvvvvzxvzr_required = false; } } else { jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); - if (!jform_vvvvvzxvzo_required) + if (!jform_vvvvvzxvzr_required) { updateFieldRequired('javascript_views_footer',1); jQuery('#jform_javascript_views_footer').removeAttr('required'); jQuery('#jform_javascript_views_footer').removeAttr('aria-required'); jQuery('#jform_javascript_views_footer').removeClass('required'); - jform_vvvvvzxvzo_required = true; + jform_vvvvvzxvzr_required = true; } } } diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js index e8fcc5d35..9e5a8a25c 100644 --- a/admin/models/forms/fieldtype.js +++ b/admin/models/forms/fieldtype.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.js diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index d8f478ce8..fc8461599 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage help_document.js @@ -23,12 +23,12 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvzyvzr_required = false; -jform_vvvvvzzvzs_required = false; -jform_vvvvwaavzt_required = false; -jform_vvvvwabvzu_required = false; -jform_vvvvwacvzv_required = false; -jform_vvvvwadvzw_required = false; +jform_vvvvvzyvzu_required = false; +jform_vvvvvzzvzv_required = false; +jform_vvvvwaavzw_required = false; +jform_vvvvwabvzx_required = false; +jform_vvvvwacvzy_required = false; +jform_vvvvwadvzz_required = false; // Initial Script jQuery(document).ready(function() @@ -59,26 +59,26 @@ function vvvvvzy(location_vvvvvzy) if (location_vvvvvzy == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); - if (jform_vvvvvzyvzr_required) + if (jform_vvvvvzyvzu_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_vvvvvzyvzr_required = false; + jform_vvvvvzyvzu_required = false; } } else { jQuery('#jform_admin_view').closest('.control-group').hide(); - if (!jform_vvvvvzyvzr_required) + if (!jform_vvvvvzyvzu_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_vvvvvzyvzr_required = true; + jform_vvvvvzyvzu_required = true; } } } @@ -90,26 +90,26 @@ function vvvvvzz(location_vvvvvzz) if (location_vvvvvzz == 2) { jQuery('#jform_site_view').closest('.control-group').show(); - if (jform_vvvvvzzvzs_required) + if (jform_vvvvvzzvzv_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_vvvvvzzvzs_required = false; + jform_vvvvvzzvzv_required = false; } } else { jQuery('#jform_site_view').closest('.control-group').hide(); - if (!jform_vvvvvzzvzs_required) + if (!jform_vvvvvzzvzv_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_vvvvvzzvzs_required = true; + jform_vvvvvzzvzv_required = true; } } } @@ -134,26 +134,26 @@ function vvvvwaa(type_vvvvwaa) if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_vvvvwaavzt_required) + if (jform_vvvvwaavzw_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_vvvvwaavzt_required = false; + jform_vvvvwaavzw_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_vvvvwaavzt_required) + if (!jform_vvvvwaavzw_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_vvvvwaavzt_required = true; + jform_vvvvwaavzw_required = true; } } } @@ -189,26 +189,26 @@ function vvvvwab(type_vvvvwab) if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_vvvvwabvzu_required) + if (jform_vvvvwabvzx_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_vvvvwabvzu_required = false; + jform_vvvvwabvzx_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_vvvvwabvzu_required) + if (!jform_vvvvwabvzx_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_vvvvwabvzu_required = true; + jform_vvvvwabvzx_required = true; } } } @@ -244,26 +244,26 @@ function vvvvwac(type_vvvvwac) if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_vvvvwacvzv_required) + if (jform_vvvvwacvzy_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_vvvvwacvzv_required = false; + jform_vvvvwacvzy_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_vvvvwacvzv_required) + if (!jform_vvvvwacvzy_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_vvvvwacvzv_required = true; + jform_vvvvwacvzy_required = true; } } } @@ -286,26 +286,26 @@ function vvvvwad(target_vvvvwad) if (target_vvvvwad == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_vvvvwadvzw_required) + if (jform_vvvvwadvzz_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_vvvvwadvzw_required = false; + jform_vvvvwadvzz_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_vvvvwadvzw_required) + if (!jform_vvvvwadvzz_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvwadvzw_required = true; + jform_vvvvwadvzz_required = true; } } } diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js index ecfd5a0da..b9d1e4e7e 100644 --- a/admin/models/forms/layout.js +++ b/admin/models/forms/layout.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage layout.js @@ -23,7 +23,7 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvyrvyo_required = false; +jform_vvvvvyrvyr_required = false; // Initial Script jQuery(document).ready(function() @@ -39,26 +39,26 @@ function vvvvvyr(add_php_view_vvvvvyr) if (add_php_view_vvvvvyr == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvyrvyo_required) + if (jform_vvvvvyrvyr_required) { updateFieldRequired('php_view',0); jQuery('#jform_php_view').prop('required','required'); jQuery('#jform_php_view').attr('aria-required',true); jQuery('#jform_php_view').addClass('required'); - jform_vvvvvyrvyo_required = false; + jform_vvvvvyrvyr_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvyrvyo_required) + if (!jform_vvvvvyrvyr_required) { updateFieldRequired('php_view',1); jQuery('#jform_php_view').removeAttr('required'); jQuery('#jform_php_view').removeAttr('aria-required'); jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvyrvyo_required = true; + jform_vvvvvyrvyr_required = true; } } } diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js index 35b7f6c8f..7c048c230 100644 --- a/admin/models/forms/site_view.js +++ b/admin/models/forms/site_view.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_view.js @@ -23,16 +23,16 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvyhvyd_required = false; -jform_vvvvvyivye_required = false; -jform_vvvvvyjvyf_required = false; -jform_vvvvvykvyg_required = false; -jform_vvvvvylvyh_required = false; -jform_vvvvvymvyi_required = false; -jform_vvvvvynvyj_required = false; -jform_vvvvvyovyk_required = false; -jform_vvvvvypvyl_required = false; -jform_vvvvvypvym_required = false; +jform_vvvvvyhvyf_required = false; +jform_vvvvvyivyg_required = false; +jform_vvvvvyjvyh_required = false; +jform_vvvvvykvyi_required = false; +jform_vvvvvylvyj_required = false; +jform_vvvvvymvyk_required = false; +jform_vvvvvynvyl_required = false; +jform_vvvvvyovym_required = false; +jform_vvvvvypvyn_required = false; +jform_vvvvvypvyo_required = false; // Initial Script jQuery(document).ready(function() @@ -72,26 +72,26 @@ function vvvvvyh(add_php_view_vvvvvyh) if (add_php_view_vvvvvyh == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvyhvyd_required) + if (jform_vvvvvyhvyf_required) { updateFieldRequired('php_view',0); jQuery('#jform_php_view').prop('required','required'); jQuery('#jform_php_view').attr('aria-required',true); jQuery('#jform_php_view').addClass('required'); - jform_vvvvvyhvyd_required = false; + jform_vvvvvyhvyf_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvyhvyd_required) + if (!jform_vvvvvyhvyf_required) { updateFieldRequired('php_view',1); jQuery('#jform_php_view').removeAttr('required'); jQuery('#jform_php_view').removeAttr('aria-required'); jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvyhvyd_required = true; + jform_vvvvvyhvyf_required = true; } } } @@ -103,26 +103,26 @@ function vvvvvyi(add_php_jview_display_vvvvvyi) if (add_php_jview_display_vvvvvyi == 1) { jQuery('#jform_php_jview_display').closest('.control-group').show(); - if (jform_vvvvvyivye_required) + if (jform_vvvvvyivyg_required) { updateFieldRequired('php_jview_display',0); jQuery('#jform_php_jview_display').prop('required','required'); jQuery('#jform_php_jview_display').attr('aria-required',true); jQuery('#jform_php_jview_display').addClass('required'); - jform_vvvvvyivye_required = false; + jform_vvvvvyivyg_required = false; } } else { jQuery('#jform_php_jview_display').closest('.control-group').hide(); - if (!jform_vvvvvyivye_required) + if (!jform_vvvvvyivyg_required) { updateFieldRequired('php_jview_display',1); jQuery('#jform_php_jview_display').removeAttr('required'); jQuery('#jform_php_jview_display').removeAttr('aria-required'); jQuery('#jform_php_jview_display').removeClass('required'); - jform_vvvvvyivye_required = true; + jform_vvvvvyivyg_required = true; } } } @@ -134,26 +134,26 @@ function vvvvvyj(add_php_jview_vvvvvyj) if (add_php_jview_vvvvvyj == 1) { jQuery('#jform_php_jview').closest('.control-group').show(); - if (jform_vvvvvyjvyf_required) + if (jform_vvvvvyjvyh_required) { updateFieldRequired('php_jview',0); jQuery('#jform_php_jview').prop('required','required'); jQuery('#jform_php_jview').attr('aria-required',true); jQuery('#jform_php_jview').addClass('required'); - jform_vvvvvyjvyf_required = false; + jform_vvvvvyjvyh_required = false; } } else { jQuery('#jform_php_jview').closest('.control-group').hide(); - if (!jform_vvvvvyjvyf_required) + if (!jform_vvvvvyjvyh_required) { updateFieldRequired('php_jview',1); jQuery('#jform_php_jview').removeAttr('required'); jQuery('#jform_php_jview').removeAttr('aria-required'); jQuery('#jform_php_jview').removeClass('required'); - jform_vvvvvyjvyf_required = true; + jform_vvvvvyjvyh_required = true; } } } @@ -165,26 +165,26 @@ function vvvvvyk(add_php_document_vvvvvyk) if (add_php_document_vvvvvyk == 1) { jQuery('#jform_php_document').closest('.control-group').show(); - if (jform_vvvvvykvyg_required) + if (jform_vvvvvykvyi_required) { updateFieldRequired('php_document',0); jQuery('#jform_php_document').prop('required','required'); jQuery('#jform_php_document').attr('aria-required',true); jQuery('#jform_php_document').addClass('required'); - jform_vvvvvykvyg_required = false; + jform_vvvvvykvyi_required = false; } } else { jQuery('#jform_php_document').closest('.control-group').hide(); - if (!jform_vvvvvykvyg_required) + if (!jform_vvvvvykvyi_required) { updateFieldRequired('php_document',1); jQuery('#jform_php_document').removeAttr('required'); jQuery('#jform_php_document').removeAttr('aria-required'); jQuery('#jform_php_document').removeClass('required'); - jform_vvvvvykvyg_required = true; + jform_vvvvvykvyi_required = true; } } } @@ -196,26 +196,26 @@ function vvvvvyl(add_css_document_vvvvvyl) if (add_css_document_vvvvvyl == 1) { jQuery('#jform_css_document').closest('.control-group').show(); - if (jform_vvvvvylvyh_required) + if (jform_vvvvvylvyj_required) { updateFieldRequired('css_document',0); jQuery('#jform_css_document').prop('required','required'); jQuery('#jform_css_document').attr('aria-required',true); jQuery('#jform_css_document').addClass('required'); - jform_vvvvvylvyh_required = false; + jform_vvvvvylvyj_required = false; } } else { jQuery('#jform_css_document').closest('.control-group').hide(); - if (!jform_vvvvvylvyh_required) + if (!jform_vvvvvylvyj_required) { updateFieldRequired('css_document',1); jQuery('#jform_css_document').removeAttr('required'); jQuery('#jform_css_document').removeAttr('aria-required'); jQuery('#jform_css_document').removeClass('required'); - jform_vvvvvylvyh_required = true; + jform_vvvvvylvyj_required = true; } } } @@ -227,26 +227,26 @@ function vvvvvym(add_js_document_vvvvvym) if (add_js_document_vvvvvym == 1) { jQuery('#jform_js_document').closest('.control-group').show(); - if (jform_vvvvvymvyi_required) + if (jform_vvvvvymvyk_required) { updateFieldRequired('js_document',0); jQuery('#jform_js_document').prop('required','required'); jQuery('#jform_js_document').attr('aria-required',true); jQuery('#jform_js_document').addClass('required'); - jform_vvvvvymvyi_required = false; + jform_vvvvvymvyk_required = false; } } else { jQuery('#jform_js_document').closest('.control-group').hide(); - if (!jform_vvvvvymvyi_required) + if (!jform_vvvvvymvyk_required) { updateFieldRequired('js_document',1); jQuery('#jform_js_document').removeAttr('required'); jQuery('#jform_js_document').removeAttr('aria-required'); jQuery('#jform_js_document').removeClass('required'); - jform_vvvvvymvyi_required = true; + jform_vvvvvymvyk_required = true; } } } @@ -258,26 +258,26 @@ function vvvvvyn(add_css_vvvvvyn) if (add_css_vvvvvyn == 1) { jQuery('#jform_css').closest('.control-group').show(); - if (jform_vvvvvynvyj_required) + if (jform_vvvvvynvyl_required) { updateFieldRequired('css',0); jQuery('#jform_css').prop('required','required'); jQuery('#jform_css').attr('aria-required',true); jQuery('#jform_css').addClass('required'); - jform_vvvvvynvyj_required = false; + jform_vvvvvynvyl_required = false; } } else { jQuery('#jform_css').closest('.control-group').hide(); - if (!jform_vvvvvynvyj_required) + if (!jform_vvvvvynvyl_required) { updateFieldRequired('css',1); jQuery('#jform_css').removeAttr('required'); jQuery('#jform_css').removeAttr('aria-required'); jQuery('#jform_css').removeClass('required'); - jform_vvvvvynvyj_required = true; + jform_vvvvvynvyl_required = true; } } } @@ -290,13 +290,13 @@ function vvvvvyo(add_php_ajax_vvvvvyo) { jQuery('#jform_ajax_input').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod').closest('.control-group').show(); - if (jform_vvvvvyovyk_required) + if (jform_vvvvvyovym_required) { updateFieldRequired('php_ajaxmethod',0); jQuery('#jform_php_ajaxmethod').prop('required','required'); jQuery('#jform_php_ajaxmethod').attr('aria-required',true); jQuery('#jform_php_ajaxmethod').addClass('required'); - jform_vvvvvyovyk_required = false; + jform_vvvvvyovym_required = false; } } @@ -304,13 +304,13 @@ function vvvvvyo(add_php_ajax_vvvvvyo) { jQuery('#jform_ajax_input').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod').closest('.control-group').hide(); - if (!jform_vvvvvyovyk_required) + if (!jform_vvvvvyovym_required) { updateFieldRequired('php_ajaxmethod',1); jQuery('#jform_php_ajaxmethod').removeAttr('required'); jQuery('#jform_php_ajaxmethod').removeAttr('aria-required'); jQuery('#jform_php_ajaxmethod').removeClass('required'); - jform_vvvvvyovyk_required = true; + jform_vvvvvyovym_required = true; } } } @@ -323,23 +323,23 @@ function vvvvvyp(add_custom_button_vvvvvyp) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvypvyl_required) + if (jform_vvvvvypvyn_required) { updateFieldRequired('php_controller',0); jQuery('#jform_php_controller').prop('required','required'); jQuery('#jform_php_controller').attr('aria-required',true); jQuery('#jform_php_controller').addClass('required'); - jform_vvvvvypvyl_required = false; + jform_vvvvvypvyn_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvypvym_required) + if (jform_vvvvvypvyo_required) { updateFieldRequired('php_model',0); jQuery('#jform_php_model').prop('required','required'); jQuery('#jform_php_model').attr('aria-required',true); jQuery('#jform_php_model').addClass('required'); - jform_vvvvvypvym_required = false; + jform_vvvvvypvyo_required = false; } } @@ -347,22 +347,22 @@ function vvvvvyp(add_custom_button_vvvvvyp) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvypvyl_required) + if (!jform_vvvvvypvyn_required) { updateFieldRequired('php_controller',1); jQuery('#jform_php_controller').removeAttr('required'); jQuery('#jform_php_controller').removeAttr('aria-required'); jQuery('#jform_php_controller').removeClass('required'); - jform_vvvvvypvyl_required = true; + jform_vvvvvypvyn_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvypvym_required) + if (!jform_vvvvvypvyo_required) { updateFieldRequired('php_model',1); jQuery('#jform_php_model').removeAttr('required'); jQuery('#jform_php_model').removeAttr('aria-required'); jQuery('#jform_php_model').removeClass('required'); - jform_vvvvvypvym_required = true; + jform_vvvvvypvyo_required = true; } } } diff --git a/admin/models/forms/snippet.js b/admin/models/forms/snippet.js index c449d5d7e..ce457996f 100644 --- a/admin/models/forms/snippet.js +++ b/admin/models/forms/snippet.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippet.js diff --git a/admin/models/forms/template.js b/admin/models/forms/template.js index e3f09ffce..9a0a9b4ec 100644 --- a/admin/models/forms/template.js +++ b/admin/models/forms/template.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage template.js @@ -23,7 +23,7 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvyqvyn_required = false; +jform_vvvvvyqvyq_required = false; // Initial Script jQuery(document).ready(function() @@ -39,26 +39,26 @@ function vvvvvyq(add_php_view_vvvvvyq) if (add_php_view_vvvvvyq == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvyqvyn_required) + if (jform_vvvvvyqvyq_required) { updateFieldRequired('php_view',0); jQuery('#jform_php_view').prop('required','required'); jQuery('#jform_php_view').attr('aria-required',true); jQuery('#jform_php_view').addClass('required'); - jform_vvvvvyqvyn_required = false; + jform_vvvvvyqvyq_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvyqvyn_required) + if (!jform_vvvvvyqvyq_required) { updateFieldRequired('php_view',1); jQuery('#jform_php_view').removeAttr('required'); jQuery('#jform_php_view').removeAttr('aria-required'); jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvyqvyn_required = true; + jform_vvvvvyqvyq_required = true; } } } diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 8d2f003dd..9aee1dcba 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage help_document.php diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 387c78838..7543f28c6 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage help_documents.php diff --git a/admin/models/import.php b/admin/models/import.php index 8b72aeb4a..ab0cf0878 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/layout.php b/admin/models/layout.php index 73e7bacd0..75450f3d7 100644 --- a/admin/models/layout.php +++ b/admin/models/layout.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage layout.php diff --git a/admin/models/layouts.php b/admin/models/layouts.php index 254894d64..150a68c79 100644 --- a/admin/models/layouts.php +++ b/admin/models/layouts.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage layouts.php diff --git a/admin/models/site_view.php b/admin/models/site_view.php index b26c3c69a..082e06f6a 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_view.php @@ -174,9 +174,85 @@ class ComponentbuilderModelSite_view extends JModelAdmin $item->tags = new JHelperTags; $item->tags->getTagIds($item->id, 'com_componentbuilder.site_view'); } - } + } + $this->addsite_viewsvvwb = $item->id; return $item; + } + + /** + * Method to get list data. + * + * @return mixed An array of data items on success, false on failure. + */ + public function getVyplinked_components() + { + // 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_component table + $query->from($db->quoteName('#__componentbuilder_component', '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'); + + // Load the items + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $items = $db->loadObjectList(); + + // Filter by addsite_viewsvvwb in this Repetable Field + if (ComponentbuilderHelper::checkArray($items) && isset($this->addsite_viewsvvwb)) + { + foreach ($items as $nr => &$item) + { + if (isset($item->addsite_views) && ComponentbuilderHelper::checkJson($item->addsite_views)) + { + $tmpArray = json_decode($item->addsite_views,true); + if (!in_array($this->addsite_viewsvvwb, $tmpArray['siteview'])) + { + unset($items[$nr]); + continue; + } + } + else + { + unset($items[$nr]); + continue; + } + } + } + else + { + return false; + } + return $items; + } + return false; } /** diff --git a/admin/models/site_views.php b/admin/models/site_views.php index e1ca3873d..91dcb30d8 100644 --- a/admin/models/site_views.php +++ b/admin/models/site_views.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/models/snippet.php b/admin/models/snippet.php index d6b761401..4af49dae2 100644 --- a/admin/models/snippet.php +++ b/admin/models/snippet.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/models/snippets.php b/admin/models/snippets.php index 16d9238ac..67fb40a9a 100644 --- a/admin/models/snippets.php +++ b/admin/models/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/template.php b/admin/models/template.php index 0c6958965..568d45743 100644 --- a/admin/models/template.php +++ b/admin/models/template.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage template.php diff --git a/admin/models/templates.php b/admin/models/templates.php index e6a57cfab..95f31124e 100644 --- a/admin/models/templates.php +++ b/admin/models/templates.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage templates.php diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index e034d82d1..1b4c84ccd 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/tables/component.php b/admin/tables/component.php index 8dd1f6c33..766ce84a4 100644 --- a/admin/tables/component.php +++ b/admin/tables/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/tables/custom_admin_view.php b/admin/tables/custom_admin_view.php index 96d02a1fe..ef9124ee1 100644 --- a/admin/tables/custom_admin_view.php +++ b/admin/tables/custom_admin_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/tables/dynamic_get.php b/admin/tables/dynamic_get.php index bf3bb3937..ce294037f 100644 --- a/admin/tables/dynamic_get.php +++ b/admin/tables/dynamic_get.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/tables/field.php b/admin/tables/field.php index 7c961007d..cc32a5022 100644 --- a/admin/tables/field.php +++ b/admin/tables/field.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/tables/fieldtype.php b/admin/tables/fieldtype.php index 8059a7cb4..bd3ffaa0a 100644 --- a/admin/tables/fieldtype.php +++ b/admin/tables/fieldtype.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 091c6fd3a..87cf322f9 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage help_document.php diff --git a/admin/tables/layout.php b/admin/tables/layout.php index 76b89ce28..0c9a14840 100644 --- a/admin/tables/layout.php +++ b/admin/tables/layout.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage layout.php diff --git a/admin/tables/site_view.php b/admin/tables/site_view.php index 3b40cab0a..a2e610721 100644 --- a/admin/tables/site_view.php +++ b/admin/tables/site_view.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/tables/snippet.php b/admin/tables/snippet.php index 86154fd95..97a299c16 100644 --- a/admin/tables/snippet.php +++ b/admin/tables/snippet.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/tables/template.php b/admin/tables/template.php index 2b19e7c2c..19c5b0d5a 100644 --- a/admin/tables/template.php +++ b/admin/tables/template.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage template.php diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index 6a3a40379..0637d6861 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 2fe2eb6a7..6aa14d726 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -85,6 +85,16 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder'); + +
+
+
+
+ +
+
+ +
diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index e8e75ce0d..4c7371f31 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -71,7 +71,10 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy } // Get Linked view data - $this->vxtfields = $this->get('Vxtfields'); + $this->vxtfields = $this->get('Vxtfields'); + + // Get Linked view data + $this->vxulinked_components = $this->get('Vxulinked_components'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index b477c47d3..5e31885c4 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 439022dfb..745576672 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 58a996135..f3544ca65 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 7e8a3b04f..4c869fa69 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 bc50e4662..e7e43c7d6 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 6298f6a56..932bf47cf 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 a700d2c3f..a925317e6 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 1fb509b65..38639d42e 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php index cdfb4aeda..6826f56ce 100644 --- a/admin/views/compiler/tmpl/default.php +++ b/admin/views/compiler/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index e56c58349..1e7eac7c2 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/component/submitbutton.js b/admin/views/component/submitbutton.js index 5cfcc6127..dfcc5b1b7 100644 --- a/admin/views/component/submitbutton.js +++ b/admin/views/component/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/component/tmpl/edit.php b/admin/views/component/tmpl/edit.php index ae9497075..6250c1c8d 100644 --- a/admin/views/component/tmpl/edit.php +++ b/admin/views/component/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/component/view.html.php b/admin/views/component/view.html.php index bf3a22a00..64be9d9c3 100644 --- a/admin/views/component/view.html.php +++ b/admin/views/component/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index 43857c2f8..9e7ab2cdd 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php index 5a5e3f123..f22572b67 100644 --- a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_closed_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index ee40bd4cf..3662198af 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php index e93d521d4..7b716c8aa 100644 --- a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_open_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index 3fae5c9bd..0bb11edfa 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.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_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 16bead42c..b5c2721a4 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.2.6 - @build 12th January, 2017 + @build 20th January, 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 fbc92d7c1..d0df315e3 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index e1b243be1..162a65b2b 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/components/tmpl/default.php b/admin/views/components/tmpl/default.php index 7d9eab67f..42e048075 100644 --- a/admin/views/components/tmpl/default.php +++ b/admin/views/components/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/components/tmpl/default_batch_body.php b/admin/views/components/tmpl/default_batch_body.php index 55728fe69..45b76bdd6 100644 --- a/admin/views/components/tmpl/default_batch_body.php +++ b/admin/views/components/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/components/tmpl/default_batch_footer.php b/admin/views/components/tmpl/default_batch_footer.php index 24db35140..56f3c3c79 100644 --- a/admin/views/components/tmpl/default_batch_footer.php +++ b/admin/views/components/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/components/tmpl/default_body.php b/admin/views/components/tmpl/default_body.php index f5c209804..f7cfa3481 100644 --- a/admin/views/components/tmpl/default_body.php +++ b/admin/views/components/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/components/tmpl/default_foot.php b/admin/views/components/tmpl/default_foot.php index 187403c35..89851fd6a 100644 --- a/admin/views/components/tmpl/default_foot.php +++ b/admin/views/components/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/components/tmpl/default_head.php b/admin/views/components/tmpl/default_head.php index fe63b0f10..d5e14fe94 100644 --- a/admin/views/components/tmpl/default_head.php +++ b/admin/views/components/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/components/tmpl/default_toolbar.php b/admin/views/components/tmpl/default_toolbar.php index 8a4bf5e8d..3ddc9a345 100644 --- a/admin/views/components/tmpl/default_toolbar.php +++ b/admin/views/components/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/components/view.html.php b/admin/views/components/view.html.php index e80cf0897..1e0bc090c 100644 --- a/admin/views/components/view.html.php +++ b/admin/views/components/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 636787513..08fe0f173 100644 --- a/admin/views/custom_admin_view/submitbutton.js +++ b/admin/views/custom_admin_view/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 09c91b587..842511078 100644 --- a/admin/views/custom_admin_view/tmpl/edit.php +++ b/admin/views/custom_admin_view/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -101,6 +101,16 @@ $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')) : ?>
diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index 561fb1a78..dd1b8501e 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -68,7 +68,10 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy { // return to the list view that refered to this item $this->referral = '&ref='.(string)$this->ref; - } + } + + // Get Linked view data + $this->vyelinked_components = $this->get('Vyelinked_components'); // Set the toolbar $this->addToolBar(); @@ -194,7 +197,17 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_EDIT')); $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_view.css"); // Add Ajax Token - $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); + $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->addScript(JURI::root() . $this->script); $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_admin_view/submitbutton.js"); JText::script('view not acceptable. Error'); diff --git a/admin/views/custom_admin_views/tmpl/default.php b/admin/views/custom_admin_views/tmpl/default.php index 726dc1072..7ca84e1e8 100644 --- a/admin/views/custom_admin_views/tmpl/default.php +++ b/admin/views/custom_admin_views/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 0ff436aec..508a76312 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 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 630a187a0..6a24c4293 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 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 7e9f614e7..3f044644a 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 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 96ca607b4..f8f8192a9 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 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 d1081758c..4de284182 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 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 96c4453bc..523fcc2e5 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 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 628539b95..3444320ec 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 7c69a40dd..0b39c2009 100644 --- a/admin/views/dynamic_get/submitbutton.js +++ b/admin/views/dynamic_get/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 e5eb9cb11..65dfffc7c 100644 --- a/admin/views/dynamic_get/tmpl/edit.php +++ b/admin/views/dynamic_get/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 aac3d37db..10af819da 100644 --- a/admin/views/dynamic_get/view.html.php +++ b/admin/views/dynamic_get/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 e6a5160e1..97289b830 100644 --- a/admin/views/dynamic_gets/tmpl/default.php +++ b/admin/views/dynamic_gets/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 3c616eb37..85f5a148a 100644 --- a/admin/views/dynamic_gets/tmpl/default_batch_body.php +++ b/admin/views/dynamic_gets/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 a38073e51..d850f7090 100644 --- a/admin/views/dynamic_gets/tmpl/default_batch_footer.php +++ b/admin/views/dynamic_gets/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 2f36e4c51..fb740ef16 100644 --- a/admin/views/dynamic_gets/tmpl/default_body.php +++ b/admin/views/dynamic_gets/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 b7a55d0d8..16b8ca0b6 100644 --- a/admin/views/dynamic_gets/tmpl/default_foot.php +++ b/admin/views/dynamic_gets/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 5fcaa9be4..6e807c78b 100644 --- a/admin/views/dynamic_gets/tmpl/default_head.php +++ b/admin/views/dynamic_gets/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 8a267b26b..2a1d724cd 100644 --- a/admin/views/dynamic_gets/tmpl/default_toolbar.php +++ b/admin/views/dynamic_gets/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 4da460e84..2aa495ea6 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 f98c70c7c..735f9b408 100644 --- a/admin/views/field/submitbutton.js +++ b/admin/views/field/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 411f0e6da..4e3468f37 100644 --- a/admin/views/field/tmpl/edit.php +++ b/admin/views/field/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 b52546bdb..1f7adc06f 100644 --- a/admin/views/field/view.html.php +++ b/admin/views/field/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -71,7 +71,7 @@ class ComponentbuilderViewField extends JViewLegacy } // Get Linked view data - $this->vzplinked_admin_views = $this->get('Vzplinked_admin_views'); + $this->vzslinked_admin_views = $this->get('Vzslinked_admin_views'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/fields/tmpl/default.php b/admin/views/fields/tmpl/default.php index dba9b7ea9..88bd9ff9e 100644 --- a/admin/views/fields/tmpl/default.php +++ b/admin/views/fields/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d0eda5fd2..411142af2 100644 --- a/admin/views/fields/tmpl/default_batch_body.php +++ b/admin/views/fields/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 e4e449b52..af6c6c427 100644 --- a/admin/views/fields/tmpl/default_batch_footer.php +++ b/admin/views/fields/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 8a2a6fbb1..16ef8c142 100644 --- a/admin/views/fields/tmpl/default_body.php +++ b/admin/views/fields/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 3f50506bd..9b8ac762c 100644 --- a/admin/views/fields/tmpl/default_foot.php +++ b/admin/views/fields/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 a1cadad7a..38dd021b5 100644 --- a/admin/views/fields/tmpl/default_head.php +++ b/admin/views/fields/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 d1fa79f51..4683f99d7 100644 --- a/admin/views/fields/tmpl/default_toolbar.php +++ b/admin/views/fields/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 570e861c5..976064846 100644 --- a/admin/views/fields/view.html.php +++ b/admin/views/fields/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/fieldtype/submitbutton.js b/admin/views/fieldtype/submitbutton.js index 9ef7f64ea..306fa15ce 100644 --- a/admin/views/fieldtype/submitbutton.js +++ b/admin/views/fieldtype/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 f2489bf4a..ed5e7b8e7 100644 --- a/admin/views/fieldtype/tmpl/edit.php +++ b/admin/views/fieldtype/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 302b8516f..d2ac3bb1a 100644 --- a/admin/views/fieldtype/view.html.php +++ b/admin/views/fieldtype/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -71,7 +71,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy } // Get Linked view data - $this->vzqfields = $this->get('Vzqfields'); + $this->vztfields = $this->get('Vztfields'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/fieldtypes/tmpl/default.php b/admin/views/fieldtypes/tmpl/default.php index 25cf25834..3fe3842ef 100644 --- a/admin/views/fieldtypes/tmpl/default.php +++ b/admin/views/fieldtypes/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 f5382df9e..ad9b2034b 100644 --- a/admin/views/fieldtypes/tmpl/default_batch_body.php +++ b/admin/views/fieldtypes/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 c46a9929b..4cfee9523 100644 --- a/admin/views/fieldtypes/tmpl/default_batch_footer.php +++ b/admin/views/fieldtypes/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 c52576dc8..24de05eb5 100644 --- a/admin/views/fieldtypes/tmpl/default_body.php +++ b/admin/views/fieldtypes/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 b7a55d0d8..16b8ca0b6 100644 --- a/admin/views/fieldtypes/tmpl/default_foot.php +++ b/admin/views/fieldtypes/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 112254dfc..4d6d62fa9 100644 --- a/admin/views/fieldtypes/tmpl/default_head.php +++ b/admin/views/fieldtypes/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 fa9cbd659..9d9a16625 100644 --- a/admin/views/fieldtypes/tmpl/default_toolbar.php +++ b/admin/views/fieldtypes/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 2208d7326..7d2610587 100644 --- a/admin/views/fieldtypes/view.html.php +++ b/admin/views/fieldtypes/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index f449312c8..b8af69fa9 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index b71b87528..35aa9199a 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index cc680ea0a..a761416f2 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index b4c00719c..79532cd7a 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index 08caef67c..e80a16977 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index 1aa4556ce..66a57fa04 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index 525c47a7a..f35a521ab 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index 187403c35..89851fd6a 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index f7b2975de..375879789 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index cd933bac6..1a30618b8 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index d20f5fc51..7d253d40d 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 3004e8afb..1f69c5511 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 8933c25f5..5b88ba040 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/layout/submitbutton.js b/admin/views/layout/submitbutton.js index 3c7194980..277dab36b 100644 --- a/admin/views/layout/submitbutton.js +++ b/admin/views/layout/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/layout/tmpl/edit.php b/admin/views/layout/tmpl/edit.php index 105bd2928..399a77bef 100644 --- a/admin/views/layout/tmpl/edit.php +++ b/admin/views/layout/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/layout/view.html.php b/admin/views/layout/view.html.php index 8f6826b5c..36ecba33e 100644 --- a/admin/views/layout/view.html.php +++ b/admin/views/layout/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/layouts/tmpl/default.php b/admin/views/layouts/tmpl/default.php index eae65e912..ef4e4cc83 100644 --- a/admin/views/layouts/tmpl/default.php +++ b/admin/views/layouts/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/layouts/tmpl/default_batch_body.php b/admin/views/layouts/tmpl/default_batch_body.php index 408e6be49..5dcd0f7cf 100644 --- a/admin/views/layouts/tmpl/default_batch_body.php +++ b/admin/views/layouts/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/layouts/tmpl/default_batch_footer.php b/admin/views/layouts/tmpl/default_batch_footer.php index b592a8234..9d0cbfa93 100644 --- a/admin/views/layouts/tmpl/default_batch_footer.php +++ b/admin/views/layouts/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/layouts/tmpl/default_body.php b/admin/views/layouts/tmpl/default_body.php index 3d9ddd754..8bcbd7b44 100644 --- a/admin/views/layouts/tmpl/default_body.php +++ b/admin/views/layouts/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/layouts/tmpl/default_foot.php b/admin/views/layouts/tmpl/default_foot.php index bc50e4662..e7e43c7d6 100644 --- a/admin/views/layouts/tmpl/default_foot.php +++ b/admin/views/layouts/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/layouts/tmpl/default_head.php b/admin/views/layouts/tmpl/default_head.php index af38500ce..23ecc8872 100644 --- a/admin/views/layouts/tmpl/default_head.php +++ b/admin/views/layouts/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/layouts/tmpl/default_toolbar.php b/admin/views/layouts/tmpl/default_toolbar.php index 4ac1baf99..08e89bc9d 100644 --- a/admin/views/layouts/tmpl/default_toolbar.php +++ b/admin/views/layouts/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php index 8e589bfc2..aa6dc226c 100644 --- a/admin/views/layouts/view.html.php +++ b/admin/views/layouts/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 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 b82004138..e566464d6 100644 --- a/admin/views/site_view/submitbutton.js +++ b/admin/views/site_view/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 93c5ecd2f..dc6cf1a9f 100644 --- a/admin/views/site_view/tmpl/edit.php +++ b/admin/views/site_view/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -108,6 +108,16 @@ $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')) : ?>
diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php index 3e26b58c3..a05f52948 100644 --- a/admin/views/site_view/view.html.php +++ b/admin/views/site_view/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -68,7 +68,10 @@ class ComponentbuilderViewSite_view extends JViewLegacy { // return to the list view that refered to this item $this->referral = '&ref='.(string)$this->ref; - } + } + + // Get Linked view data + $this->vyplinked_components = $this->get('Vyplinked_components'); // Set the toolbar $this->addToolBar(); @@ -194,7 +197,17 @@ class ComponentbuilderViewSite_view extends JViewLegacy $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_SITE_VIEW_NEW' : 'COM_COMPONENTBUILDER_SITE_VIEW_EDIT')); $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/site_view.css"); // Add Ajax Token - $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); + $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->addScript(JURI::root() . $this->script); $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/site_view/submitbutton.js"); JText::script('view not acceptable. Error'); diff --git a/admin/views/site_views/tmpl/default.php b/admin/views/site_views/tmpl/default.php index a38c3e722..1c6741ced 100644 --- a/admin/views/site_views/tmpl/default.php +++ b/admin/views/site_views/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 b16d94074..20229344c 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 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 c932a0182..8cbac727e 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 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 603194f9b..920bdb91a 100644 --- a/admin/views/site_views/tmpl/default_body.php +++ b/admin/views/site_views/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 96ca607b4..f8f8192a9 100644 --- a/admin/views/site_views/tmpl/default_foot.php +++ b/admin/views/site_views/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 780b4c8c8..5c0caa579 100644 --- a/admin/views/site_views/tmpl/default_head.php +++ b/admin/views/site_views/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 8b15f6659..d227d56fa 100644 --- a/admin/views/site_views/tmpl/default_toolbar.php +++ b/admin/views/site_views/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 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 b78c56e4e..b1f6e63d7 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/snippet/submitbutton.js b/admin/views/snippet/submitbutton.js index 982da8eef..063907e16 100644 --- a/admin/views/snippet/submitbutton.js +++ b/admin/views/snippet/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/snippet/tmpl/edit.php b/admin/views/snippet/tmpl/edit.php index ba952d377..e281c821a 100644 --- a/admin/views/snippet/tmpl/edit.php +++ b/admin/views/snippet/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/snippet/view.html.php b/admin/views/snippet/view.html.php index 95d8ca987..1173670b0 100644 --- a/admin/views/snippet/view.html.php +++ b/admin/views/snippet/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/snippets/tmpl/default.php b/admin/views/snippets/tmpl/default.php index b0fe94afd..cd09aa577 100644 --- a/admin/views/snippets/tmpl/default.php +++ b/admin/views/snippets/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/snippets/tmpl/default_batch_body.php b/admin/views/snippets/tmpl/default_batch_body.php index 8322b0554..d0e188c45 100644 --- a/admin/views/snippets/tmpl/default_batch_body.php +++ b/admin/views/snippets/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/snippets/tmpl/default_batch_footer.php b/admin/views/snippets/tmpl/default_batch_footer.php index 02bd33aac..e1d9c7f0f 100644 --- a/admin/views/snippets/tmpl/default_batch_footer.php +++ b/admin/views/snippets/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/snippets/tmpl/default_body.php b/admin/views/snippets/tmpl/default_body.php index 873e193d6..30bc9970b 100644 --- a/admin/views/snippets/tmpl/default_body.php +++ b/admin/views/snippets/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/snippets/tmpl/default_foot.php b/admin/views/snippets/tmpl/default_foot.php index bc50e4662..e7e43c7d6 100644 --- a/admin/views/snippets/tmpl/default_foot.php +++ b/admin/views/snippets/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/snippets/tmpl/default_head.php b/admin/views/snippets/tmpl/default_head.php index dd7c0ce95..6d06a768e 100644 --- a/admin/views/snippets/tmpl/default_head.php +++ b/admin/views/snippets/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/snippets/tmpl/default_toolbar.php b/admin/views/snippets/tmpl/default_toolbar.php index ca9b3e726..d0c74a46b 100644 --- a/admin/views/snippets/tmpl/default_toolbar.php +++ b/admin/views/snippets/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php index 5c9c6e20f..bad81cb27 100644 --- a/admin/views/snippets/view.html.php +++ b/admin/views/snippets/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/template/submitbutton.js b/admin/views/template/submitbutton.js index 00a26c27e..b8dc3b97b 100644 --- a/admin/views/template/submitbutton.js +++ b/admin/views/template/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/template/tmpl/edit.php b/admin/views/template/tmpl/edit.php index 34c3821cf..dfaf7071d 100644 --- a/admin/views/template/tmpl/edit.php +++ b/admin/views/template/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/template/view.html.php b/admin/views/template/view.html.php index 9bc49449b..c9d1fefbd 100644 --- a/admin/views/template/view.html.php +++ b/admin/views/template/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/templates/tmpl/default.php b/admin/views/templates/tmpl/default.php index 9abff585f..72efd804a 100644 --- a/admin/views/templates/tmpl/default.php +++ b/admin/views/templates/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/templates/tmpl/default_batch_body.php b/admin/views/templates/tmpl/default_batch_body.php index 670dfe71d..c88c35819 100644 --- a/admin/views/templates/tmpl/default_batch_body.php +++ b/admin/views/templates/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/templates/tmpl/default_batch_footer.php b/admin/views/templates/tmpl/default_batch_footer.php index 4d54ef442..30504d5c2 100644 --- a/admin/views/templates/tmpl/default_batch_footer.php +++ b/admin/views/templates/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/templates/tmpl/default_body.php b/admin/views/templates/tmpl/default_body.php index 1af1b134f..9b259210f 100644 --- a/admin/views/templates/tmpl/default_body.php +++ b/admin/views/templates/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/templates/tmpl/default_foot.php b/admin/views/templates/tmpl/default_foot.php index bc50e4662..e7e43c7d6 100644 --- a/admin/views/templates/tmpl/default_foot.php +++ b/admin/views/templates/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/templates/tmpl/default_head.php b/admin/views/templates/tmpl/default_head.php index fac73bba0..79c885f76 100644 --- a/admin/views/templates/tmpl/default_head.php +++ b/admin/views/templates/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/templates/tmpl/default_toolbar.php b/admin/views/templates/tmpl/default_toolbar.php index 3795a6bdb..81c3f40e9 100644 --- a/admin/views/templates/tmpl/default_toolbar.php +++ b/admin/views/templates/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php index c66765024..b743ce253 100644 --- a/admin/views/templates/view.html.php +++ b/admin/views/templates/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/componentbuilder.xml b/componentbuilder.xml index ede81a342..c54bef1b1 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 12th January, 2017 + 20th January, 2017 Llewellyn van der Merwe info@vdm.io http://vdm.bz/component-builder @@ -50,23 +50,9 @@ Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have ju - - controller.php - index.html - router.php - componentbuilder.php - assets - helpers - controllers - models - views - layouts - + - - language/en-GB/en-GB.com_componentbuilder.ini - language/en-GB/en-GB.com_componentbuilder.sys.ini - + COM_COMPONENTBUILDER_MENU diff --git a/script.php b/script.php index 3daf9fbdf..0d0358a13 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.6 - @build 12th January, 2017 + @build 20th January, 2017 @created 30th April, 2015 @package Component Builder @subpackage script.php diff --git a/site/assets/css/index.html b/site/assets/css/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/assets/css/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/assets/css/site.css b/site/assets/css/site.css deleted file mode 100644 index 3a6dce48b..000000000 --- a/site/assets/css/site.css +++ /dev/null @@ -1,31 +0,0 @@ -/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/ - __ __ _ _____ _ _ __ __ _ _ _ - \ \ / / | | | __ \ | | | | | \/ | | | | | | | - \ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| | - \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | - \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | - \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| -/-------------------------------------------------------------------------------------------------------------------------------/ - - @version 2.2.6 - @build 12th January, 2017 - @created 30th April, 2015 - @package Component Builder - @subpackage site.css - @author Llewellyn van der Merwe - @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 - -/-----------------------------------------------------------------------------------------------------------------------------*/ - -/* CSS Document */ -.no-click { - pointer-events: none; -} -.fieldMedium { width: 130px; } -.fieldSmall { width: 60px; } -code { display: inline-block; margin: 3px;} diff --git a/site/assets/images/index.html b/site/assets/images/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/assets/images/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/assets/index.html b/site/assets/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/assets/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/assets/js/index.html b/site/assets/js/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/assets/js/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/assets/js/site.js b/site/assets/js/site.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/site/componentbuilder.php b/site/componentbuilder.php deleted file mode 100644 index 3ae8a7007..000000000 --- a/site/componentbuilder.php +++ /dev/null @@ -1,49 +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 component css/js -$document = JFactory::getDocument(); -$document->addStyleSheet('components/com_componentbuilder/assets/css/site.css'); -$document->addScript('components/com_componentbuilder/assets/js/site.js'); - -// Require helper files -JLoader::register('ComponentbuilderHelper', dirname(__FILE__) . '/helpers/componentbuilder.php'); -JLoader::register('ComponentbuilderHelperRoute', dirname(__FILE__) . '/helpers/route.php'); ###SITE_GLOBAL_EVENT### - -// import joomla controller library -jimport('joomla.application.component.controller'); - -// Get an instance of the controller prefixed by Componentbuilder -$controller = JControllerLegacy::getInstance('Componentbuilder'); - -// Perform the request task -$jinput = JFactory::getApplication()->input; -$controller->execute($jinput->get('task', null, 'CMD')); - -// Redirect if set by the controller -$controller->redirect(); diff --git a/site/controller.php b/site/controller.php deleted file mode 100644 index ac5f6b6e1..000000000 --- a/site/controller.php +++ /dev/null @@ -1,101 +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'); - -// import Joomla controller library -jimport('joomla.application.component.controller'); - -/** - * Componentbuilder Component Controller - */ -class ComponentbuilderController extends JControllerLegacy -{ - /** - * display task - * - * @return void - */ - function display($cachable = false, $urlparams = false) - { - // set default view if not set - $view = $this->input->getCmd('view', '###SITE_DEFAULT_VIEW###'); - $isEdit = $this->checkEditView($view); - $layout = $this->input->get('layout', null, 'WORD'); - $id = $this->input->getInt('id'); - $cachable = true; - - // Check for edit form. - if($isEdit) - { - if ($layout == 'edit' && !$this->checkEditId('com_componentbuilder.edit.'.$view, $id)) - { - // Somehow the person just went to the form - we don't allow that. - $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id)); - $this->setMessage($this->getError(), 'error'); - // check if item was opend from other then its own list view - $ref = $this->input->getCmd('ref', 0); - $refid = $this->input->getInt('refid', 0); - // set redirect - if ($refid > 0 && ComponentbuilderHelper::checkString($ref)) - { - // redirect to item of ref - $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view='.(string)$ref.'&layout=edit&id='.(int)$refid, false)); - } - elseif (ComponentbuilderHelper::checkString($ref)) - { - - // redirect to ref - $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view='.(string)$ref, false)); - } - else - { - // normal redirect back to the list default site view - $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=###SITE_DEFAULT_VIEW###', false)); - } - return false; - } - } - - return parent::display($cachable, $urlparams); - } - - protected function checkEditView($view) - { - if (ComponentbuilderHelper::checkString($view)) - { - $views = array( - - ); - // check if this is a edit view - if (in_array($view,$views)) - { - return true; - } - } - return false; - } -} diff --git a/site/controllers/help.php b/site/controllers/help.php deleted file mode 100644 index 87359be74..000000000 --- a/site/controllers/help.php +++ /dev/null @@ -1,130 +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'); - -// import Joomla controllerform library -jimport('joomla.application.component.controller'); - -/** - * Componentbuilder Help Controller - */ -class ComponentbuilderControllerHelp extends JControllerLegacy -{ - public function __construct($config) - { - parent::__construct($config); - // load the tasks - $this->registerTask('getText', 'help'); - } - - public function help() - { - $user = JFactory::getUser(); - $jinput = JFactory::getApplication()->input; - // Check Token! - $token = JSession::getFormToken(); - $call_token = $jinput->get('token', 0, 'ALNUM'); - if($token == $call_token){ - $task = $this->getTask(); - switch($task){ - case 'getText': - try - { - $idValue = $jinput->get('id', 0, 'INT'); - if($idValue) - { - $result = $this->getHelpDocumentText($idValue); - } - else - { - $result = ''; - } - echo $result; - // stop execution gracefully - jexit(); - } - catch(Exception $e) - { - // stop execution gracefully - jexit(); - } - break; - } - } - else - { - // stop execution gracefully - jexit(); - } - } - - protected function getHelpDocumentText($id) - { - $db = JFactory::getDbo(); - $query = $db->getQuery(true); - $query->select(array('a.title','a.content')); - $query->from('#__componentbuilder_help_document AS a'); - $query->where('a.id = '.(int) $id); - $query->where('a.published = 1'); - $query->where('a.location = 2'); - $db->setQuery($query); - $db->execute(); - if($db->getNumRows()) - { - $text = array(); - $document = $db->loadObject(); - // fix image issue - $images['src="images'] = 'src="'.JURI::root().'images'; - $images["src='images"] = "src='".JURI::root()."images"; - $images['src="/images'] = 'src="'.JURI::root().'images'; - $images["src='/images"] = "src='".JURI::root()."images"; - // set document template - $text[] = ""; - $text[] = ''; - $text[] = ""; - $text[] = ''; - $text[] = "".$document->title.""; - $text[] = ''; - $text[] = ''; - $text[] = ""; - $text[] = '
'; - $text[] = '
'; - $text[] = '
'; - // build the help text - $text[] = '

'.$document->title."

"; - $text[] = str_replace(array_keys($images),array_values($images),$document->content); - // end template - $text[] = '


'; - $text[] = '
'; - $text[] = ""; - $text[] = ""; - - return implode("\n",$text); - } - return false; - } -} diff --git a/site/controllers/index.html b/site/controllers/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/controllers/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php deleted file mode 100644 index f9219f4db..000000000 --- a/site/helpers/componentbuilder.php +++ /dev/null @@ -1,1068 +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'); - -/** - * Componentbuilder component helper - */ -abstract class ComponentbuilderHelper -{###SITE_GLOBAL_EVENT_HELPER### ###SITE_CUSTOM_HELPER_SCRIPT### - - public static function jsonToString($value, $sperator = ", ", $table = null) - { - // check if string is JSON - $result = json_decode($value, true); - if (json_last_error() === JSON_ERROR_NONE) - { - // is JSON - if (self::checkArray($result)) - { - if (self::checkString($table)) - { - $names = array(); - foreach ($result as $val) - { - if ($name = self::getVar($table, $val, 'id', 'name')) - { - $names[] = $name; - } - } - if (self::checkArray($names)) - { - return (string) implode($sperator,$names); - } - } - return (string) implode($sperator,$result); - } - return (string) json_decode($value); - } - return $value; - } - - /** - * Load the Component xml manifest. - **/ - public static function manifest() - { - $manifestUrl = JPATH_ADMINISTRATOR."/components/com_componentbuilder/componentbuilder.xml"; - return simplexml_load_file($manifestUrl); - } - - /** - * Load the Contributors details. - **/ - public static function getContributors() - { - // get params - $params = JComponentHelper::getParams('com_componentbuilder'); - // start contributors array - $contributors = array(); - // get all Contributors (max 20) - $searchArray = range('0','20'); - foreach($searchArray as $nr) - { - if ((NULL !== $params->get("showContributor".$nr)) && ($params->get("showContributor".$nr) == 2 || $params->get("showContributor".$nr) == 3)) - { - // set link based of selected option - if($params->get("useContributor".$nr) == 1) - { - $link_front = ''; - $link_back = ''; - } - elseif($params->get("useContributor".$nr) == 2) - { - $link_front = ''; - $link_back = ''; - } - else - { - $link_front = ''; - $link_back = ''; - } - $contributors[$nr]['title'] = self::htmlEscape($params->get("titleContributor".$nr)); - $contributors[$nr]['name'] = $link_front.self::htmlEscape($params->get("nameContributor".$nr)).$link_back; - } - } - return $contributors; - } - - /** - * Load the Component Help URLs. - **/ - public static function getHelpUrl($view) - { - $user = JFactory::getUser(); - $groups = $user->get('groups'); - $db = JFactory::getDbo(); - $query = $db->getQuery(true); - $query->select(array('a.id','a.groups','a.target','a.type','a.article','a.url')); - $query->from('#__componentbuilder_help_document AS a'); - $query->where('a.site_view = '.$db->quote($view)); - $query->where('a.location = 2'); - $query->where('a.published = 1'); - $db->setQuery($query); - $db->execute(); - if($db->getNumRows()) - { - $helps = $db->loadObjectList(); - if (self::checkArray($helps)) - { - foreach ($helps as $nr => $help) - { - if ($help->target == 1) - { - $targetgroups = json_decode($help->groups, true); - if (!array_intersect($targetgroups, $groups)) - { - // if user not in those target groups then remove the item - unset($helps[$nr]); - continue; - } - } - // set the return type - switch ($help->type) - { - // set joomla article - case 1: - return self::loadArticleLink($help->article); - break; - // set help text - case 2: - return self::loadHelpTextLink($help->id); - break; - // set Link - case 3: - return $help->url; - break; - } - } - } - } - return false; - } - - /** - * Get the Article Link. - **/ - protected static function loadArticleLink($id) - { - return JURI::root().'index.php?option=com_content&view=article&id='.$id.'&tmpl=component&layout=modal'; - } - - /** - * Get the Help Text Link. - **/ - protected static function loadHelpTextLink($id) - { - $token = JSession::getFormToken(); - return 'index.php?option=com_componentbuilder&task=help.getText&id=' . (int) $id . '&token=' . $token; - } - - /** - * Get any component's model - **/ - public static function getModel($name, $path = JPATH_COMPONENT_SITE, $component = 'componentbuilder') - { - // load some joomla helpers - JLoader::import('joomla.application.component.model'); - // load the model file - JLoader::import( $name, $path . '/models' ); - // return instance - return JModelLegacy::getInstance( $name, $component.'Model' ); - } - - /** - * Add to asset Table - */ - public static function setAsset($id,$table) - { - $parent = JTable::getInstance('Asset'); - $parent->loadByName('com_componentbuilder'); - - $parentId = $parent->id; - $name = 'com_componentbuilder.'.$table.'.'.$id; - $title = ''; - - $asset = JTable::getInstance('Asset'); - $asset->loadByName($name); - - // Check for an error. - $error = $asset->getError(); - - if ($error) - { - $this->setError($error); - - return false; - } - else - { - // Specify how a new or moved node asset is inserted into the tree. - if ($asset->parent_id != $parentId) - { - $asset->setLocation($parentId, 'last-child'); - } - - // Prepare the asset to be stored. - $asset->parent_id = $parentId; - $asset->name = $name; - $asset->title = $title; - // get the default asset rules - $rules = self::getDefaultAssetRules('com_componentbuilder',$table); - if ($rules instanceof JAccessRules) - { - $asset->rules = (string) $rules; - } - - if (!$asset->check() || !$asset->store()) - { - JFactory::getApplication()->enqueueMessage($asset->getError(), 'warning'); - return false; - } - else - { - // Create an asset_id or heal one that is corrupted. - $object = new stdClass(); - - // Must be a valid primary key value. - $object->id = $id; - $object->asset_id = (int) $asset->id; - - // Update their asset_id to link to the asset table. - return JFactory::getDbo()->updateObject('#__componentbuilder_'.$table, $object, 'id'); - } - } - return false; - } - - /** - * Gets the default asset Rules for a component/view. - */ - protected static function getDefaultAssetRules($component,$view) - { - // Need to find the asset id by the name of the component. - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__assets')) - ->where($db->quoteName('name') . ' = ' . $db->quote($component)); - $db->setQuery($query); - $db->execute(); - if ($db->loadRowList()) - { - // asset alread set so use saved rules - $assetId = (int) $db->loadResult(); - $result = JAccess::getAssetRules($assetId); - if ($result instanceof JAccessRules) - { - $_result = (string) $result; - $_result = json_decode($_result); - foreach ($_result as $name => &$rule) - { - $v = explode('.', $name); - if ($view !== $v[0]) - { - // remove since it is not part of this view - unset($_result->$name); - } - else - { - // clear the value since we inherit - $rule = array(); - } - } - // check if there are any view values remaining - if (count($_result)) - { - $_result = json_encode($_result); - $_result = array($_result); - // Instantiate and return the JAccessRules object for the asset rules. - $rules = new JAccessRules($_result); - - return $rules; - } - return $result; - } - } - return JAccess::getAssetRules(0); - } - - public static function renderBoolButton() - { - $args = func_get_args(); - - // get the radio element - $button = JFormHelper::loadFieldType('radio'); - - // setup the properties - $name = self::htmlEscape($args[0]); - $additional = isset($args[1]) ? (string) $args[1] : ''; - $value = $args[2]; - $yes = isset($args[3]) ? self::htmlEscape($args[3]) : 'JYES'; - $no = isset($args[4]) ? self::htmlEscape($args[4]) : 'JNO'; - - // prepare the xml - $element = new SimpleXMLElement(''); - - // run - $button->setup($element, $value); - - return $button->input; - - } - - /** - * UIKIT Component Classes - **/ - public static $uk_components = array( - 'data-uk-grid' => array( - 'grid' ), - 'uk-accordion' => array( - 'accordion' ), - 'uk-autocomplete' => array( - 'autocomplete' ), - 'data-uk-datepicker' => array( - 'datepicker' ), - 'uk-form-password' => array( - 'form-password' ), - 'uk-form-select' => array( - 'form-select' ), - 'data-uk-htmleditor' => array( - 'htmleditor' ), - 'data-uk-lightbox' => array( - 'lightbox' ), - 'uk-nestable' => array( - 'nestable' ), - 'UIkit.notify' => array( - 'notify' ), - 'data-uk-parallax' => array( - 'parallax' ), - 'uk-search' => array( - 'search' ), - 'uk-slider' => array( - 'slider' ), - 'uk-slideset' => array( - 'slideset' ), - 'uk-slideshow' => array( - 'slideshow', - 'slideshow-fx' ), - 'uk-sortable' => array( - 'sortable' ), - 'data-uk-sticky' => array( - 'sticky' ), - 'data-uk-timepicker' => array( - 'timepicker' ), - 'data-uk-tooltip' => array( - 'tooltip' ), - 'uk-placeholder' => array( - 'placeholder' ), - 'uk-dotnav' => array( - 'dotnav' ), - 'uk-slidenav' => array( - 'slidenav' ), - 'uk-form' => array( - 'form-advanced' ), - 'uk-progress' => array( - 'progress' ), - 'upload-drop' => array( - 'upload', 'form-file' ) - ); - - /** - * Add UIKIT Components - **/ - public static $uikit = false; - - /** - * Get UIKIT Components - **/ - public static function getUikitComp($content,$classes = array()) - { - if (strpos($content,'class="uk-') !== false) - { - // reset - $temp = array(); - foreach (self::$uk_components as $looking => $add) - { - if (strpos($content,$looking) !== false) - { - $temp[] = $looking; - } - } - // make sure uikit is loaded to config - if (strpos($content,'class="uk-') !== false) - { - self::$uikit = true; - } - // sorter - if (self::checkArray($temp)) - { - // merger - if (self::checkArray($classes)) - { - $newTemp = array_merge($temp,$classes); - $temp = array_unique($newTemp); - } - return $temp; - } - } - if (self::checkArray($classes)) - { - return $classes; - } - return false; - } - - public static function getVar($table, $where = null, $whereString = 'user', $what = 'id', $operator = '=', $main = 'componentbuilder') - { - if(!$where) - { - $where = JFactory::getUser()->id; - } - // Get a db connection. - $db = JFactory::getDbo(); - // Create a new query object. - $query = $db->getQuery(true); - $query->select($db->quoteName(array($what))); - if (empty($table)) - { - $query->from($db->quoteName('#__'.$main)); - } - else - { - $query->from($db->quoteName('#__'.$main.'_'.$table)); - } - if (is_numeric($where)) - { - $query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where); - } - elseif (is_string($where)) - { - $query->where($db->quoteName($whereString) . ' '.$operator.' '. $db->quote((string)$where)); - } - else - { - return false; - } - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - return $db->loadResult(); - } - return false; - } - - public static function getVars($table, $where = null, $whereString = 'user', $what = 'id', $operator = 'IN', $main = 'componentbuilder', $unique = true) - { - if(!$where) - { - $where = JFactory::getUser()->id; - } - - if (!self::checkArray($where) && $where > 0) - { - $where = array($where); - } - - if (self::checkArray($where)) - { - // Get a db connection. - $db = JFactory::getDbo(); - // Create a new query object. - $query = $db->getQuery(true); - - $query->select($db->quoteName(array($what))); - $query->from($db->quoteName('#__'.$main.'_'.$table)); - $query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')'); - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - if ($unique) - { - return array_unique($db->loadColumn()); - } - return $db->loadColumn(); - } - } - return false; - } - - public static function isPublished($id,$type) - { - if ($type == 'raw') - { - $type = 'item'; - } - $db = JFactory::getDbo(); - $query = $db->getQuery(true); - $query->select(array('a.published')); - $query->from('#__componentbuilder_'.$type.' AS a'); - $query->where('a.id = '. (int) $id); - $query->where('a.published = 1'); - $db->setQuery($query); - $db->execute(); - $found = $db->getNumRows(); - if($found) - { - return true; - } - return false; - } - - public static function getGroupName($id) - { - $db = JFactory::getDBO(); - $query = $db->getQuery(true); - $query->select(array('a.title')); - $query->from('#__usergroups AS a'); - $query->where('a.id = '. (int) $id); - $db->setQuery($query); - $db->execute(); - $found = $db->getNumRows(); - if($found) - { - return $db->loadResult(); - } - return $id; - } - - /** - * Get the actions permissions - **/ - public static function getActions($view,&$record = null,$views = null) - { - jimport('joomla.access.access'); - - $user = JFactory::getUser(); - $result = new JObject; - $view = self::safeString($view); - if (self::checkString($views)) - { - $views = self::safeString($views); - } - // get all actions from component - $actions = JAccess::getActions('com_componentbuilder', 'component'); - // set acctions only set in component settiongs - $componentActions = array('core.admin','core.manage','core.options','core.export'); - // loop the actions and set the permissions - foreach ($actions as $action) - { - // set to use component default - $fallback = true; - if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name,$componentActions)) - { - // The record has been set. Check the record permissions. - $permission = $user->authorise($action->name, 'com_componentbuilder.'.$view.'.' . (int) $record->id); - if (!$permission) // TODO removed && !is_null($permission) - { - if ($action->name == 'core.edit' || $action->name == $view.'.edit') - { - if ($user->authorise('core.edit.own', 'com_componentbuilder.'.$view.'.' . (int) $record->id)) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - elseif ($user->authorise($view.'edit.own', 'com_componentbuilder.'.$view.'.' . (int) $record->id)) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - elseif ($user->authorise('core.edit.own', 'com_componentbuilder')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - elseif ($user->authorise($view.'edit.own', 'com_componentbuilder')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - } - } - elseif (self::checkString($views) && isset($record->catid) && $record->catid > 0) - { - // make sure we use the core. action check for the categories - if (strpos($action->name,$view) !== false && strpos($action->name,'core.') === false ) { - $coreCheck = explode('.',$action->name); - $coreCheck[0] = 'core'; - $categoryCheck = implode('.',$coreCheck); - } - else - { - $categoryCheck = $action->name; - } - // The record has a category. Check the category permissions. - $catpermission = $user->authorise($categoryCheck, 'com_componentbuilder.'.$views.'.category.' . (int) $record->catid); - if (!$catpermission && !is_null($catpermission)) - { - if ($action->name == 'core.edit' || $action->name == $view.'.edit') - { - if ($user->authorise('core.edit.own', 'com_componentbuilder.'.$views.'.category.' . (int) $record->catid)) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - elseif ($user->authorise($view.'edit.own', 'com_componentbuilder.'.$views.'.category.' . (int) $record->catid)) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - elseif ($user->authorise('core.edit.own', 'com_componentbuilder')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - elseif ($user->authorise($view.'edit.own', 'com_componentbuilder')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - } - } - } - } - // if allowed then fallback on component global settings - if ($fallback) - { - $result->set($action->name, $user->authorise($action->name, 'com_componentbuilder')); - } - } - return $result; - } - - public static function checkJson($string) - { - if (self::checkString($string)) - { - json_decode($string); - return (json_last_error() === JSON_ERROR_NONE); - } - return false; - } - - public static function checkObject($object) - { - if (isset($object) && is_object($object) && count($object) > 0) - { - return true; - } - return false; - } - - public static function checkArray($array, $removeEmptyString = false) - { - if (isset($array) && is_array($array) && count($array) > 0) - { - // also make sure the empty strings are removed - if ($removeEmptyString) - { - foreach ($array as $key => $string) - { - if (empty($string)) - { - unset($array[$key]); - } - } - return self::checkArray($array, false); - } - return true; - } - return false; - } - - public static function checkString($string) - { - if (isset($string) && is_string($string) && strlen($string) > 0) - { - return true; - } - return false; - } - - public static function mergeArrays($arrays) - { - if(self::checkArray($arrays)) - { - $arrayBuket = array(); - foreach ($arrays as $array) - { - if (self::checkArray($array)) - { - $arrayBuket = array_merge($arrayBuket, $array); - } - } - return $arrayBuket; - } - return false; - } - - public static function sorten($string, $length = 40, $addTip = true) - { - if (self::checkString($string)) - { - $initial = strlen($string); - $words = preg_split('/([\s\n\r]+)/', $string, null, PREG_SPLIT_DELIM_CAPTURE); - $words_count = count($words); - - $word_length = 0; - $last_word = 0; - for (; $last_word < $words_count; ++$last_word) - { - $word_length += strlen($words[$last_word]); - if ($word_length > $length) - { - break; - } - } - - $newString = implode(array_slice($words, 0, $last_word)); - $final = strlen($newString); - if ($initial != $final && $addTip) - { - $title = self::sorten($string, 400 , false); - return ''.trim($newString).'...'; - } - elseif ($initial != $final && !$addTip) - { - return trim($newString).'...'; - } - } - return $string; - } - - public static function safeString($string, $type = 'L', $spacer = '_') - { - // remove all numbers and replace with english text version (works well only up to a thousand) - $string = self::replaceNumbers($string); - - if (self::checkString($string)) - { - // remove all other characters - $string = trim($string); - $string = preg_replace('/'.$spacer.'+/', ' ', $string); - $string = preg_replace('/\s+/', ' ', $string); - $string = preg_replace("/[^A-Za-z ]/", '', $string); - // return a string with all first letter of each word uppercase(no undersocre) - if ($type == 'W') - { - return ucwords(strtolower($string)); - } - elseif ($type == 'w') - { - return strtolower($string); - } - elseif ($type == 'Ww') - { - return ucfirst(strtolower($string)); - } - elseif ($type == 'WW') - { - return strtoupper($string); - } - elseif ($type == 'U') - { - // replace white space with underscore - $string = preg_replace('/\s+/', $spacer, $string); - // return all upper - return strtoupper($string); - } - elseif ($type == 'F') - { - // replace white space with underscore - $string = preg_replace('/\s+/', $spacer, $string); - // return with first caracter to upper - return ucfirst(strtolower($string)); - } - elseif ($type == 'L') - { - // replace white space with underscore - $string = preg_replace('/\s+/', $spacer, $string); - // default is to return lower - return strtolower($string); - } - - // return string - return $string; - } - // not a string - return ''; - } - - public static function htmlEscape($var, $charset = 'UTF-8', $sorten = false, $length = 40) - { - if (self::checkString($var)) - { - $filter = new JFilterInput(); - $string = $filter->clean(html_entity_decode(htmlentities($var, ENT_COMPAT, $charset)), 'HTML'); - if ($sorten) - { - return self::sorten($string,$length); - } - return $string; - } - else - { - return ''; - } - } - - public static function replaceNumbers($string) - { - // set numbers array - $numbers = array(); - // first get all numbers - preg_match_all('!\d+!', $string, $numbers); - // check if we have any numbers - if (isset($numbers[0]) && self::checkArray($numbers[0])) - { - foreach ($numbers[0] as $number) - { - $searchReplace[$number] = self::numberToString((int)$number); - } - // now replace numbers in string - $string = str_replace(array_keys($searchReplace), array_values($searchReplace),$string); - // check if we missed any, strange if we did. - return self::replaceNumbers($string); - } - // return the string with no numbers remaining. - return $string; - } - - /** - * Convert an integer into an English word string - * Thanks to Tom Nicholson - * - * @input an int - * @returns a string - **/ - public static function numberToString($x) - { - $nwords = array( "zero", "one", "two", "three", "four", "five", "six", "seven", - "eight", "nine", "ten", "eleven", "twelve", "thirteen", - "fourteen", "fifteen", "sixteen", "seventeen", "eighteen", - "nineteen", "twenty", 30 => "thirty", 40 => "forty", - 50 => "fifty", 60 => "sixty", 70 => "seventy", 80 => "eighty", - 90 => "ninety" ); - - if(!is_numeric($x)) - { - $w = $x; - } - elseif(fmod($x, 1) != 0) - { - $w = $x; - } - else - { - if($x < 0) - { - $w = 'minus '; - $x = -$x; - } - else - { - $w = ''; - // ... now $x is a non-negative integer. - } - - if($x < 21) // 0 to 20 - { - $w .= $nwords[$x]; - } - elseif($x < 100) // 21 to 99 - { - $w .= $nwords[10 * floor($x/10)]; - $r = fmod($x, 10); - if($r > 0) - { - $w .= ' '. $nwords[$r]; - } - } - elseif($x < 1000) // 100 to 999 - { - $w .= $nwords[floor($x/100)] .' hundred'; - $r = fmod($x, 100); - if($r > 0) - { - $w .= ' and '. self::numberToString($r); - } - } - elseif($x < 1000000) // 1000 to 999999 - { - $w .= self::numberToString(floor($x/1000)) .' thousand'; - $r = fmod($x, 1000); - if($r > 0) - { - $w .= ' '; - if($r < 100) - { - $w .= 'and '; - } - $w .= self::numberToString($r); - } - } - else // millions - { - $w .= self::numberToString(floor($x/1000000)) .' million'; - $r = fmod($x, 1000000); - if($r > 0) - { - $w .= ' '; - if($r < 100) - { - $w .= 'and '; - } - $w .= self::numberToString($r); - } - } - } - return $w; - } - - /** - * Random Key - * - * @returns a string - **/ - public static function randomkey($size) - { - $bag = "abcefghijknopqrstuwxyzABCDDEFGHIJKLLMMNOPQRSTUVVWXYZabcddefghijkllmmnopqrstuvvwxyzABCEFGHIJKNOPQRSTUWXYZ"; - $key = array(); - $bagsize = strlen($bag) - 1; - for ($i = 0; $i < $size; $i++) - { - $get = rand(0, $bagsize); - $key[] = $bag[$get]; - } - return implode($key); - } - - public static function getCryptKey($type, $default = null) - { - if ('basic' == $type) - { - // Get the global params - $params = JComponentHelper::getParams('com_componentbuilder', true); - $basic_key = $params->get('basic_key', $default); - if ($basic_key) - { - return $basic_key; - } - } - return false; - } -} diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php deleted file mode 100644 index 7fa1473d9..000000000 --- a/site/helpers/headercheck.php +++ /dev/null @@ -1,85 +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'); - -class HeaderCheck -{ - function js_loaded($script_name) - { - // UIkit check point - if (strpos($script_name,'uikit') !== false) - { - $app = JFactory::getApplication(); - $getTemplateName = $app->getTemplate('template')->template; - - if (strpos($getTemplateName,'yoo') !== false) - { - return true; - } - } - - $document = JFactory::getDocument(); - $head_data = $document->getHeadData(); - foreach (array_keys($head_data['scripts']) as $script) - { - if (stristr($script, $script_name)) - { - return true; - } - } - - return false; - } - - function css_loaded($script_name) - { - // UIkit check point - if (strpos($script_name,'uikit') !== false) - { - $app = JFactory::getApplication(); - $getTemplateName = $app->getTemplate('template')->template; - - if (strpos($getTemplateName,'yoo') !== false) - { - return true; - } - } - - $document = JFactory::getDocument(); - $head_data = $document->getHeadData(); - - foreach (array_keys($head_data['styleSheets']) as $script) - { - if (stristr($script, $script_name)) - { - return true; - } - } - - return false; - } -} \ No newline at end of file diff --git a/site/helpers/index.html b/site/helpers/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/helpers/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/helpers/route.php b/site/helpers/route.php deleted file mode 100644 index 56dcc7ed3..000000000 --- a/site/helpers/route.php +++ /dev/null @@ -1,221 +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'); - -// Component Helper -jimport('joomla.application.component.helper'); -jimport('joomla.application.categories'); - -/** - * Componentbuilder Route Helper - **/ -abstract class ComponentbuilderHelperRoute -{ - protected static $lookup; - - /** - * Get the URL route for componentbuilder category from a category ID and language - * - * @param mixed $catid The id of the items's category either an integer id or a instance of JCategoryNode - * @param mixed $language The id of the language being used. - * - * @return string The link to the contact - * - * @since 1.5 - */ - public static function getCategoryRoute_keep_for_later($catid, $language = 0) - { - if ($catid instanceof JCategoryNode) - { - $id = $catid->id; - $category = $catid; - } - else - { - throw new Exception('First parameter must be JCategoryNode'); - } - - $views = array( - "com_componentbuilder.fields" => "field", - "com_componentbuilder.fieldtypes" => "fieldtype"); - $view = $views[$category->extension]; - - if ($id < 1 || !($category instanceof JCategoryNode)) - { - $link = ''; - } - else - { - //Create the link - $link = 'index.php?option=com_componentbuilder&view='.$view.'&category='.$category->slug; - - $needles = array( - $view => array($id), - 'category' => array($id) - ); - - if ($language && $language != "*" && JLanguageMultilang::isEnabled()) - { - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select('a.sef AS sef') - ->select('a.lang_code AS lang_code') - ->from('#__languages AS a'); - - $db->setQuery($query); - $langs = $db->loadObjectList(); - foreach ($langs as $lang) - { - if ($language == $lang->lang_code) - { - $link .= '&lang='.$lang->sef; - $needles['language'] = $language; - } - } - } - - if ($item = self::_findItem($needles,'category')) - { - - $link .= '&Itemid='.$item; - } - else - { - if ($category) - { - $catids = array_reverse($category->getPath()); - $needles = array( - 'category' => $catids - ); - if ($item = self::_findItem($needles,'category')) - { - $link .= '&Itemid='.$item; - } - elseif ($item = self::_findItem(null, 'category')) - { - $link .= '&Itemid='.$item; - } - } - } - } - return $link; - } - - protected static function _findItem($needles = null,$type = null) - { - $app = JFactory::getApplication(); - $menus = $app->getMenu('site'); - $language = isset($needles['language']) ? $needles['language'] : '*'; - - // Prepare the reverse lookup array. - if (!isset(self::$lookup[$language])) - { - self::$lookup[$language] = array(); - - $component = JComponentHelper::getComponent('com_componentbuilder'); - - $attributes = array('component_id'); - $values = array($component->id); - - if ($language != '*') - { - $attributes[] = 'language'; - $values[] = array($needles['language'], '*'); - } - - $items = $menus->getItems($attributes, $values); - - foreach ($items as $item) - { - if (isset($item->query) && isset($item->query['view'])) - { - $view = $item->query['view']; - - if (!isset(self::$lookup[$language][$view])) - { - self::$lookup[$language][$view] = array(); - } - - if (isset($item->query['id'])) - { - /** - * Here it will become a bit tricky - * language != * can override existing entries - * language == * cannot override existing entries - */ - if (!isset(self::$lookup[$language][$view][$item->query['id']]) || $item->language != '*') - { - self::$lookup[$language][$view][$item->query['id']] = $item->id; - } - } - } - } - } - - if ($needles) - { - foreach ($needles as $view => $ids) - { - if (isset(self::$lookup[$language][$view])) - { - foreach ($ids as $id) - { - if (isset(self::$lookup[$language][$view][(int) $id])) - { - return self::$lookup[$language][$view][(int) $id]; - } - } - } - } - } - - if ($type) - { - // Check if the global menu item has been set. - $params = JComponentHelper::getParams('com_componentbuilder'); - if ($item = $params->get($type.'_menu', 0)) - { - return $item; - } - } - - // Check if the active menuitem matches the requested language - $active = $menus->getActive(); - - if ($active - && $active->component == 'com_componentbuilder' - && ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled())) - { - return $active->id; - } - - // If not found, return language specific home link - $default = $menus->getDefault($language); - - return !empty($default->id) ? $default->id : null; - } -} diff --git a/site/index.html b/site/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/language/en-GB/en-GB.com_componentbuilder.ini b/site/language/en-GB/en-GB.com_componentbuilder.ini deleted file mode 100644 index c44db8689..000000000 --- a/site/language/en-GB/en-GB.com_componentbuilder.ini +++ /dev/null @@ -1,17 +0,0 @@ -COM_COMPONENTBUILDER="Component Builder" -COM_COMPONENTBUILDER_CREATE_NEW_S="Create New %s" -COM_COMPONENTBUILDER_EDIT_S="Edit %s" -COM_COMPONENTBUILDER_NEW="New" -COM_CONTENT_FIELD_MODIFIED_DESC="The last date this item was modified." -JGLOBAL_FIELD_ID_DESC="Record number in the database." -JGLOBAL_FIELD_ID_LABEL="ID" -JGLOBAL_FIELD_MODIFIED_BY_DESC="The user who did the last modification." -JGLOBAL_FIELD_MODIFIED_BY_LABEL="Modified By" -JGLOBAL_FIELD_MODIFIED_LABEL="Modified Date" -JTOOLBAR_APPLY="Save" -JTOOLBAR_CANCEL="Cancel" -JTOOLBAR_CLOSE="Close" -JTOOLBAR_HELP="Help" -JTOOLBAR_SAVE="Save & Close" -JTOOLBAR_SAVE_AND_NEW="Save & New" -JTOOLBAR_SAVE_AS_COPY="Save as Copy" diff --git a/site/language/en-GB/en-GB.com_componentbuilder.sys.ini b/site/language/en-GB/en-GB.com_componentbuilder.sys.ini deleted file mode 100644 index d00ef7909..000000000 --- a/site/language/en-GB/en-GB.com_componentbuilder.sys.ini +++ /dev/null @@ -1 +0,0 @@ -COM_COMPONENTBUILDER="Component Builder" diff --git a/site/language/en-GB/index.html b/site/language/en-GB/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/language/en-GB/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/language/index.html b/site/language/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/language/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/layouts/index.html b/site/layouts/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/layouts/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/models/index.html b/site/models/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/models/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/site/router.php b/site/router.php deleted file mode 100644 index 2e2072fc9..000000000 --- a/site/router.php +++ /dev/null @@ -1,193 +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'); - -/** - * Routing class from com_componentbuilder - * - * @since 3.3 - */ -class ComponentbuilderRouter extends JComponentRouterBase -{ - /** - * Build the route for the com_componentbuilder component - * - * @param array &$query An array of URL arguments - * - * @return array The URL arguments to use to assemble the subsequent URL. - * - * @since 3.3 - */ - public function build(&$query) - { - $segments = array(); - - // Get a menu item based on Itemid or currently active - $params = JComponentHelper::getParams('com_componentbuilder'); - - if (empty($query['Itemid'])) - { - $menuItem = $this->menu->getActive(); - } - else - { - $menuItem = $this->menu->getItem($query['Itemid']); - } - - $mView = (empty($menuItem->query['view'])) ? null : $menuItem->query['view']; - $mId = (empty($menuItem->query['id'])) ? null : $menuItem->query['id']; - - if (isset($query['view'])) - { - $view = $query['view']; - - if (empty($query['Itemid'])) - { - $segments[] = $query['view']; - } - - unset($query['view']); - } - - // Are we dealing with a item that is attached to a menu item? - if (isset($view) && ($mView == $view) and (isset($query['id'])) and ($mId == (int) $query['id'])) - { - unset($query['view']); - unset($query['catid']); - unset($query['id']); - return $segments; - } - - if (isset($view) && isset($query['id']) && 0) - { - if ($mId != (int) $query['id'] || $mView != $view) - { - if (0) - { - $segments[] = $view; - $id = explode(':', $query['id']); - if (count($id) == 2) - { - $segments[] = $id[1]; - } - else - { - $segments[] = $id[0]; - } - } - } - unset($query['id']); - } - - $total = count($segments); - - for ($i = 0; $i < $total; $i++) - { - $segments[$i] = str_replace(':', '-', $segments[$i]); - } - - return $segments; - - } - - /** - * Parse the segments of a URL. - * - * @param array &$segments The segments of the URL to parse. - * - * @return array The URL attributes to be used by the application. - * - * @since 3.3 - */ - public function parse(&$segments) - { - $count = count($segments); - $vars = array(); - - //Handle View and Identifier - switch($segments[0]) - { - } - - return $vars; - } - - protected function getVar($table, $where = null, $whereString = 'user', $what = 'id', $category = false, $operator = '=', $main = 'componentbuilder') - { - if(!$where) - { - $where = JFactory::getUser()->id; - } - // Get a db connection. - $db = JFactory::getDbo(); - // Create a new query object. - $query = $db->getQuery(true); - - $query->select($db->quoteName(array($what))); - if ('categories' == $table || 'category' == $table || $category) - { - $query->from($db->quoteName('#__categories')); - } - else - { - $query->from($db->quoteName('#__'.$main.'_'.$table)); - } - if (is_numeric($where)) - { - $query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where); - } - elseif (is_string($where)) - { - $query->where($db->quoteName($whereString) . ' '.$operator.' '. $db->quote((string)$where)); - } - else - { - return false; - } - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - return $db->loadResult(); - } - return false; - } -} - -function ComponentbuilderBuildRoute(&$query) -{ - $router = new ComponentbuilderRouter; - - return $router->build($query); -} - -function ComponentbuilderParseRoute($segments) -{ - $router = new ContentRouter; - - return $router->parse($segments); -} \ No newline at end of file diff --git a/site/views/index.html b/site/views/index.html deleted file mode 100644 index fa6d84e80..000000000 --- a/site/views/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file