From 0ae4e4f80d3b18eeaa20b4c192137363908ff5a8 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 30 Dec 2016 12:47:19 +0200 Subject: [PATCH] Added #31 feature to build fields and views dynamically via a sql dump. Fixed #29 to insure that a redirect loop does not occur easily. Made many other compiler improvements. --- README.md | 14 +- admin/README.txt | 14 +- admin/assets/css/admin.css | 4 +- admin/assets/css/admin_view.css | 4 +- admin/assets/css/admin_views.css | 4 +- admin/assets/css/component.css | 4 +- admin/assets/css/components.css | 4 +- admin/assets/css/custom_admin_view.css | 4 +- admin/assets/css/custom_admin_views.css | 4 +- admin/assets/css/dashboard.css | 4 +- admin/assets/css/dynamic_get.css | 4 +- admin/assets/css/dynamic_gets.css | 4 +- admin/assets/css/field.css | 4 +- admin/assets/css/fields.css | 4 +- admin/assets/css/fieldtype.css | 4 +- admin/assets/css/fieldtypes.css | 4 +- admin/assets/css/help_document.css | 4 +- admin/assets/css/help_documents.css | 4 +- admin/assets/css/layout.css | 4 +- admin/assets/css/layouts.css | 4 +- admin/assets/css/site_view.css | 4 +- admin/assets/css/site_views.css | 4 +- admin/assets/css/snippet.css | 4 +- admin/assets/css/snippets.css | 4 +- admin/assets/css/template.css | 4 +- admin/assets/css/templates.css | 4 +- .../joomla_3/JModelItem_custom_admin.php | 2 +- admin/compiler/joomla_3/JModelItem_site.php | 11 +- admin/compiler/joomla_3/JModelList_site.php | 11 +- admin/componentbuilder.php | 4 +- admin/controller.php | 4 +- admin/controllers/admin_view.php | 4 +- admin/controllers/admin_views.php | 4 +- admin/controllers/ajax.json.php | 4 +- admin/controllers/compiler.php | 4 +- admin/controllers/component.php | 4 +- admin/controllers/componentbuilder.php | 4 +- admin/controllers/components.php | 4 +- admin/controllers/custom_admin_view.php | 4 +- admin/controllers/custom_admin_views.php | 4 +- admin/controllers/dynamic_get.php | 4 +- admin/controllers/dynamic_gets.php | 4 +- admin/controllers/field.php | 4 +- admin/controllers/fields.php | 4 +- admin/controllers/fieldtype.php | 4 +- admin/controllers/fieldtypes.php | 4 +- admin/controllers/help.php | 4 +- admin/controllers/help_document.php | 4 +- admin/controllers/help_documents.php | 4 +- admin/controllers/import.php | 4 +- admin/controllers/layout.php | 4 +- admin/controllers/layouts.php | 4 +- admin/controllers/site_view.php | 4 +- admin/controllers/site_views.php | 4 +- admin/controllers/snippet.php | 4 +- admin/controllers/snippets.php | 4 +- admin/controllers/template.php | 4 +- admin/controllers/templates.php | 4 +- admin/helpers/compiler/e_Interpretation.php | 92 +- admin/helpers/compiler/f_Infusion.php | 6 +- admin/helpers/componentbuilder.php | 82 +- admin/helpers/extrusion/a_mapping.php | 389 +++++ admin/helpers/extrusion/b_builder.php | 294 ++++ admin/helpers/extrusion/c_extrusion.php | 141 ++ admin/helpers/extrusion/index.html | 1 + admin/helpers/html/batch_.php | 4 +- admin/helpers/indenter.php | 4 +- admin/helpers/js.php | 4 +- admin/helpers/minify.php | 4 +- .../en-GB/en-GB.com_componentbuilder.ini | 11 + admin/layouts/admin_view/css_fullwidth.php | 4 +- .../admin_view/custom_buttons_fullwidth.php | 4 +- .../admin_view/custom_buttons_left.php | 4 +- .../admin_view/custom_import_fullwidth.php | 4 +- admin/layouts/admin_view/fields_fullwidth.php | 6 +- .../admin_view/javascript_fullwidth.php | 4 +- admin/layouts/admin_view/mysql_fullwidth.php | 4 +- admin/layouts/admin_view/mysql_left.php | 4 +- admin/layouts/admin_view/php_fullwidth.php | 4 +- admin/layouts/admin_view/publishing.php | 4 +- admin/layouts/admin_view/publlshing.php | 4 +- admin/layouts/admin_view/settings_above.php | 4 +- admin/layouts/admin_view/settings_left.php | 4 +- admin/layouts/admin_view/settings_right.php | 4 +- admin/layouts/admin_view/settings_under.php | 4 +- admin/layouts/batchselection.php | 4 +- .../component/admin_views_fullwidth.php | 6 +- .../custom_admin_views_fullwidth.php | 138 ++ admin/layouts/component/details_above.php | 4 +- admin/layouts/component/details_left.php | 4 +- admin/layouts/component/details_right.php | 4 +- admin/layouts/component/details_under.php | 4 +- .../dynamic_build_beta_fullwidth.php | 50 + .../dynamic_integration_fullwidth.php | 4 +- .../component/libs_helpers_fullwidth.php | 4 +- admin/layouts/component/mysql_fullwidth.php | 4 +- admin/layouts/component/php_fullwidth.php | 4 +- admin/layouts/component/publishing.php | 4 +- admin/layouts/component/publlshing.php | 4 +- admin/layouts/component/readme_left.php | 4 +- admin/layouts/component/readme_right.php | 4 +- admin/layouts/component/settings_left.php | 10 +- admin/layouts/component/settings_right.php | 6 +- .../component/site_views_fullwidth.php | 6 +- .../custom_buttons_fullwidth.php | 4 +- .../custom_admin_view/custom_buttons_left.php | 4 +- .../custom_script_fullwidth.php | 4 +- .../custom_admin_view/details_above.php | 4 +- .../custom_admin_view/details_fullwidth.php | 4 +- .../custom_admin_view/details_left.php | 4 +- .../custom_admin_view/details_right.php | 4 +- .../custom_admin_view/details_rightside.php | 4 +- .../custom_admin_view/details_under.php | 4 +- .../layouts/custom_admin_view/publishing.php | 4 +- .../layouts/custom_admin_view/publlshing.php | 4 +- .../layouts/dynamic_get/abacus_fullwidth.php | 4 +- admin/layouts/dynamic_get/abacus_left.php | 4 +- .../dynamic_get/custom_script_fullwidth.php | 4 +- admin/layouts/dynamic_get/gettable_above.php | 4 +- .../dynamic_get/gettable_fullwidth.php | 4 +- admin/layouts/dynamic_get/gettable_left.php | 4 +- admin/layouts/dynamic_get/gettable_right.php | 4 +- admin/layouts/dynamic_get/gettable_under.php | 4 +- admin/layouts/dynamic_get/publishing.php | 4 +- admin/layouts/dynamic_get/publlshing.php | 4 +- admin/layouts/field/details_fullwidth.php | 4 +- admin/layouts/field/details_left.php | 4 +- admin/layouts/field/details_right.php | 4 +- admin/layouts/field/details_under.php | 4 +- admin/layouts/field/publishing.php | 4 +- admin/layouts/field/publlshing.php | 4 +- admin/layouts/field/scripts_left.php | 4 +- admin/layouts/field/scripts_right.php | 4 +- admin/layouts/fieldtype/details_left.php | 4 +- admin/layouts/fieldtype/details_right.php | 4 +- admin/layouts/fieldtype/fields_fullwidth.php | 6 +- admin/layouts/fieldtype/publishing.php | 4 +- admin/layouts/fieldtype/publlshing.php | 4 +- admin/layouts/help_document/details_above.php | 4 +- .../help_document/details_fullwidth.php | 4 +- admin/layouts/help_document/details_left.php | 4 +- admin/layouts/help_document/details_right.php | 4 +- admin/layouts/help_document/details_under.php | 4 +- admin/layouts/help_document/publishing.php | 4 +- admin/layouts/help_document/publlshing.php | 4 +- .../layout/custom_script_fullwidth.php | 4 +- admin/layouts/layout/details_fullwidth.php | 4 +- admin/layouts/layout/details_left.php | 4 +- admin/layouts/layout/details_right.php | 4 +- admin/layouts/layout/details_rightside.php | 4 +- admin/layouts/layout/details_under.php | 4 +- admin/layouts/layout/publishing.php | 4 +- admin/layouts/layout/publlshing.php | 4 +- .../site_view/custom_buttons_fullwidth.php | 4 +- admin/layouts/site_view/details_above.php | 4 +- admin/layouts/site_view/details_fullwidth.php | 4 +- admin/layouts/site_view/details_left.php | 4 +- admin/layouts/site_view/details_right.php | 4 +- admin/layouts/site_view/details_rightside.php | 4 +- admin/layouts/site_view/details_under.php | 4 +- .../site_view/javascript_css_fullwidth.php | 4 +- admin/layouts/site_view/php_fullwidth.php | 4 +- admin/layouts/site_view/publishing.php | 4 +- admin/layouts/site_view/publlshing.php | 4 +- admin/layouts/snippet/details_above.php | 4 +- admin/layouts/snippet/details_left.php | 4 +- admin/layouts/snippet/details_right.php | 4 +- admin/layouts/snippet/publishing.php | 4 +- admin/layouts/snippet/publlshing.php | 4 +- .../template/custom_script_fullwidth.php | 4 +- admin/layouts/template/details_fullwidth.php | 4 +- admin/layouts/template/details_left.php | 4 +- admin/layouts/template/details_right.php | 4 +- admin/layouts/template/details_rightside.php | 4 +- admin/layouts/template/details_under.php | 4 +- admin/layouts/template/publishing.php | 4 +- admin/layouts/template/publlshing.php | 4 +- admin/models/admin_view.php | 26 +- admin/models/admin_views.php | 4 +- admin/models/ajax.php | 31 +- admin/models/compiler.php | 4 +- admin/models/component.php | 375 +++-- admin/models/componentbuilder.php | 4 +- admin/models/components.php | 56 +- admin/models/custom_admin_view.php | 4 +- admin/models/custom_admin_views.php | 4 +- admin/models/dynamic_get.php | 4 +- admin/models/dynamic_gets.php | 4 +- admin/models/field.php | 4 +- admin/models/fields.php | 4 +- admin/models/fields/adminviewfolderlist.php | 4 +- admin/models/fields/adminviews.php | 4 +- admin/models/fields/articles.php | 4 +- admin/models/fields/customadminviews.php | 4 +- admin/models/fields/customfilelist.php | 4 +- admin/models/fields/customfolderlist.php | 4 +- admin/models/fields/customgets.php | 4 +- admin/models/fields/dbtables.php | 4 +- admin/models/fields/dynamicgets.php | 4 +- admin/models/fields/fields.php | 4 +- admin/models/fields/fieldsmulti.php | 4 +- admin/models/fields/fieldtypes.php | 4 +- admin/models/fields/maingets.php | 4 +- admin/models/fields/siteviewfolderlist.php | 4 +- admin/models/fields/siteviews.php | 4 +- admin/models/fields/snippets.php | 4 +- admin/models/fieldtype.php | 30 +- admin/models/fieldtypes.php | 4 +- admin/models/forms/admin_view.js | 574 +++---- admin/models/forms/component.js | 39 +- admin/models/forms/component.xml | 1420 +++++++++-------- admin/models/forms/custom_admin_view.js | 170 +- admin/models/forms/dynamic_get.js | 1144 ++++++------- admin/models/forms/field.js | 392 ++--- admin/models/forms/fieldtype.js | 4 +- admin/models/forms/help_document.js | 240 +-- admin/models/forms/layout.js | 24 +- admin/models/forms/site_view.js | 192 +-- admin/models/forms/snippet.js | 4 +- admin/models/forms/template.js | 24 +- admin/models/help_document.php | 4 +- admin/models/help_documents.php | 4 +- admin/models/import.php | 4 +- admin/models/layout.php | 4 +- admin/models/layouts.php | 4 +- admin/models/site_view.php | 4 +- admin/models/site_views.php | 4 +- admin/models/snippet.php | 4 +- admin/models/snippets.php | 4 +- admin/models/template.php | 4 +- admin/models/templates.php | 4 +- admin/sql/install.mysql.utf8.sql | 244 +-- admin/sql/updates/mysql/2.2.5.sql | 2 + admin/tables/admin_view.php | 4 +- admin/tables/component.php | 4 +- admin/tables/custom_admin_view.php | 4 +- admin/tables/dynamic_get.php | 4 +- admin/tables/field.php | 4 +- admin/tables/fieldtype.php | 4 +- admin/tables/help_document.php | 4 +- admin/tables/layout.php | 4 +- admin/tables/site_view.php | 4 +- admin/tables/snippet.php | 4 +- admin/tables/template.php | 4 +- admin/views/admin_view/submitbutton.js | 4 +- admin/views/admin_view/tmpl/edit.php | 338 ++-- admin/views/admin_view/view.html.php | 6 +- admin/views/admin_views/tmpl/default.php | 4 +- .../admin_views/tmpl/default_batch_body.php | 4 +- .../admin_views/tmpl/default_batch_footer.php | 4 +- admin/views/admin_views/tmpl/default_body.php | 4 +- admin/views/admin_views/tmpl/default_foot.php | 4 +- admin/views/admin_views/tmpl/default_head.php | 4 +- .../admin_views/tmpl/default_toolbar.php | 4 +- admin/views/admin_views/view.html.php | 4 +- admin/views/compiler/tmpl/default.php | 4 +- admin/views/compiler/view.html.php | 4 +- admin/views/component/submitbutton.js | 4 +- admin/views/component/tmpl/edit.php | 41 +- admin/views/component/view.html.php | 11 +- admin/views/componentbuilder/tmpl/default.php | 4 +- ...sed_issues_the_closed_issues_on_github.php | 4 +- .../componentbuilder/tmpl/default_main.php | 4 +- ..._open_issues_the_open_issues_on_github.php | 4 +- .../tmpl/default_readme_information.php | 4 +- ...t_vast_development_method_notice_board.php | 4 +- .../componentbuilder/tmpl/default_vdm.php | 4 +- admin/views/componentbuilder/view.html.php | 4 +- admin/views/components/tmpl/default.php | 4 +- .../components/tmpl/default_batch_body.php | 4 +- .../components/tmpl/default_batch_footer.php | 4 +- admin/views/components/tmpl/default_body.php | 4 +- admin/views/components/tmpl/default_foot.php | 4 +- admin/views/components/tmpl/default_head.php | 4 +- .../views/components/tmpl/default_toolbar.php | 4 +- admin/views/components/view.html.php | 4 +- admin/views/custom_admin_view/submitbutton.js | 4 +- admin/views/custom_admin_view/tmpl/edit.php | 84 +- admin/views/custom_admin_view/view.html.php | 4 +- .../views/custom_admin_views/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../custom_admin_views/tmpl/default_body.php | 4 +- .../custom_admin_views/tmpl/default_foot.php | 4 +- .../custom_admin_views/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/custom_admin_views/view.html.php | 4 +- admin/views/dynamic_get/submitbutton.js | 4 +- admin/views/dynamic_get/tmpl/edit.php | 308 ++-- admin/views/dynamic_get/view.html.php | 4 +- admin/views/dynamic_gets/tmpl/default.php | 4 +- .../dynamic_gets/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/dynamic_gets/tmpl/default_body.php | 4 +- .../views/dynamic_gets/tmpl/default_foot.php | 4 +- .../views/dynamic_gets/tmpl/default_head.php | 4 +- .../dynamic_gets/tmpl/default_toolbar.php | 4 +- admin/views/dynamic_gets/view.html.php | 4 +- admin/views/field/submitbutton.js | 4 +- admin/views/field/tmpl/edit.php | 136 +- admin/views/field/view.html.php | 4 +- admin/views/fields/tmpl/default.php | 4 +- .../views/fields/tmpl/default_batch_body.php | 4 +- .../fields/tmpl/default_batch_footer.php | 4 +- admin/views/fields/tmpl/default_body.php | 4 +- admin/views/fields/tmpl/default_foot.php | 4 +- admin/views/fields/tmpl/default_head.php | 4 +- admin/views/fields/tmpl/default_toolbar.php | 4 +- admin/views/fields/view.html.php | 4 +- admin/views/fieldtype/submitbutton.js | 4 +- admin/views/fieldtype/tmpl/edit.php | 4 +- admin/views/fieldtype/view.html.php | 6 +- admin/views/fieldtypes/tmpl/default.php | 4 +- .../fieldtypes/tmpl/default_batch_body.php | 4 +- .../fieldtypes/tmpl/default_batch_footer.php | 4 +- admin/views/fieldtypes/tmpl/default_body.php | 4 +- admin/views/fieldtypes/tmpl/default_foot.php | 4 +- admin/views/fieldtypes/tmpl/default_head.php | 4 +- .../views/fieldtypes/tmpl/default_toolbar.php | 4 +- admin/views/fieldtypes/view.html.php | 4 +- admin/views/help_document/submitbutton.js | 4 +- admin/views/help_document/tmpl/edit.php | 58 +- admin/views/help_document/view.html.php | 4 +- admin/views/help_documents/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../help_documents/tmpl/default_body.php | 4 +- .../help_documents/tmpl/default_foot.php | 4 +- .../help_documents/tmpl/default_head.php | 4 +- .../help_documents/tmpl/default_toolbar.php | 4 +- admin/views/help_documents/view.html.php | 4 +- admin/views/import/tmpl/default.php | 4 +- admin/views/import/view.html.php | 4 +- admin/views/layout/submitbutton.js | 4 +- admin/views/layout/tmpl/edit.php | 14 +- admin/views/layout/view.html.php | 4 +- admin/views/layouts/tmpl/default.php | 4 +- .../views/layouts/tmpl/default_batch_body.php | 4 +- .../layouts/tmpl/default_batch_footer.php | 4 +- admin/views/layouts/tmpl/default_body.php | 4 +- admin/views/layouts/tmpl/default_foot.php | 4 +- admin/views/layouts/tmpl/default_head.php | 4 +- admin/views/layouts/tmpl/default_toolbar.php | 4 +- admin/views/layouts/view.html.php | 4 +- admin/views/site_view/submitbutton.js | 4 +- admin/views/site_view/tmpl/edit.php | 94 +- admin/views/site_view/view.html.php | 4 +- admin/views/site_views/tmpl/default.php | 4 +- .../site_views/tmpl/default_batch_body.php | 4 +- .../site_views/tmpl/default_batch_footer.php | 4 +- admin/views/site_views/tmpl/default_body.php | 4 +- admin/views/site_views/tmpl/default_foot.php | 4 +- admin/views/site_views/tmpl/default_head.php | 4 +- .../views/site_views/tmpl/default_toolbar.php | 4 +- admin/views/site_views/view.html.php | 4 +- admin/views/snippet/submitbutton.js | 4 +- admin/views/snippet/tmpl/edit.php | 4 +- admin/views/snippet/view.html.php | 4 +- admin/views/snippets/tmpl/default.php | 4 +- .../snippets/tmpl/default_batch_body.php | 4 +- .../snippets/tmpl/default_batch_footer.php | 4 +- admin/views/snippets/tmpl/default_body.php | 4 +- admin/views/snippets/tmpl/default_foot.php | 4 +- admin/views/snippets/tmpl/default_head.php | 4 +- admin/views/snippets/tmpl/default_toolbar.php | 4 +- admin/views/snippets/view.html.php | 4 +- admin/views/template/submitbutton.js | 4 +- admin/views/template/tmpl/edit.php | 14 +- admin/views/template/view.html.php | 4 +- admin/views/templates/tmpl/default.php | 4 +- .../templates/tmpl/default_batch_body.php | 4 +- .../templates/tmpl/default_batch_footer.php | 4 +- admin/views/templates/tmpl/default_body.php | 4 +- admin/views/templates/tmpl/default_foot.php | 4 +- admin/views/templates/tmpl/default_head.php | 4 +- .../views/templates/tmpl/default_toolbar.php | 4 +- admin/views/templates/view.html.php | 4 +- componentbuilder.xml | 6 +- componentbuilder_update_server.xml | 17 + script.php | 14 +- site/assets/css/site.css | 4 +- site/componentbuilder.php | 4 +- site/controller.php | 4 +- site/controllers/help.php | 4 +- site/helpers/componentbuilder.php | 4 +- site/helpers/headercheck.php | 4 +- site/helpers/route.php | 4 +- site/router.php | 4 +- 388 files changed, 5052 insertions(+), 3714 deletions(-) create mode 100644 admin/helpers/extrusion/a_mapping.php create mode 100644 admin/helpers/extrusion/b_builder.php create mode 100644 admin/helpers/extrusion/c_extrusion.php create mode 100644 admin/helpers/extrusion/index.html create mode 100644 admin/layouts/component/custom_admin_views_fullwidth.php create mode 100644 admin/layouts/component/dynamic_build_beta_fullwidth.php create mode 100644 admin/sql/updates/mysql/2.2.5.sql diff --git a/README.md b/README.md index cd4c6a1f3..99766b02e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Component Builder (2.2.5) +# Component Builder (2.2.6) This is a [Joomla 3.x](http://www.joomla.org/) component. @@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.5) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.6) with **ALL** its features and **ALL** concepts totally open-source and free! Once installed upgrades are quick and easy via the default Joomla upgrade area. @@ -104,13 +104,13 @@ 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*: 22nd December, 2016 -+ *Version*: 2.2.5 ++ *Last Build*: 30th December, 2016 ++ *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*: **86690** -+ *File count*: **542** -+ *Folder count*: **99** ++ *Line count*: **87155** ++ *File count*: **545** ++ *Folder count*: **100** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/README.txt b/admin/README.txt index cd4c6a1f3..99766b02e 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Component Builder (2.2.5) +# Component Builder (2.2.6) This is a [Joomla 3.x](http://www.joomla.org/) component. @@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.5) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.6) with **ALL** its features and **ALL** concepts totally open-source and free! Once installed upgrades are quick and easy via the default Joomla upgrade area. @@ -104,13 +104,13 @@ 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*: 22nd December, 2016 -+ *Version*: 2.2.5 ++ *Last Build*: 30th December, 2016 ++ *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*: **86690** -+ *File count*: **542** -+ *Folder count*: **99** ++ *Line count*: **87155** ++ *File count*: **545** ++ *Folder count*: **100** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 9cac24401..f445ecc10 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 d6863d7b0..ea7ac0fe7 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 1051b175e..75b3fdf2a 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7f75ab83f..ffdadea37 100644 --- a/admin/assets/css/component.css +++ b/admin/assets/css/component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 078f53030..6bff6c6a2 100644 --- a/admin/assets/css/components.css +++ b/admin/assets/css/components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 ac5c7109f..ffe5b0311 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 150251b84..079962c51 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 1ccc68dc3..519daace6 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 ae6742a93..cd75841de 100644 --- a/admin/assets/css/dynamic_get.css +++ b/admin/assets/css/dynamic_get.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 43dffd107..ccaae07be 100644 --- a/admin/assets/css/dynamic_gets.css +++ b/admin/assets/css/dynamic_gets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 39bcd4d3a..919aff05c 100644 --- a/admin/assets/css/field.css +++ b/admin/assets/css/field.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 ebe786541..cd099387a 100644 --- a/admin/assets/css/fields.css +++ b/admin/assets/css/fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 203a04c3d..e8c571470 100644 --- a/admin/assets/css/fieldtype.css +++ b/admin/assets/css/fieldtype.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 eef6da1e0..628c3f071 100644 --- a/admin/assets/css/fieldtypes.css +++ b/admin/assets/css/fieldtypes.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 88db61b71..c9bdf3a15 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 9f94a5f39..1b10e79a4 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 f6727919b..22a764bbf 100644 --- a/admin/assets/css/layout.css +++ b/admin/assets/css/layout.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 0b0e6ac6f..5fcbe8197 100644 --- a/admin/assets/css/layouts.css +++ b/admin/assets/css/layouts.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 83fc46368..8d3f47633 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 4d1eb99d4..de6818df2 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 55af7e81d..fef4a98e1 100644 --- a/admin/assets/css/snippet.css +++ b/admin/assets/css/snippet.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 2744e5d90..2a2801f2b 100644 --- a/admin/assets/css/snippets.css +++ b/admin/assets/css/snippets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 a54deddbf..196e83e62 100644 --- a/admin/assets/css/template.css +++ b/admin/assets/css/template.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 6a4956a4e..d205adc5f 100644 --- a/admin/assets/css/templates.css +++ b/admin/assets/css/templates.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.css diff --git a/admin/compiler/joomla_3/JModelItem_custom_admin.php b/admin/compiler/joomla_3/JModelItem_custom_admin.php index df4c942f9..e80b0cd91 100644 --- a/admin/compiler/joomla_3/JModelItem_custom_admin.php +++ b/admin/compiler/joomla_3/JModelItem_custom_admin.php @@ -99,7 +99,7 @@ class ###Component###Model###SView### extends JModelItem { $app = JFactory::getApplication(); $app->enqueueMessage(JText::_('Not authorised!'), 'error'); - // redirect away if not a correct (TODO for now we go to default view) + // redirect away if not a correct to cPanel/default view $app->redirect('index.php?option=com_###component###'); return false; } diff --git a/admin/compiler/joomla_3/JModelItem_site.php b/admin/compiler/joomla_3/JModelItem_site.php index 2207c9955..1c9869735 100644 --- a/admin/compiler/joomla_3/JModelItem_site.php +++ b/admin/compiler/joomla_3/JModelItem_site.php @@ -95,16 +95,7 @@ class ###Component###Model###SView### extends JModelItem */ public function getItem($pk = null) { - $this->user = JFactory::getUser(); - // check if this user has permission to access item - if (!$this->user->authorise('site.###sview###.access', 'com_###component###')) - { - $app = JFactory::getApplication(); - $app->enqueueMessage(JText::_('Not authorised!'), 'error'); - // redirect away if not a correct (TODO for now we go to default view) - $app->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###')); - return false; - } + $this->user = JFactory::getUser();###USER_PERMISSION_CHECK_ACCESS### $this->userId = $this->user->get('id'); $this->guest = $this->user->get('guest'); $this->groups = $this->user->get('groups'); diff --git a/admin/compiler/joomla_3/JModelList_site.php b/admin/compiler/joomla_3/JModelList_site.php index 50878cf6e..389be6d02 100644 --- a/admin/compiler/joomla_3/JModelList_site.php +++ b/admin/compiler/joomla_3/JModelList_site.php @@ -77,16 +77,7 @@ class ###Component###Model###SViews### extends JModelList */ public function getItems() { - $user = JFactory::getUser(); - // check if this user has permission to access items - if (!$user->authorise('site.###sview###.access', 'com_###component###')) - { - $app = JFactory::getApplication(); - $app->enqueueMessage(JText::_('Not authorised!'), 'error'); - // redirect away if not a correct (TODO for now we go to default view) - $app->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###')); - return false; - }###LICENSE_LOCKED_CHECK### ###SITE_BEFORE_GET_ITEMS### + $user = JFactory::getUser();###USER_PERMISSION_CHECK_ACCESS### ###LICENSE_LOCKED_CHECK### ###SITE_BEFORE_GET_ITEMS### // load parent items $items = parent::getItems(); diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 8ade21f07..8487f37a8 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 0de8abef5..93a0ca073 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 0ff673094..7ea75ee0f 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 c926afd2f..48c4d4b0a 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 c9331424d..b12455a64 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index c1e517a11..16a1b707e 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage compiler.php diff --git a/admin/controllers/component.php b/admin/controllers/component.php index 42a7ce1b8..24f29efec 100644 --- a/admin/controllers/component.php +++ b/admin/controllers/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index e8b6c4052..27be381d3 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/components.php b/admin/controllers/components.php index 7f8b7a6f2..368df75b8 100644 --- a/admin/controllers/components.php +++ b/admin/controllers/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 5a509dffd..3fa0c5b76 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 1bc282452..32217d333 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 d90d775d3..7384aff70 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 074eac144..ad0b9ba1c 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/controllers/field.php b/admin/controllers/field.php index 98701ee42..41dfefb8f 100644 --- a/admin/controllers/field.php +++ b/admin/controllers/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index 10ec18f69..ef0a13614 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php index ed60d9502..78a89d76a 100644 --- a/admin/controllers/fieldtype.php +++ b/admin/controllers/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php index bc36b5ce8..19fca2a22 100644 --- a/admin/controllers/fieldtypes.php +++ b/admin/controllers/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 65ab15911..a412d1cf1 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 8647e5678..f64ab9890 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 98674a74c..26978d55f 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 78b172115..852583ec2 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php index c59d8c3fb..29ae3186b 100644 --- a/admin/controllers/layout.php +++ b/admin/controllers/layout.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.php diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php index d5ff2e5fd..0e66b3a1f 100644 --- a/admin/controllers/layouts.php +++ b/admin/controllers/layouts.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 3c7a5d29a..5ff3e1b2c 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 c284635de..1c823a0c3 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php index 32367435e..0980b61c1 100644 --- a/admin/controllers/snippet.php +++ b/admin/controllers/snippet.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php index 672e72f2b..469f22773 100644 --- a/admin/controllers/snippets.php +++ b/admin/controllers/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/controllers/template.php b/admin/controllers/template.php index e17e73b94..a52d1049d 100644 --- a/admin/controllers/template.php +++ b/admin/controllers/template.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.php diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php index df32ae08d..ca5a3fcee 100644 --- a/admin/controllers/templates.php +++ b/admin/controllers/templates.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.php diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index bf5a9a083..4f72a71f8 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -1699,7 +1699,7 @@ class Interpretation extends Fields * @param $string * @param string $type * @return mixed - */ + */ public function removeAsDot($string, $type = '') { if (strpos($string,'.') !== false) @@ -1712,6 +1712,56 @@ class Interpretation extends Fields } return $field; } + + /** + * @param type $view + * @param type $type + */ + public function setUserPermissionCheckAccess($view, $type) + { + if (isset($view['access']) && $view['access'] == 1) + { + switch($type) + { + case 1: + $userString = '$this->user'; + break; + default: + $userString = '$user'; + break; + } + // check that the default and the redirect page is not the same + if ($this->fileContentStatic['###SITE_DEFAULT_VIEW###'] != $view['settings']->code) + { + $redirectMessage = "\t\t\t//".$this->setLine(__LINE__)." redirect away to the default view if no access allowed."; + $redirectString = "JRoute::_('index.php?option=com_".$this->fileContentStatic['###component###']."&view=".$this->fileContentStatic['###SITE_DEFAULT_VIEW###']."')"; + } + else + { + $redirectMessage = "\t\t\t//".$this->setLine(__LINE__)." redirect away to the home page if no access allowed."; + $redirectString = 'JURI::root()'; + } + $accessCheck[] = "\n\t\t//".$this->setLine(__LINE__)." check if this user has permission to access item"; + $accessCheck[] = "\t\tif (!".$userString."->authorise('site.".$view['settings']->code.".access', 'com_".$this->fileContentStatic['###component###']."'))"; + $accessCheck[] = "\t\t{"; + $accessCheck[] = "\t\t\t\$app = JFactory::getApplication();"; + // set lang + $langKeyWord = $this->langPrefix.'_'.ComponentbuilderHelper::safeString('Not authorised to view '.$view['settings']->code.'!','U'); + if (!isset($this->langContent['site'][$langKeyWord])) + { + $this->langContent['site'][$langKeyWord] = 'Not authorised to view '.$view['settings']->code.'!'; + } + $accessCheck[] = "\t\t\t\$app->enqueueMessage(JText::_('".$langKeyWord."'), 'error');"; + $accessCheck[] = $redirectMessage; + $accessCheck[] = "\t\t\t\$app->redirect(".$redirectString.");"; + $accessCheck[] = "\t\t\treturn false;"; + $accessCheck[] = "\t\t}"; + + // return the access check + return implode("\n",$accessCheck); + } + return ''; + } /** * @param $get @@ -1719,7 +1769,7 @@ class Interpretation extends Fields * @param string $tab * @param string $type * @return string - */ + */ public function setCustomViewGetItem(&$get, &$code, $tab = '', $type = 'main') { if (ComponentbuilderHelper::checkObject($get)) @@ -1758,7 +1808,16 @@ class Interpretation extends Fields $getItem .= "\n\t".$tab."\t\t\$app->enqueueMessage(JText::_('".$langKeyWord."'), 'warning');"; if ('site' == $this->target) { - $getItem .= "\n\t".$tab."\t\t\$app->redirect('index.php?option=com_".$this->fileContentStatic['###component###']."&view=".$this->fileContentStatic['###SITE_DEFAULT_VIEW###']."');"; + // check that the default and the redirect page is not the same + if ($this->fileContentStatic['###SITE_DEFAULT_VIEW###'] != $code) + { + $redirectString = "JRoute::_('index.php?option=com_".$this->fileContentStatic['###component###']."&view=".$this->fileContentStatic['###SITE_DEFAULT_VIEW###']."')"; + } + else + { + $redirectString = 'JURI::root()'; + } + $getItem .= "\n\t".$tab."\t\t\$app->redirect(".$redirectString.");"; } else { @@ -4666,7 +4725,7 @@ class Interpretation extends Fields // check if default field was over written if (!isset($this->fieldsNames[$view]['id'])) { - $db .= "\n\t`id` int(11) NOT NULL AUTO_INCREMENT,"; + $db .= "\n\t`id` INT(11) NOT NULL AUTO_INCREMENT,"; } $db .= "\n\t`asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0',"; ksort($fields); @@ -4719,17 +4778,17 @@ class Interpretation extends Fields // check if default field was over written if (!isset($this->fieldsNames[$view]['published'])) { - $db .= "\n\t`published` tinyint(1) NOT NULL DEFAULT '1',"; + $db .= "\n\t`published` TINYINT(1) NOT NULL DEFAULT '1',"; } // check if default field was over written if (!isset($this->fieldsNames[$view]['created_by'])) { - $db .= "\n\t`created_by` int(11) NOT NULL DEFAULT '0',"; + $db .= "\n\t`created_by` INT(11) NOT NULL DEFAULT '0',"; } // check if default field was over written if (!isset($this->fieldsNames[$view]['modified_by'])) { - $db .= "\n\t`modified_by` int(11) NOT NULL DEFAULT '0',"; + $db .= "\n\t`modified_by` INT(11) NOT NULL DEFAULT '0',"; } // check if default field was over written if (!isset($this->fieldsNames[$view]['created'])) @@ -4744,7 +4803,7 @@ class Interpretation extends Fields // check if default field was over written if (!isset($this->fieldsNames[$view]['checked_out'])) { - $db .= "\n\t`checked_out` int(11) NOT NULL,"; + $db .= "\n\t`checked_out` INT(11) NOT NULL,"; } // check if default field was over written if (!isset($this->fieldsNames[$view]['checked_out_time'])) @@ -4754,22 +4813,22 @@ class Interpretation extends Fields // check if default field was over written if (!isset($this->fieldsNames[$view]['version'])) { - $db .= "\n\t`version` int(11) NOT NULL DEFAULT '1',"; + $db .= "\n\t`version` INT(11) NOT NULL DEFAULT '1',"; } // check if default field was over written if (!isset($this->fieldsNames[$view]['hits'])) { - $db .= "\n\t`hits` int(11) NOT NULL DEFAULT '0',"; + $db .= "\n\t`hits` INT(11) NOT NULL DEFAULT '0',"; } // check if view has access if (isset($this->accessBuilder[$view]) && ComponentbuilderHelper::checkString($this->accessBuilder[$view])) { - $db .= "\n\t`access` int(11) DEFAULT NULL,"; + $db .= "\n\t`access` INT(11) DEFAULT NULL,"; } // check if default field was over written if (!isset($this->fieldsNames[$view]['ordering'])) { - $db .= "\n\t`ordering` int(11) NOT NULL DEFAULT '0',"; + $db .= "\n\t`ordering` INT(11) NOT NULL DEFAULT '0',"; } // check if metadata is added to this view if (isset($this->metadataBuilder[$view]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view])) @@ -13158,9 +13217,12 @@ function vdm_dkim() { $siteTitle = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($siteName.' Access Site','U'); $siteDesc = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($siteName.' Access Site','U').'_DESC'; $sortKey = ComponentbuilderHelper::safeString($siteName.' Access Site'); - $this->langContent['admin'][$siteTitle] = $siteName.' (Site) Access'; - $this->langContent['admin'][$siteDesc] = ' Allows the users in this group to access site '.ComponentbuilderHelper::safeString($siteName,'w').'.'; - $this->componentGlobal[$sortKey] = "\t\t".''; + if (isset($site_view['access']) && $site_view['access'] == 1) + { + $this->langContent['admin'][$siteTitle] = $siteName.' (Site) Access'; + $this->langContent['admin'][$siteDesc] = ' Allows the users in this group to access site '.ComponentbuilderHelper::safeString($siteName,'w').'.'; + $this->componentGlobal[$sortKey] = "\t\t".''; + } // add the custom permissions to use the buttons of this view /* if (ComponentbuilderHelper::checkArray($site_view['settings']->custom_buttons)) { diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index 85fd131de..ac5d398e2 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -879,6 +879,8 @@ class Infusion extends Interpretation if ($view['settings']->main_get->gettype == 1) { + // set user permission access check ###USER_PERMISSION_CHECK_ACCESS### <<>> + $this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] = $this->setUserPermissionCheckAccess($view, 1); // check if there is any custom script if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code])) { @@ -913,7 +915,9 @@ class Infusion extends Interpretation } } elseif ($view['settings']->main_get->gettype == 2) - { + { + // set user permission access check ###USER_PERMISSION_CHECK_ACCESS### <<>> + $this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] = $this->setUserPermissionCheckAccess($view, 2); // ###SITE_GET_LIST_QUERY### <<>> $this->fileContentDynamic[$view['settings']->code]['###SITE_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code); diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index e3e47e2a9..b18c30337 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -33,23 +33,37 @@ abstract class ComponentbuilderHelper { /* - * Compiler autoloader + * Autoloader */ - public static function autoLoader() + public static function autoLoader($type = 'compiler') { // load the compiler classes - foreach (glob(JPATH_ADMINISTRATOR."/components/com_componentbuilder/helpers/compiler/*.php") as $compilerFile) + foreach (glob(JPATH_ADMINISTRATOR."/components/com_componentbuilder/helpers/".$type."/*.php") as $autoFile) { - require_once $compilerFile; + require_once $autoFile; } - // import the Joomla librarys - jimport('joomla.filesystem.file'); - jimport('joomla.filesystem.folder'); - jimport('joomla.filesystem.archive'); - jimport('joomla.application.component.modellist'); + // load only if compiler + if ('compiler' == $type) + { + // import the Joomla librarys + jimport('joomla.filesystem.file'); + jimport('joomla.filesystem.folder'); + jimport('joomla.filesystem.archive'); + jimport('joomla.application.component.modellist'); + // include class to minify js + require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/js.php'; + } + // load this for all jimport('joomla.application'); - // include class to minify js - require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/js.php'; + } + + /** + * The dynamic builder of views, tables and fields + **/ + public static function dynamicBuilder(&$data, $type) + { + self::autoLoader('extrusion'); + $extruder = new Extrusion($data); } /** @@ -71,6 +85,48 @@ abstract class ComponentbuilderHelper // return the path return self::${$type.$name}; } + + public static function getFieldOptions($value, $type, $settings = array()) + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + $query->select($db->quoteName(array('properties', 'short_description', 'description'))); + $query->from($db->quoteName('#__componentbuilder_fieldtype')); + $query->where($db->quoteName('published') . ' = 1'); + $query->where($db->quoteName($type) . ' = '. $value); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $result = $db->loadObject(); + $properties = json_decode($result->properties,true); + $pointer = 0; + $field = array('values' => " '
    ', 'short_description' => $result->short_description, 'description' => $result->description); + foreach ($properties['name'] as $line) + { + $field['values_description'] .= '
  • '.$properties['name'][$pointer].' '.$properties['description'][$pointer].'
    • '; + if(isset($settings[$properties['name'][$pointer]])) + { + $field['values'] .= "\n\t".$properties['name'][$pointer].'="'.$settings[$properties['name'][$pointer]].'" '; + } + else + { + $field['values'] .= "\n\t".$properties['name'][$pointer].'="'.$properties['example'][$pointer].'" '; + } + $pointer++; + } + $field['values'] .= "\n/>"; + $field['values_description'] .= '
'; + // return found field options + return $field; + } + return false; + } /** * get the localkey diff --git a/admin/helpers/extrusion/a_mapping.php b/admin/helpers/extrusion/a_mapping.php new file mode 100644 index 000000000..16e029394 --- /dev/null +++ b/admin/helpers/extrusion/a_mapping.php @@ -0,0 +1,389 @@ + + @my wife Roline van der 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 + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +/** + * Mapping class + */ +class Mapping +{ + /** + * Some default fields + */ + protected $buildcompsql; + public $id; + public $name_code; + public $addadmin_views; + public $addSql = array(); + public $source = array(); + public $sql = array(); + + /** + * The map of the needed fields and views + */ + public $map; + + /** + * The app to load messages mostly + */ + public $app; + + /** + * The needed set of keys needed to set + */ + protected $setting = array('id' => 'default', 'buildcompsql' => 'base64', 'addadmin_views' => 'json', 'name_code' => 'safeString'); + + /** + * The needed set of keys needed to set + */ + protected $notRequiered = array('id', 'asset_id', 'published', + 'created_by', 'modified_by', 'created', 'modified', 'checked_out','checked_out_time', + 'version', 'hits', 'access', 'ordering', + 'metakey', 'metadesc', 'metadata', 'params'); + + /** + * The datatypes and it linked field types (basic) + * (TODO) We may need to set this dynamicly + */ + protected $dataTypes = array( 'CHAR' => 'Text', 'VARCHAR' => 'Text', + 'TEXT' => 'Textarea', 'MEDIUMTEXT' => 'Textarea', + 'LONGTEXT' => 'Textarea', 'DATE' => 'Text', 'TIME' => 'Text', + 'DATETIME' => 'Calendar', 'INT' => 'Text', 'TINYINT' => 'Text', + 'BIGINT' => 'Text', 'FLOAT' => 'Text', 'DECIMAL' => 'Text', + 'DOUBLE' => 'Text'); + + /** + * The datasize identifiers + */ + protected $dataSize = array( 'CHAR', 'VARCHAR', 'INT', 'TINYINT', + 'BIGINT', 'FLOAT', 'DECIMAL', 'DOUBLE'); + + /** + * The default identifiers + */ + protected $defaults = array(0, 1, "CURRENT_TIMESTAMP", "DATETIME"); // Other + + /** + * The sizes identifiers + */ + protected $sizes = array("1", "7", "10", "11", "50", "64", "100", "255", "1024", "2048"); // Other + + + /** + * Constructor + */ + public function __construct($data = false) + { + // set the app to insure messages can be set + $this->app = JFactory::getApplication(); + + if ($data) + { + if (isset($data['buildcomp']) && 1 == $data['buildcomp'] && isset($data['buildcompsql'])) + { + foreach ($data as $key => $value) + { + if (isset($this->setting[$key])) + { + switch($this->setting[$key]) + { + case 'base64': + // set needed value + $this->$key = base64_decode($value); + break; + case 'json': + // set needed value + $this->$key = json_decode($value, true); + break; + case 'safeString': + // set needed value + $this->$key = ComponentbuilderHelper::safeString($value); + break; + default : + $this->$key = $value; + break; + } + } + } + // set the map of the views needed + if ($this->setMap()) + { + return true; + } + $this->app->enqueueMessage( + JText::_('No "CREATE TABLE.." were found, please check your sql.'), + 'Error' + ); + return false; + } + return false; // not set so just return without any error + } + $this->app->enqueueMessage( + JText::_('Could not find the data needed to continue.'), + 'Error' + ); + return false; + } + + /** + * The mapping function + * To Map the views and fields that are needed + */ + protected function setMap() + { + // start parsing the sql dump data + $queries = JDatabaseDriver::splitSql($this->buildcompsql); + if (ComponentbuilderHelper::checkArray($queries)) + { + foreach ($queries as $query) + { + // only use create table queries + if (strpos($query, 'CREATE TABLE IF NOT EXISTS `') !== false) + { + if ($tableName = $this->getTableName($query)) + { + // now get the fields/columns of this view/table + if ($fields = $this->getFields($query)) + { + // make sure it is all lower case from here on + $tableName = strtolower($tableName); + $this->map[$tableName] = $fields; + } + } + else + { + continue; + } + } + // get the insert data if set + if (strpos($query, 'INSERT INTO `') !== false) + { + if ($tableName = $this->getTableName($query)) + { + $this->addSql[$tableName] = 1; + $this->source[$tableName] = 2; + $this->sql[$tableName] = $query; + } + } + } + // check if the mapping was done + if (ComponentbuilderHelper::checkArray($this->map)) + { + return true; + } + } + return false; + } + + /** + * Get the table name + */ + protected function getTableName(&$query) + { + $tableName = ComponentbuilderHelper::getBetween($query, '`#__', "`"); + // if it still was not found + if (!ComponentbuilderHelper::checkString($tableName)) + { + // skip this query + return false; + } + // clean the table name (so only view name remain) + if (strpos($tableName, $this->name_code) !== false) + { + $tableName = trim(str_replace($this->name_code, '', $tableName), '_'); + } + // if found + if (ComponentbuilderHelper::checkString($tableName)) + { + return $tableName; + } + // skip this query + return false; + } + + /** + * Get the field details + */ + protected function getFields(&$query) + { + $rows = array_map('trim', explode("\n", $query)); + $fields = array(); + foreach ($rows as $row) + { + // make sure we have a lower case string + $row = strtoupper($row); + $field = array(); + $name = ''; + if (0 === strpos($row, '`')) + { + // get field name + $name = ComponentbuilderHelper::getBetween($row, '`', '`'); + } + if (0 === strpos($row, "'")) + { + // get field name + $name = ComponentbuilderHelper::getBetween($row, "'", "'"); + } + // check if the name was found + if (ComponentbuilderHelper::checkString($name)) + { + // insure we have the name in lower case from here on + $name = strtolower($name); + // only continue if field is requered + if (in_array($name, $this->notRequiered)) + { + continue; + } + // check if the field type is found + if ($fieldType = $this->getType($row, $field, $name)) + { + $field['row'] = $row; + $field['name'] = $name; + $field['label'] = ComponentbuilderHelper::safeString($name, 'W'); + $field['fieldType'] = $fieldType; + $field['size'] = $this->getSize($row, $field); + $field['sizeOther'] = ''; + if (!in_array($field['size'], $this->sizes)) + { + if (ComponentbuilderHelper::checkString($field['size'])) + { + $field['sizeOther'] = $field['size']; + $field['size'] = 'Other'; + } + } + $field['default'] = $this->getDefault($row); + $field['defaultOther'] = ''; + if (!in_array($field['default'], $this->defaults)) + { + if (ComponentbuilderHelper::checkString($field['default'])) + { + $field['defaultOther'] = $field['default']; + $field['default'] = 'Other'; + } + } + $field['null'] = $this->getNullValue($row, $field); + // check if field is a key + $field['key'] = $this->getKeyStatus($rows, $name); + // load to fields + $fields[] = $field; + } + } + } + if (ComponentbuilderHelper::checkArray($fields)) + { + return $fields; + } + return false; + } + + /** + * Get the field types + */ + protected function getType($row, &$field, &$name) + { + // first remove field name + $row = str_replace($name, '', $row); + // get the data type first + foreach ($this->dataTypes as $type => $fieldType) + { + if (strpos($row, $type) !== false) + { + $field['dataType'] = $type; + return $fieldType; + } + } + return false; + } + + /** + * Get the field size + */ + protected function getSize(&$row, $field) + { + if (in_array($field['dataType'], $this->dataSize)) + { + return ComponentbuilderHelper::getBetween($row, $field['dataType'].'(', ')'); + } + return ''; + } + + /** + * Get the field default + */ + protected function getDefault(&$row) + { + // get default value + if (strpos($row, 'DEFAULT "') !== false) // to sure it this is correct... + { + return ComponentbuilderHelper::getBetween($row, 'DEFAULT "', '"'); + } + // get default value + if (strpos($row, "DEFAULT '") !== false) + { + return ComponentbuilderHelper::getBetween($row, "DEFAULT '", "'"); + } + return ''; + } + + /** + * Get the field Null Value + */ + protected function getNullValue(&$row, &$field) + { + // get the result of null + if (strpos($row, 'NOT NULL') !== false) + { + return 'NOT NULL'; + } + if (strpos($row, 'DEFAULT NULL') !== false) + { + $field['default'] = 'NULL'; + return ''; + } + return 'NULL'; + } + + /** + * Get the field key status + */ + protected function getKeyStatus(&$rows, &$name) + { + // get the data type first + foreach ($rows as $row) + { + if (strpos($row, 'UNIQUE KEY ') !== false && stripos($row, $name) !== false) + { + return 1; + } + if ((strpos($row, 'PRIMARY KEY ') !== false && stripos($row, $name) !== false) || (strpos($row, 'KEY ') !== false && stripos($row, $name) !== false)) + { + return 2; + } + } + return 0; + } +} diff --git a/admin/helpers/extrusion/b_builder.php b/admin/helpers/extrusion/b_builder.php new file mode 100644 index 000000000..bee200643 --- /dev/null +++ b/admin/helpers/extrusion/b_builder.php @@ -0,0 +1,294 @@ + + @my wife Roline van der 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 + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +/** + * Builder class + */ +class Builder extends Mapping +{ + /** + * Some default fields + */ + public $user; + public $today; + public $db; + public $views = array(); + protected $fields = array(); + protected $title = array(); + protected $description = array(); + protected $alias = array(); + protected $list = array(); + + /** + * Field that should not be used in name, alias, disc, and list view + * (TODO) We may need to set this dynamicly + */ + protected $avoidList = array('not_required'); + + /*** + * Constructor + */ + public function __construct(&$data) + { + // first we run the perent constructor + if (parent::__construct($data)) + { + // always reset the building values if found + $data['buildcomp'] = 0; + $data['buildcompsql'] = ''; + // set some globals + $this->db = JFactory::getDbo(); + $this->user = JFactory::getUser(); + $this->today = JFactory::getDate()->toSql(); + + // no start the building of the views and fields + if ($this->setBuild()) + { + return true; + } + } + return false; + } + + /** + * The building function + * To build the views and fields that are needed + */ + protected function setBuild() + { + foreach ($this->map as $view => $fields) + { + // set this field with all its needed data + foreach ($fields as $field) + { + $this->setField($view, $field); + } + // set this view with all its needed data + $this->setView($view); + } + return true; + } + + /** + * The building function for views + */ + protected function setView(&$name) + { + // set the view object + $object = new stdClass(); + $object->system_name = ComponentbuilderHelper::safeString($name, 'W') . ' (dynamic build)'; + $object->name_single = $name; + $object->name_list = $name. 's'; + $object->short_description = $name. ' view (dynamic build)'; + $object->type = 1; + $object->description = $name. ' view (dynamic build)'; + $object->add_fadein = 1; + $object->add_sql = (isset($this->addSql[$name])) ? $this->addSql[$name]: 0; + $object->source = (isset($this->source[$name])) ? $this->source[$name]: 0; + $object->sql = (isset($this->sql[$name])) ? base64_encode($this->sql[$name]): ''; + $object->addpermissions = '{"action":["view.edit","view.edit.own","view.edit.state","view.create","view.delete","view.access"],"implementation":["3","3","3","3","3","3"]}'; + $object->addfields = $this->addFields($name); + $object->created = $this->today; + $object->created_by = $this->user->id; + $object->published = 1; + // add to data base + if ($this->db->insertObject('#__componentbuilder_admin_view', $object)) + { + // make sure the access of asset is set + $id = $this->db->insertid(); + ComponentbuilderHelper::setAsset($id, 'admin_view'); + // load the views + $this->views[] = $id; + return true; + } + return false; + } + + /** + * Add the fields to the view + */ + protected function addFields(&$view) + { + if (isset($this->fields[$view])) + { + // set some defaults + $addField = array ( + 'field' => array(), + 'list' => array(), + 'order_list' => array(), + 'title' => array(), + 'alias' => array(), + 'sort' => array(), + 'search' => array(), + 'filter' => array(), + 'link' => array(), + 'tab' => array(), + 'alignment' => array(), + 'order_edit' => array(), + 'permission' => array() + ); + $fixLink = (isset($this->title[$view])) ? 0 : 1; + // build the field data... hmmm + foreach ($this->fields[$view] as $nr => $id) + { + $alignment = 1; + if ($nr % 2 == 0) + { + $alignment = 2; + } + // some defaults + $isTitle = (isset($this->title[$view]) && $this->title[$view] == $id) ? 1 : 0; + $isAlias = (isset($this->alias[$view]) && $this->alias[$view] == $id) ? 1 : 0; + $isList = ($key = array_search($id, $this->list[$view])) ? 1 : 0; + $isLink = ($isTitle) ? 1 : (($isList && $fixLink) ? 1 : 0); + if ($isLink) + { + $fixLink = 0; + } + // load the field values + $addField['field'][] = $id; + $addField['list'][] = $isList; + $addField['order_list'][] = ($key) ? $key : 0; + $addField['title'][] = $isTitle; + $addField['alias'][] = $isAlias; + $addField['sort'][] = $isList; + $addField['search'][] = $isList; + $addField['filter'][] = $isList; + $addField['link'][] = $isLink; + $addField['tab'][] = 1; + $addField['alignment'][] = ($isTitle || $isAlias) ? 4 : $alignment; + $addField['order_edit'][] = $nr; + $addField['permission'][] = 0; + } + return json_encode($addField); + } + return ''; + } + + /** + * The building function for fields + */ + protected function setField(&$view, &$field) + { + if ($fieldType = $this->getFieldType($field['fieldType'])) + { + // set the field object + $object = new stdClass(); + $object->name = $field['label'] . ' (dynamic build)'; + $object->fieldtype = $fieldType; + $object->datatype = $field['dataType']; + $object->indexes = $field['key']; + $object->null_switch = $field['null']; + $object->datalenght = $field['size']; + $object->datalenght_other = $field['sizeOther']; + $object->datadefault = $field['default']; + $object->datadefault_other = $field['defaultOther']; + $object->created = $this->today; + $object->created_by = $this->user->id; + $object->published = 1; + $object->store = 0; + $object->xml = $this->setFieldXML($field, $fieldType); + // add to data base + if ($this->db->insertObject('#__componentbuilder_field', $object)) + { + // make sure the access of asset is set + $id = $this->db->insertid(); + ComponentbuilderHelper::setAsset($id, 'field'); + // check if any field for this field was already set, if not set array + if (!isset($this->fields[$view])) + { + $this->fields[$view] = array(); + } + // load the field + $this->fields[$view][] = $id; + + if (!isset($this->list[$view])) + { + $this->list[$view] = array(); + } + // insure that some fields are avoided + if (!in_array($field['name'], $this->avoidList)) + { + // set the name/title field if found + if (!isset($this->title[$view]) && (stripos($field['name'], 'name') !== false || stripos($field['name'], 'title') !== false)) + { + $this->title[$view] = $id; + $this->list[$view][] = $id; + } + // set the alias field if found + elseif (!isset($this->alias[$id]) && stripos($field['name'], 'alias') !== false) + { + $this->alias[$view] = $id; + } + // set the alias field if found + elseif (!isset($this->description[$id]) && stripos($field['name'], 'desc') !== false) + { + $this->description[$view] = $id; + $this->list[$view][] = $id; + } + elseif ('Text' == $field['fieldType'] && count($this->list[$view]) < 5) + { + $this->list[$view][] = $id; + } + } + return true; + } + } + return false; + } + + /** + * get the field type id from system + */ + protected function getFieldType($fieldName) + { + // load the field settings + return ComponentbuilderHelper::getVar('fieldtype', $fieldName, 'name', 'id'); + } + + /** + * The building function for field xml + */ + protected function setFieldXML(&$field, $fieldId) + { + // load the field settings + $settings = array(); + $settings['name'] = $field['name']; + $settings['description'] = 'The '.strtolower($field['label']) . ' is set here.'; + $settings['message'] = "Error! Please add some ".strtolower($field['label'])." here."; + $settings['label'] = $field['label']; + $settings['default'] = ($field['default'] == 'Other') ? $field['defaultOther'] : $field['default']; + $settings['hint'] = $field['label'] .' Here!'; + // okay set the xml field values + if ($fieldOptions = ComponentbuilderHelper::getFieldOptions($fieldId, 'id', $settings)) + { + return json_encode($fieldOptions['values']); + } + return ''; + } +} diff --git a/admin/helpers/extrusion/c_extrusion.php b/admin/helpers/extrusion/c_extrusion.php new file mode 100644 index 000000000..01c8c0512 --- /dev/null +++ b/admin/helpers/extrusion/c_extrusion.php @@ -0,0 +1,141 @@ + + @my wife Roline van der 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 + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +/** + * Extrusion class + */ +class Extrusion extends Builder +{ + /*** + * Constructor + */ + public function __construct(&$data) + { + // first we run the perent constructor + if (parent::__construct($data)) + { + // link the view data to the component + $data['addadmin_views'] = $this->linkAdminViews(); + if (ComponentbuilderHelper::checkJson($data['addadmin_views'])) + { + $this->app->enqueueMessage( + JText::_('All the fields and views from your sql dump has been created and linked to this component.'), + 'Success' + ); + return true; + } + } + return false; + } + + /** + * link the build views to the component + */ + protected function linkAdminViews() + { + // check if views were set + if (ComponentbuilderHelper::checkArray($this->views)) + { + // insure arrays are set + if (!isset($this->addadmin_views['adminview'])) + { + $this->addadmin_views['adminview'] = array(); + } + if (!isset($this->addadmin_views['icomoon'])) + { + $this->addadmin_views['icomoon'] = array(); + } + if (!isset($this->addadmin_views['mainmenu'])) + { + $this->addadmin_views['mainmenu'] = array(); + } + if (!isset($this->addadmin_views['dashboard_add'])) + { + $this->addadmin_views['dashboard_add'] = array(); + } + if (!isset($this->addadmin_views['dashboard_list'])) + { + $this->addadmin_views['dashboard_list'] = array(); + } + if (!isset($this->addadmin_views['submenu'])) + { + $this->addadmin_views['submenu'] = array(); + } + if (!isset($this->addadmin_views['checkin'])) + { + $this->addadmin_views['checkin'] = array(); + } + if (!isset($this->addadmin_views['history'])) + { + $this->addadmin_views['history'] = array(); + } + if (!isset($this->addadmin_views['metadata'])) + { + $this->addadmin_views['metadata'] = array(); + } + if (!isset($this->addadmin_views['access'])) + { + $this->addadmin_views['access'] = array(); + } + if (!isset($this->addadmin_views['port'])) + { + $this->addadmin_views['port'] = array(); + } + if (!isset($this->addadmin_views['edit_create_site_view'])) + { + $this->addadmin_views['edit_create_site_view'] = array(); + } + if (!isset($this->addadmin_views['order'])) + { + $this->addadmin_views['order'] = array(); + } + // set the admin view data linking + foreach ($this->views as $id) + { + $this->addadmin_views['adminview'][] = $id; + $this->addadmin_views['icomoon'][] = 'joomla'; + $this->addadmin_views['mainmenu'][] = 1; + $this->addadmin_views['dashboard_add'][] = 1; + $this->addadmin_views['dashboard_list'][] = 1; + $this->addadmin_views['submenu'][] = 1; + $this->addadmin_views['checkin'][] = 1; + $this->addadmin_views['history'][] = 1; + $this->addadmin_views['metadata'][] = 1; + $this->addadmin_views['access'][] = 1; + $this->addadmin_views['port'][] = 1; + $this->addadmin_views['edit_create_site_view'][] = 0; + $this->addadmin_views['order'][] = count($this->addadmin_views['order']) + 1; + } + } + if (isset($this->addadmin_views) && ComponentbuilderHelper::checkArray($this->addadmin_views)) + { + return json_encode($this->addadmin_views); + } + return ''; + } +} diff --git a/admin/helpers/extrusion/index.html b/admin/helpers/extrusion/index.html new file mode 100644 index 000000000..fa6d84e80 --- /dev/null +++ b/admin/helpers/extrusion/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 2c2fef4de..05717bc82 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 44541c136..823526478 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index aa7dd6a37..66d409a85 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index c55357890..e652562e9 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 eb9c6b3f4..990d972ca 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -834,6 +834,13 @@ COM_COMPONENTBUILDER_COMPONENT_BOX_REMOVE="Box Remove" COM_COMPONENTBUILDER_COMPONENT_BRIEFCASE="Briefcase" COM_COMPONENTBUILDER_COMPONENT_BRUSH="Brush" COM_COMPONENTBUILDER_COMPONENT_BUBBLE_QUOTE="Bubble Quote" +COM_COMPONENTBUILDER_COMPONENT_BUILDCOMP="Buildcomp" +COM_COMPONENTBUILDER_COMPONENT_BUILDCOMPSQL="Buildcompsql" +COM_COMPONENTBUILDER_COMPONENT_BUILDCOMPSQL_DESCRIPTION="Add your MySQL here!" +COM_COMPONENTBUILDER_COMPONENT_BUILDCOMPSQL_HINT="// Add MySQL Table Dump Here" +COM_COMPONENTBUILDER_COMPONENT_BUILDCOMPSQL_LABEL="MySQL" +COM_COMPONENTBUILDER_COMPONENT_BUILDCOMP_DESCRIPTION="To build the component fields and back-end views dynamically using a mySQL table file." +COM_COMPONENTBUILDER_COMPONENT_BUILDCOMP_LABEL="Build Backend-views Dynamically" COM_COMPONENTBUILDER_COMPONENT_CALENDAR="Calendar" COM_COMPONENTBUILDER_COMPONENT_CALENDAR_THREE="Calendar 3" COM_COMPONENTBUILDER_COMPONENT_CALENDAR_TWO="Calendar 2" @@ -886,6 +893,7 @@ COM_COMPONENTBUILDER_COMPONENT_CUBE="Cube" COM_COMPONENTBUILDER_COMPONENT_CUSTOMADMINVIEW="Customadminview" COM_COMPONENTBUILDER_COMPONENT_CUSTOMADMINVIEW_DESCRIPTION="Select a custom admin view" COM_COMPONENTBUILDER_COMPONENT_CUSTOMADMINVIEW_LABEL="View" +COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS="Custom Admin Views" COM_COMPONENTBUILDER_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE="Custom (used in custom code)" COM_COMPONENTBUILDER_COMPONENT_CUSTOM_VALUE_DESCRIPTION="Enter custom value in needed" COM_COMPONENTBUILDER_COMPONENT_CUSTOM_VALUE_HINT="Custom Value Here" @@ -911,6 +919,7 @@ COM_COMPONENTBUILDER_COMPONENT_DESCRIPTION_HINT="Add Description Here" COM_COMPONENTBUILDER_COMPONENT_DESCRIPTION_LABEL="Description" COM_COMPONENTBUILDER_COMPONENT_DETAILS="Details" COM_COMPONENTBUILDER_COMPONENT_DOWNLOAD="Download" +COM_COMPONENTBUILDER_COMPONENT_DYNAMIC_BUILD_BETA="Dynamic Build (beta)" COM_COMPONENTBUILDER_COMPONENT_DYNAMIC_INTEGRATION="Dynamic Integration" COM_COMPONENTBUILDER_COMPONENT_EDIT="Editing the Component" COM_COMPONENTBUILDER_COMPONENT_EDIT_CREATE_SITE_VIEW_DESCRIPTION="add site edit & create view for this admin view" @@ -1061,6 +1070,8 @@ COM_COMPONENTBUILDER_COMPONENT_NOTE_ADD_FILES_DESCRIPTION="You can add custom fi COM_COMPONENTBUILDER_COMPONENT_NOTE_ADD_FILES_LABEL="Adding Custom Files" COM_COMPONENTBUILDER_COMPONENT_NOTE_ADD_FOLDERS_DESCRIPTION="You can add custom folders to the component, simply add the folders to the administrator/components/com_componentbuilder/custom folder and then select them here." COM_COMPONENTBUILDER_COMPONENT_NOTE_ADD_FOLDERS_LABEL="Adding Custom Folders" +COM_COMPONENTBUILDER_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_DESCRIPTION="You can dynamically build the components back-end views and fields by adding a mySQL table dump, that has all the tables, or some more tables with its columns and data types. A very basic and generic set of fields and tables will be created, and added to the existing fields and tables of this component. This is in beta testing, so this feature is still under development and will only be fully functional around June 2017..." +COM_COMPONENTBUILDER_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_LABEL="Dynamic Builder Option" COM_COMPONENTBUILDER_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_DESCRIPTION="In each admin view you can add data from a MySQL Table (this is done in the admin view MySQL tab). Here you can limit that data in relation to this component. This feature is useful when an admin view with demo data is used in more then one component, and you would like to exclude some demo data without creating a new admin view." COM_COMPONENTBUILDER_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_LABEL=" MySql Tweak Options" COM_COMPONENTBUILDER_COMPONENT_NOTE_ON_CONTRIBUTORS_DESCRIPTION="Only add contributors if you would like them listed on the component dashboard." diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index d21e93d24..4c6f273ed 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 b675f7947..7182bc169 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7341367df..f9c3551f3 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 464e4f4e6..95cc15103 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 ad7433f9c..407fc42fe 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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->vxrfields; +$items = $displayData->vxtfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 3bced1121..9f7452359 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index 170d859ac..54ffb706e 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 d116069fb..ab32eaa08 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 f59b2e65d..7aa5ec262 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7ea478e76..dde6ccac3 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 01448953a..f3ac7c8d3 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7902ae8cc..55be5ee10 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 41982cdbd..611ad4cbe 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 e606e2476..4cbad27dd 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 65aa9e81e..feec222c1 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_under.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 91206725e..427f58e43 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 cd6c51e58..9ddd5524b 100644 --- a/admin/layouts/component/admin_views_fullwidth.php +++ b/admin/layouts/component/admin_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vwladmin_views; +$items = $displayData->vwmadmin_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/component/custom_admin_views_fullwidth.php b/admin/layouts/component/custom_admin_views_fullwidth.php new file mode 100644 index 000000000..2c627b221 --- /dev/null +++ b/admin/layouts/component/custom_admin_views_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->vwncustom_admin_views; +$user = JFactory::getUser(); +$id = $displayData->item->id; +$edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=custom_admin_view.edit"; +$ref = ($id) ? "&ref=component&refid=".$id : ""; +$new = "index.php?option=com_componentbuilder&view=custom_admin_view&layout=edit".$ref; +$can = ComponentbuilderHelper::getActions('custom_admin_view'); + +?> +
+get('core.create')): ?> +

+ + + + + + + + + + + + + + + + $item): ?> + authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; + $userChkOut = JFactory::getUser($item->checked_out); + $canDo = ComponentbuilderHelper::getActions('custom_admin_view',$item,'custom_admin_views'); + ?> + + + + + + + published == 1):?> + + published == 0):?> + + published == 2):?> + + published == -2):?> + + + + + + +
+ + + + + + + + + + + + + +
+ get('core.edit')): ?> + escape($item->system_name); ?> + checked_out): ?> + name, $item->checked_out_time, 'custom_admin_views.', $canCheckin); ?> + + +
escape($item->system_name); ?>
+ + 		+ escape($item->name); ?> + + escape($item->alias); ?> + + escape($item->description); ?> + + escape($item->snippet_name); ?> + + + + + + + + + + + + + + + + + + id; ?> +
+ +
+ +
+ +
diff --git a/admin/layouts/component/details_above.php b/admin/layouts/component/details_above.php index b3f38a625..0a1b0a111 100644 --- a/admin/layouts/component/details_above.php +++ b/admin/layouts/component/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 c42994815..9f05fbd2c 100644 --- a/admin/layouts/component/details_left.php +++ b/admin/layouts/component/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 56e3ff594..be638d059 100644 --- a/admin/layouts/component/details_right.php +++ b/admin/layouts/component/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 4a67090ef..f1578aa0c 100644 --- a/admin/layouts/component/details_under.php +++ b/admin/layouts/component/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 new file mode 100644 index 000000000..5ee6a9c1d --- /dev/null +++ b/admin/layouts/component/dynamic_build_beta_fullwidth.php @@ -0,0 +1,50 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'note_buildcomp_dynamic', + 'buildcomp', + 'buildcompsql' +); + +?> +
+ +
+
+ getLabel($field); ?> +
+
+ getInput($field); ?> +
+
+ +
diff --git a/admin/layouts/component/dynamic_integration_fullwidth.php b/admin/layouts/component/dynamic_integration_fullwidth.php index 2d194caf6..c13c38021 100644 --- a/admin/layouts/component/dynamic_integration_fullwidth.php +++ b/admin/layouts/component/dynamic_integration_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 b2af56774..b8c978db3 100644 --- a/admin/layouts/component/libs_helpers_fullwidth.php +++ b/admin/layouts/component/libs_helpers_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 386b84abe..bf6c0ae81 100644 --- a/admin/layouts/component/mysql_fullwidth.php +++ b/admin/layouts/component/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 a4180f3aa..97eeb0347 100644 --- a/admin/layouts/component/php_fullwidth.php +++ b/admin/layouts/component/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7ea478e76..dde6ccac3 100644 --- a/admin/layouts/component/publishing.php +++ b/admin/layouts/component/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 01448953a..f3ac7c8d3 100644 --- a/admin/layouts/component/publlshing.php +++ b/admin/layouts/component/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 30b52081b..333aeb8b6 100644 --- a/admin/layouts/component/readme_left.php +++ b/admin/layouts/component/readme_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 bed097a8b..2ab55e58b 100644 --- a/admin/layouts/component/readme_right.php +++ b/admin/layouts/component/readme_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 2142156bb..32cb33483 100644 --- a/admin/layouts/component/settings_left.php +++ b/admin/layouts/component/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php @@ -34,13 +34,13 @@ $fields = $displayData->get('fields') ?: array( 'addadmin_views', 'addcustom_admin_views', 'addsite_views', - 'spacer_hr_c', + 'spacer_hr_b', 'note_mysql_tweak_options', 'sql_tweak', - 'spacer_hr_d', + 'spacer_hr_c', 'note_add_custom_menus', 'addcustommenus', - 'spacer_hr_e', + 'spacer_hr_d', 'note_add_config', 'addconfig' ); diff --git a/admin/layouts/component/settings_right.php b/admin/layouts/component/settings_right.php index 770ade576..23c10f179 100644 --- a/admin/layouts/component/settings_right.php +++ b/admin/layouts/component/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php @@ -34,7 +34,7 @@ $fields = $displayData->get('fields') ?: array( 'addcontributors', 'emptycontributors', 'number', - 'spacer_hr_b', + 'spacer_hr_e', 'note_add_files', 'addfiles', 'spacer_hr_a', diff --git a/admin/layouts/component/site_views_fullwidth.php b/admin/layouts/component/site_views_fullwidth.php index 2d97cb878..20841780b 100644 --- a/admin/layouts/component/site_views_fullwidth.php +++ b/admin/layouts/component/site_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vwmsite_views; +$items = $displayData->vwosite_views; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=site_views&task=site_view.edit"; diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index b675f7947..7182bc169 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7341367df..f9c3551f3 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 01f2f6677..25e15b03b 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 b3f38a625..0a1b0a111 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 53fa2ea7b..12765b6e8 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 10c0516ae..ae365b2cf 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 ee896e91c..a4f7dd485 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 090d050c5..57ae40787 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 4a67090ef..f1578aa0c 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 7ea478e76..dde6ccac3 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 01448953a..f3ac7c8d3 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 1122c8091..6d2518bb1 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 55664c0fd..93e42c519 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 1185040aa..d94ae6b38 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 03017eec7..cb085a38f 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 d4455c5e8..f91c8a454 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 1bcdc5410..31907ff39 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 b85710b58..6b75f5c83 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 633c9bb5b..da1d6a864 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7ea478e76..dde6ccac3 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 01448953a..f3ac7c8d3 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 5f4be87fb..a4cf9f726 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 cb90cdf99..33678fb41 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 1458dc76b..4de2cdf72 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 4a67090ef..f1578aa0c 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 7ea478e76..dde6ccac3 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 01448953a..f3ac7c8d3 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 9c564d106..d0ace02ad 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 9d1b548f7..bede0b5a5 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 35e41558e..2f5ed4dfd 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 e3ce56271..d718a580b 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 125956f59..e37be3f91 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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->vznfields; +$items = $displayData->vzpfields; $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 7ea478e76..dde6ccac3 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 01448953a..f3ac7c8d3 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 b4e6889d0..e35f5e4d9 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 94694b664..aed506bed 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 e43e0e2e3..cf827775b 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 53654bf29..aed292fd0 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 4a67090ef..f1578aa0c 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7ea478e76..dde6ccac3 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 0fd0a95b4..6b004f7e0 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 0329c6ca8..96a78ae9b 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 62c66fadc..880c868df 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 10c0516ae..ae365b2cf 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 c9925259d..01eab06e0 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 9837a0cef..823ee9f37 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 4a67090ef..f1578aa0c 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7ea478e76..dde6ccac3 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 01448953a..f3ac7c8d3 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 5224d5e97..d32d78c8f 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 b3f38a625..0a1b0a111 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 53fa2ea7b..12765b6e8 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 10c0516ae..ae365b2cf 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 c9925259d..01eab06e0 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 090d050c5..57ae40787 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 4a67090ef..f1578aa0c 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 89cd6c251..c4d704013 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index e1e150ee0..aae418a95 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7ea478e76..dde6ccac3 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 01448953a..f3ac7c8d3 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 ec44877db..e05b4fab3 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 6c674964e..d66591150 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7fc3d0c00..85fce4b69 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7ea478e76..dde6ccac3 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 01448953a..f3ac7c8d3 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 0329c6ca8..96a78ae9b 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 85d3ff0fb..543ae83ca 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 10c0516ae..ae365b2cf 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 c9925259d..01eab06e0 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 9837a0cef..823ee9f37 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 4a67090ef..f1578aa0c 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7ea478e76..dde6ccac3 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 01448953a..f3ac7c8d3 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 6aace1968..2f5f1acc1 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -275,7 +275,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.admin_view'); } } - $this->idvvvx = $item->addfields; + $this->idvvvy = $item->addfields; return $item; } @@ -285,7 +285,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxrfields() + public function getVxtfields() { // Get the user object. $user = JFactory::getUser(); @@ -354,26 +354,26 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVxrfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVxtfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVxrfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVxtfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVxrfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVxtfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVxrfields($item->store, 'store'); + $item->store = $this->selectionTranslationVxtfields($item->store, 'store'); } } // Filter by id Repetable Field - $idvvvx = json_decode($this->idvvvx,true); - if (ComponentbuilderHelper::checkArray($items) && isset($idvvvx) && ComponentbuilderHelper::checkArray($idvvvx)) + $idvvvy = json_decode($this->idvvvy,true); + if (ComponentbuilderHelper::checkArray($items) && isset($idvvvy) && ComponentbuilderHelper::checkArray($idvvvy)) { foreach ($items as $nr => &$item) { - if ($item->id && isset($idvvvx['field']) && ComponentbuilderHelper::checkArray($idvvvx['field'])) + if ($item->id && isset($idvvvy['field']) && ComponentbuilderHelper::checkArray($idvvvy['field'])) { - if (!in_array($item->id,$idvvvx['field'])) + if (!in_array($item->id,$idvvvy['field'])) { unset($items[$nr]); continue; @@ -395,7 +395,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVxrfields($value,$name) + public function selectionTranslationVxtfields($value,$name) { // Array of datatype language strings if ($name == 'datatype') diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index e7581a2a0..6f730047a 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index dd97a6e36..5e9ed253b 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -1441,33 +1441,8 @@ class ComponentbuilderModelAjax extends JModelList // Used in field public function getFieldOptions($id) { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - $query->select($db->quoteName(array('properties', 'short_description', 'description'))); - $query->from($db->quoteName('#__componentbuilder_fieldtype')); - $query->where($db->quoteName('published') . ' = 1'); - $query->where($db->quoteName('id') . ' = '. $id); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) + if ($field = ComponentbuilderHelper::getFieldOptions($id, 'id')) { - $result = $db->loadObject(); - $properties = json_decode($result->properties,true); - $pointer = 0; - $field = array('values' => " '
    ', 'short_description' => $result->short_description, 'description' => $result->description); - foreach ($properties['name'] as $line) - { - $field['values_description'] .= '
  • '.$properties['name'][$pointer].' '.$properties['description'][$pointer].'
    • '; - $field['values'] .= "\n\t".$properties['name'][$pointer].'="'.$properties['example'][$pointer].'" '; - $pointer++; - } - $field['values'] .= "\n/>"; - $field['values_description'] .= '
'; // return found field options return $field; } diff --git a/admin/models/compiler.php b/admin/models/compiler.php index 874248882..b8b06e587 100644 --- a/admin/models/compiler.php +++ b/admin/models/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage compiler.php diff --git a/admin/models/component.php b/admin/models/component.php index 9c270fe01..5f2f64c76 100644 --- a/admin/models/component.php +++ b/admin/models/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.php @@ -95,88 +95,94 @@ class ComponentbuilderModelComponent extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->php_helper_admin)) - { - // base64 Decode php_helper_admin. - $item->php_helper_admin = base64_decode($item->php_helper_admin); - } - - if (!empty($item->sql)) - { - // base64 Decode sql. - $item->sql = base64_decode($item->sql); - } - - if (!empty($item->php_helper_site)) - { - // base64 Decode php_helper_site. - $item->php_helper_site = base64_decode($item->php_helper_site); - } - - if (!empty($item->php_helper_both)) - { - // base64 Decode php_helper_both. - $item->php_helper_both = base64_decode($item->php_helper_both); - } - - if (!empty($item->php_admin_event)) - { - // base64 Decode php_admin_event. - $item->php_admin_event = base64_decode($item->php_admin_event); - } - - if (!empty($item->php_site_event)) - { - // base64 Decode php_site_event. - $item->php_site_event = base64_decode($item->php_site_event); - } - - if (!empty($item->php_dashboard_methods)) - { - // base64 Decode php_dashboard_methods. - $item->php_dashboard_methods = base64_decode($item->php_dashboard_methods); - } - if (!empty($item->css)) { // base64 Decode css. $item->css = base64_decode($item->css); } - if (!empty($item->php_preflight_install)) - { - // base64 Decode php_preflight_install. - $item->php_preflight_install = base64_decode($item->php_preflight_install); - } - if (!empty($item->php_preflight_update)) { // base64 Decode php_preflight_update. $item->php_preflight_update = base64_decode($item->php_preflight_update); } - if (!empty($item->php_postflight_install)) - { - // base64 Decode php_postflight_install. - $item->php_postflight_install = base64_decode($item->php_postflight_install); - } - if (!empty($item->php_postflight_update)) { // base64 Decode php_postflight_update. $item->php_postflight_update = base64_decode($item->php_postflight_update); } + if (!empty($item->readme)) + { + // base64 Decode readme. + $item->readme = base64_decode($item->readme); + } + + if (!empty($item->php_preflight_install)) + { + // base64 Decode php_preflight_install. + $item->php_preflight_install = base64_decode($item->php_preflight_install); + } + + if (!empty($item->php_postflight_install)) + { + // base64 Decode php_postflight_install. + $item->php_postflight_install = base64_decode($item->php_postflight_install); + } + if (!empty($item->php_method_uninstall)) { // base64 Decode php_method_uninstall. $item->php_method_uninstall = base64_decode($item->php_method_uninstall); } - if (!empty($item->readme)) + if (!empty($item->php_helper_both)) { - // base64 Decode readme. - $item->readme = base64_decode($item->readme); + // base64 Decode php_helper_both. + $item->php_helper_both = base64_decode($item->php_helper_both); + } + + if (!empty($item->php_helper_admin)) + { + // base64 Decode php_helper_admin. + $item->php_helper_admin = base64_decode($item->php_helper_admin); + } + + if (!empty($item->php_admin_event)) + { + // base64 Decode php_admin_event. + $item->php_admin_event = base64_decode($item->php_admin_event); + } + + if (!empty($item->php_helper_site)) + { + // base64 Decode php_helper_site. + $item->php_helper_site = base64_decode($item->php_helper_site); + } + + if (!empty($item->php_site_event)) + { + // base64 Decode php_site_event. + $item->php_site_event = base64_decode($item->php_site_event); + } + + if (!empty($item->sql)) + { + // base64 Decode sql. + $item->sql = base64_decode($item->sql); + } + + if (!empty($item->php_dashboard_methods)) + { + // base64 Decode php_dashboard_methods. + $item->php_dashboard_methods = base64_decode($item->php_dashboard_methods); + } + + if (!empty($item->buildcompsql)) + { + // base64 Decode buildcompsql. + $item->buildcompsql = base64_decode($item->buildcompsql); } // Get the basic encription. @@ -190,16 +196,16 @@ class ComponentbuilderModelComponent extends JModelAdmin $item->update_server_ftp = rtrim($basic->decryptString($item->update_server_ftp), "\0"); } - if (!empty($item->whmcs_key) && $basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true))) - { - // basic decript data whmcs_key. - $item->whmcs_key = rtrim($basic->decryptString($item->whmcs_key), "\0"); - } - if (!empty($item->sales_server_ftp) && $basickey && !is_numeric($item->sales_server_ftp) && $item->sales_server_ftp === base64_encode(base64_decode($item->sales_server_ftp, true))) { // basic decript data sales_server_ftp. $item->sales_server_ftp = rtrim($basic->decryptString($item->sales_server_ftp), "\0"); + } + + if (!empty($item->whmcs_key) && $basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true))) + { + // basic decript data whmcs_key. + $item->whmcs_key = rtrim($basic->decryptString($item->whmcs_key), "\0"); } if (!empty($item->id)) @@ -209,7 +215,8 @@ class ComponentbuilderModelComponent extends JModelAdmin } } $this->idvvvv = $item->addadmin_views; - $this->idvvvw = $item->addsite_views; + $this->idvvvw = $item->addcustom_admin_views; + $this->idvvvx = $item->addsite_views; return $item; } @@ -219,7 +226,7 @@ class ComponentbuilderModelComponent extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVwladmin_views() + public function getVwmadmin_views() { // Get the user object. $user = JFactory::getUser(); @@ -306,7 +313,98 @@ class ComponentbuilderModelComponent extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVwmsite_views() + public function getVwncustom_admin_views() + { + // Get the user object. + $user = JFactory::getUser(); + // Create a new query object. + $db = JFactory::getDBO(); + $query = $db->getQuery(true); + + // Select some fields + $query->select('a.*'); + + // From the componentbuilder_custom_admin_view table + $query->from($db->quoteName('#__componentbuilder_custom_admin_view', 'a')); + + // From the componentbuilder_snippet table. + $query->select($db->quoteName('g.name','snippet_name')); + $query->join('LEFT', $db->quoteName('#__componentbuilder_snippet', 'g') . ' ON (' . $db->quoteName('a.snippet') . ' = ' . $db->quoteName('g.id') . ')'); + + // Join over the asset groups. + $query->select('ag.title AS access_level'); + $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where('a.access = ' . (int) $access); + } + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + + // Order the results by ordering + $query->order('a.published ASC'); + $query->order('a.ordering ASC'); + + // Load the items + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $items = $db->loadObjectList(); + + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('custom_admin_view.access', 'com_componentbuilder.custom_admin_view.' . (int) $item->id) && $user->authorise('custom_admin_view.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } + + // Filter by id Repetable Field + $idvvvw = json_decode($this->idvvvw,true); + if (ComponentbuilderHelper::checkArray($items) && isset($idvvvw) && ComponentbuilderHelper::checkArray($idvvvw)) + { + foreach ($items as $nr => &$item) + { + if ($item->id && isset($idvvvw['customadminview']) && ComponentbuilderHelper::checkArray($idvvvw['customadminview'])) + { + if (!in_array($item->id,$idvvvw['customadminview'])) + { + unset($items[$nr]); + continue; + } + } + } + } + else + { + return false; + } + return $items; + } + return false; + } + + /** + * Method to get list data. + * + * @return mixed An array of data items on success, false on failure. + */ + public function getVwosite_views() { // Get the user object. $user = JFactory::getUser(); @@ -368,14 +466,14 @@ class ComponentbuilderModelComponent extends JModelAdmin } // Filter by id Repetable Field - $idvvvw = json_decode($this->idvvvw,true); - if (ComponentbuilderHelper::checkArray($items) && isset($idvvvw) && ComponentbuilderHelper::checkArray($idvvvw)) + $idvvvx = json_decode($this->idvvvx,true); + if (ComponentbuilderHelper::checkArray($items) && isset($idvvvx) && ComponentbuilderHelper::checkArray($idvvvx)) { foreach ($items as $nr => &$item) { - if ($item->id && isset($idvvvw['siteview']) && ComponentbuilderHelper::checkArray($idvvvw['siteview'])) + if ($item->id && isset($idvvvx['siteview']) && ComponentbuilderHelper::checkArray($idvvvx['siteview'])) { - if (!in_array($item->id,$idvvvw['siteview'])) + if (!in_array($item->id,$idvvvx['siteview'])) { unset($items[$nr]); continue; @@ -1104,88 +1202,94 @@ class ComponentbuilderModelComponent extends JModelAdmin $data['metadata'] = (string) $metadata; } - // Set the php_helper_admin string to base64 string. - if (isset($data['php_helper_admin'])) - { - $data['php_helper_admin'] = base64_encode($data['php_helper_admin']); - } - - // Set the sql string to base64 string. - if (isset($data['sql'])) - { - $data['sql'] = base64_encode($data['sql']); - } - - // Set the php_helper_site string to base64 string. - if (isset($data['php_helper_site'])) - { - $data['php_helper_site'] = base64_encode($data['php_helper_site']); - } - - // Set the php_helper_both string to base64 string. - if (isset($data['php_helper_both'])) - { - $data['php_helper_both'] = base64_encode($data['php_helper_both']); - } - - // Set the php_admin_event string to base64 string. - if (isset($data['php_admin_event'])) - { - $data['php_admin_event'] = base64_encode($data['php_admin_event']); - } - - // Set the php_site_event string to base64 string. - if (isset($data['php_site_event'])) - { - $data['php_site_event'] = base64_encode($data['php_site_event']); - } - - // Set the php_dashboard_methods string to base64 string. - if (isset($data['php_dashboard_methods'])) - { - $data['php_dashboard_methods'] = base64_encode($data['php_dashboard_methods']); - } - // Set the css string to base64 string. if (isset($data['css'])) { $data['css'] = base64_encode($data['css']); } - // Set the php_preflight_install string to base64 string. - if (isset($data['php_preflight_install'])) - { - $data['php_preflight_install'] = base64_encode($data['php_preflight_install']); - } - // Set the php_preflight_update string to base64 string. if (isset($data['php_preflight_update'])) { $data['php_preflight_update'] = base64_encode($data['php_preflight_update']); } - // Set the php_postflight_install string to base64 string. - if (isset($data['php_postflight_install'])) - { - $data['php_postflight_install'] = base64_encode($data['php_postflight_install']); - } - // Set the php_postflight_update string to base64 string. if (isset($data['php_postflight_update'])) { $data['php_postflight_update'] = base64_encode($data['php_postflight_update']); } + // Set the readme string to base64 string. + if (isset($data['readme'])) + { + $data['readme'] = base64_encode($data['readme']); + } + + // Set the php_preflight_install string to base64 string. + if (isset($data['php_preflight_install'])) + { + $data['php_preflight_install'] = base64_encode($data['php_preflight_install']); + } + + // Set the php_postflight_install string to base64 string. + if (isset($data['php_postflight_install'])) + { + $data['php_postflight_install'] = base64_encode($data['php_postflight_install']); + } + // Set the php_method_uninstall string to base64 string. if (isset($data['php_method_uninstall'])) { $data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']); } - // Set the readme string to base64 string. - if (isset($data['readme'])) + // Set the php_helper_both string to base64 string. + if (isset($data['php_helper_both'])) { - $data['readme'] = base64_encode($data['readme']); + $data['php_helper_both'] = base64_encode($data['php_helper_both']); + } + + // Set the php_helper_admin string to base64 string. + if (isset($data['php_helper_admin'])) + { + $data['php_helper_admin'] = base64_encode($data['php_helper_admin']); + } + + // Set the php_admin_event string to base64 string. + if (isset($data['php_admin_event'])) + { + $data['php_admin_event'] = base64_encode($data['php_admin_event']); + } + + // Set the php_helper_site string to base64 string. + if (isset($data['php_helper_site'])) + { + $data['php_helper_site'] = base64_encode($data['php_helper_site']); + } + + // Set the php_site_event string to base64 string. + if (isset($data['php_site_event'])) + { + $data['php_site_event'] = base64_encode($data['php_site_event']); + } + + // Set the sql string to base64 string. + if (isset($data['sql'])) + { + $data['sql'] = base64_encode($data['sql']); + } + + // Set the php_dashboard_methods string to base64 string. + if (isset($data['php_dashboard_methods'])) + { + $data['php_dashboard_methods'] = base64_encode($data['php_dashboard_methods']); + } + + // Set the buildcompsql string to base64 string. + if (isset($data['buildcompsql'])) + { + $data['buildcompsql'] = base64_encode($data['buildcompsql']); } // Get the basic encription key. @@ -1199,17 +1303,20 @@ class ComponentbuilderModelComponent extends JModelAdmin $data['update_server_ftp'] = $basic->encryptString($data['update_server_ftp']); } + // Encript data sales_server_ftp. + if (isset($data['sales_server_ftp']) && $basickey) + { + $data['sales_server_ftp'] = $basic->encryptString($data['sales_server_ftp']); + } + // Encript data whmcs_key. if (isset($data['whmcs_key']) && $basickey) { $data['whmcs_key'] = $basic->encryptString($data['whmcs_key']); } - // Encript data sales_server_ftp. - if (isset($data['sales_server_ftp']) && $basickey) - { - $data['sales_server_ftp'] = $basic->encryptString($data['sales_server_ftp']); - } + // we check if component should be build from sql file + ComponentbuilderHelper::dynamicBuilder($data, 1); // Set the Params Items to data if (isset($data['params']) && is_array($data['params'])) diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index b59dccdc6..c81bb2f02 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/components.php b/admin/models/components.php index 5e7f1e923..92e35ea03 100644 --- a/admin/models/components.php +++ b/admin/models/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.php @@ -259,42 +259,17 @@ class ComponentbuilderModelComponents extends JModelList { foreach ($items as $nr => &$item) { - // decode php_helper_admin - $item->php_helper_admin = base64_decode($item->php_helper_admin); - // decode sql - $item->sql = base64_decode($item->sql); if ($basickey && !is_numeric($item->update_server_ftp) && $item->update_server_ftp === base64_encode(base64_decode($item->update_server_ftp, true))) { // decrypt update_server_ftp $item->update_server_ftp = $basic->decryptString($item->update_server_ftp); } - // decode php_helper_site - $item->php_helper_site = base64_decode($item->php_helper_site); - // decode php_helper_both - $item->php_helper_both = base64_decode($item->php_helper_both); - // decode php_admin_event - $item->php_admin_event = base64_decode($item->php_admin_event); - // decode php_site_event - $item->php_site_event = base64_decode($item->php_site_event); - // decode php_dashboard_methods - $item->php_dashboard_methods = base64_decode($item->php_dashboard_methods); - if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true))) - { - // decrypt whmcs_key - $item->whmcs_key = $basic->decryptString($item->whmcs_key); - } // decode css $item->css = base64_decode($item->css); - // decode php_preflight_install - $item->php_preflight_install = base64_decode($item->php_preflight_install); // decode php_preflight_update $item->php_preflight_update = base64_decode($item->php_preflight_update); - // decode php_postflight_install - $item->php_postflight_install = base64_decode($item->php_postflight_install); // decode php_postflight_update $item->php_postflight_update = base64_decode($item->php_postflight_update); - // decode php_method_uninstall - $item->php_method_uninstall = base64_decode($item->php_method_uninstall); // decode readme $item->readme = base64_decode($item->readme); if ($basickey && !is_numeric($item->sales_server_ftp) && $item->sales_server_ftp === base64_encode(base64_decode($item->sales_server_ftp, true))) @@ -302,6 +277,33 @@ class ComponentbuilderModelComponents extends JModelList // decrypt sales_server_ftp $item->sales_server_ftp = $basic->decryptString($item->sales_server_ftp); } + // decode php_preflight_install + $item->php_preflight_install = base64_decode($item->php_preflight_install); + // decode php_postflight_install + $item->php_postflight_install = base64_decode($item->php_postflight_install); + // decode php_method_uninstall + $item->php_method_uninstall = base64_decode($item->php_method_uninstall); + if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true))) + { + // decrypt whmcs_key + $item->whmcs_key = $basic->decryptString($item->whmcs_key); + } + // decode php_helper_both + $item->php_helper_both = base64_decode($item->php_helper_both); + // decode php_helper_admin + $item->php_helper_admin = base64_decode($item->php_helper_admin); + // decode php_admin_event + $item->php_admin_event = base64_decode($item->php_admin_event); + // decode php_helper_site + $item->php_helper_site = base64_decode($item->php_helper_site); + // decode php_site_event + $item->php_site_event = base64_decode($item->php_site_event); + // decode sql + $item->sql = base64_decode($item->sql); + // decode php_dashboard_methods + $item->php_dashboard_methods = base64_decode($item->php_dashboard_methods); + // decode buildcompsql + $item->buildcompsql = base64_decode($item->buildcompsql); // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 43ba5c576..93c4c4dd2 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index 1d37b8512..dba0149a1 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 59acf4393..752686dd8 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 c2f25d216..acb136bb4 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/models/field.php b/admin/models/field.php index 2061f5f52..131d5d66c 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/models/fields.php b/admin/models/fields.php index 4d9650248..ce7d2240b 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 5ac2d1bb0..33e2ae890 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 931916ef1..60664caa7 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 65a2ce101..681295857 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 93c51aac1..be46b027c 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 ba4cb24b8..7057273ea 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 35f58d685..039373971 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 5cbcc4ad4..ff81c98e5 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 dba98401c..39a1db325 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 04e1fb6d8..60a352370 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 4bedbe2d4..36ae441dc 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 95b5f437e..06d4193ef 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 87ece3130..748f4bb1e 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 be9bac2f8..5847b015e 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 8bab66122..7fd04697c 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 ba928c3cb..35257c142 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 5dc68a30f..ed6da5c69 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 9e22dfc7d..00a948589 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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->fieldtypevvvy = $item->id; + $this->fieldtypevvvz = $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 getVznfields() + public function getVzpfields() { // 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 fieldtypevvvy global. - $fieldtypevvvy = $this->fieldtypevvvy; - if (is_numeric($fieldtypevvvy )) + // Filter by fieldtypevvvz global. + $fieldtypevvvz = $this->fieldtypevvvz; + if (is_numeric($fieldtypevvvz )) { - $query->where('a.fieldtype = ' . (int) $fieldtypevvvy ); + $query->where('a.fieldtype = ' . (int) $fieldtypevvvz ); } - elseif (is_string($fieldtypevvvy)) + elseif (is_string($fieldtypevvvz)) { - $query->where('a.fieldtype = ' . $db->quote($fieldtypevvvy)); + $query->where('a.fieldtype = ' . $db->quote($fieldtypevvvz)); } else { @@ -195,13 +195,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVznfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVzpfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVznfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVzpfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVznfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVzpfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVznfields($item->store, 'store'); + $item->store = $this->selectionTranslationVzpfields($item->store, 'store'); } } @@ -215,7 +215,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVznfields($value,$name) + public function selectionTranslationVzpfields($value,$name) { // Array of datatype language strings if ($name == 'datatype') diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php index 3fab54bab..482f84ed0 100644 --- a/admin/models/fieldtypes.php +++ b/admin/models/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 c017fb2e2..fbadeaeb8 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js @@ -23,325 +23,325 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvwvvwn_required = false; -jform_vvvvvwwvwo_required = false; -jform_vvvvvwxvwp_required = false; -jform_vvvvvwyvwq_required = false; -jform_vvvvvwzvwr_required = false; -jform_vvvvvxavws_required = false; -jform_vvvvvxbvwt_required = false; -jform_vvvvvxcvwu_required = false; -jform_vvvvvxdvwv_required = false; -jform_vvvvvxevww_required = false; -jform_vvvvvxfvwx_required = false; -jform_vvvvvxgvwy_required = false; -jform_vvvvvxhvwz_required = false; -jform_vvvvvxivxa_required = false; -jform_vvvvvxjvxb_required = false; -jform_vvvvvxkvxc_required = false; -jform_vvvvvxlvxd_required = false; -jform_vvvvvxmvxe_required = false; -jform_vvvvvxnvxf_required = false; -jform_vvvvvxovxg_required = false; -jform_vvvvvxpvxh_required = false; -jform_vvvvvxqvxi_required = false; -jform_vvvvvxrvxj_required = false; -jform_vvvvvxvvxk_required = false; -jform_vvvvvxvvxl_required = false; -jform_vvvvvxvvxm_required = false; -jform_vvvvvxvvxn_required = false; -jform_vvvvvxvvxo_required = false; -jform_vvvvvxxvxp_required = false; -jform_vvvvvxxvxq_required = false; +jform_vvvvvwwvwp_required = false; +jform_vvvvvwxvwq_required = false; +jform_vvvvvwyvwr_required = false; +jform_vvvvvwzvws_required = false; +jform_vvvvvxavwt_required = false; +jform_vvvvvxbvwu_required = false; +jform_vvvvvxcvwv_required = false; +jform_vvvvvxdvww_required = false; +jform_vvvvvxevwx_required = false; +jform_vvvvvxfvwy_required = false; +jform_vvvvvxgvwz_required = false; +jform_vvvvvxhvxa_required = false; +jform_vvvvvxivxb_required = false; +jform_vvvvvxjvxc_required = false; +jform_vvvvvxkvxd_required = false; +jform_vvvvvxlvxe_required = false; +jform_vvvvvxmvxf_required = false; +jform_vvvvvxnvxg_required = false; +jform_vvvvvxovxh_required = false; +jform_vvvvvxpvxi_required = false; +jform_vvvvvxqvxj_required = false; +jform_vvvvvxrvxk_required = false; +jform_vvvvvxsvxl_required = false; +jform_vvvvvxwvxm_required = false; +jform_vvvvvxwvxn_required = false; +jform_vvvvvxwvxo_required = false; +jform_vvvvvxwvxp_required = false; +jform_vvvvvxwvxq_required = false; +jform_vvvvvxyvxr_required = false; +jform_vvvvvxyvxs_required = false; // Initial Script jQuery(document).ready(function() { - var add_css_view_vvvvvwv = jQuery("#jform_add_css_view input[type='radio']:checked").val(); - vvvvvwv(add_css_view_vvvvvwv); + var add_css_view_vvvvvww = jQuery("#jform_add_css_view input[type='radio']:checked").val(); + vvvvvww(add_css_view_vvvvvww); - var add_css_views_vvvvvww = jQuery("#jform_add_css_views input[type='radio']:checked").val(); - vvvvvww(add_css_views_vvvvvww); + var add_css_views_vvvvvwx = jQuery("#jform_add_css_views input[type='radio']:checked").val(); + vvvvvwx(add_css_views_vvvvvwx); - var add_javascript_view_file_vvvvvwx = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val(); - vvvvvwx(add_javascript_view_file_vvvvvwx); + var add_javascript_view_file_vvvvvwy = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val(); + vvvvvwy(add_javascript_view_file_vvvvvwy); - var add_javascript_views_file_vvvvvwy = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val(); - vvvvvwy(add_javascript_views_file_vvvvvwy); + var add_javascript_views_file_vvvvvwz = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val(); + vvvvvwz(add_javascript_views_file_vvvvvwz); - var add_javascript_view_footer_vvvvvwz = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); - vvvvvwz(add_javascript_view_footer_vvvvvwz); + var add_javascript_view_footer_vvvvvxa = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); + vvvvvxa(add_javascript_view_footer_vvvvvxa); - var add_javascript_views_footer_vvvvvxa = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); - vvvvvxa(add_javascript_views_footer_vvvvvxa); + var add_javascript_views_footer_vvvvvxb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); + vvvvvxb(add_javascript_views_footer_vvvvvxb); - var add_php_ajax_vvvvvxb = jQuery("#jform_add_php_ajax input[type='radio']:checked").val(); - vvvvvxb(add_php_ajax_vvvvvxb); + var add_php_ajax_vvvvvxc = jQuery("#jform_add_php_ajax input[type='radio']:checked").val(); + vvvvvxc(add_php_ajax_vvvvvxc); - var add_php_getitem_vvvvvxc = jQuery("#jform_add_php_getitem input[type='radio']:checked").val(); - vvvvvxc(add_php_getitem_vvvvvxc); + var add_php_getitem_vvvvvxd = jQuery("#jform_add_php_getitem input[type='radio']:checked").val(); + vvvvvxd(add_php_getitem_vvvvvxd); - var add_php_getitems_vvvvvxd = jQuery("#jform_add_php_getitems input[type='radio']:checked").val(); - vvvvvxd(add_php_getitems_vvvvvxd); + var add_php_getitems_vvvvvxe = jQuery("#jform_add_php_getitems input[type='radio']:checked").val(); + vvvvvxe(add_php_getitems_vvvvvxe); - var add_php_getitems_after_all_vvvvvxe = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val(); - vvvvvxe(add_php_getitems_after_all_vvvvvxe); + var add_php_getitems_after_all_vvvvvxf = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val(); + vvvvvxf(add_php_getitems_after_all_vvvvvxf); - var add_php_getlistquery_vvvvvxf = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); - vvvvvxf(add_php_getlistquery_vvvvvxf); + var add_php_getlistquery_vvvvvxg = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); + vvvvvxg(add_php_getlistquery_vvvvvxg); - var add_php_save_vvvvvxg = jQuery("#jform_add_php_save input[type='radio']:checked").val(); - vvvvvxg(add_php_save_vvvvvxg); + var add_php_save_vvvvvxh = jQuery("#jform_add_php_save input[type='radio']:checked").val(); + vvvvvxh(add_php_save_vvvvvxh); - var add_php_postsavehook_vvvvvxh = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); - vvvvvxh(add_php_postsavehook_vvvvvxh); + var add_php_postsavehook_vvvvvxi = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); + vvvvvxi(add_php_postsavehook_vvvvvxi); - var add_php_allowedit_vvvvvxi = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); - vvvvvxi(add_php_allowedit_vvvvvxi); + var add_php_allowedit_vvvvvxj = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); + vvvvvxj(add_php_allowedit_vvvvvxj); - var add_php_batchcopy_vvvvvxj = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); - vvvvvxj(add_php_batchcopy_vvvvvxj); + var add_php_batchcopy_vvvvvxk = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); + vvvvvxk(add_php_batchcopy_vvvvvxk); - var add_php_batchmove_vvvvvxk = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); - vvvvvxk(add_php_batchmove_vvvvvxk); + var add_php_batchmove_vvvvvxl = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); + vvvvvxl(add_php_batchmove_vvvvvxl); - var add_php_before_publish_vvvvvxl = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); - vvvvvxl(add_php_before_publish_vvvvvxl); + var add_php_before_publish_vvvvvxm = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); + vvvvvxm(add_php_before_publish_vvvvvxm); - var add_php_after_publish_vvvvvxm = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); - vvvvvxm(add_php_after_publish_vvvvvxm); + var add_php_after_publish_vvvvvxn = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); + vvvvvxn(add_php_after_publish_vvvvvxn); - var add_php_before_delete_vvvvvxn = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); - vvvvvxn(add_php_before_delete_vvvvvxn); + var add_php_before_delete_vvvvvxo = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); + vvvvvxo(add_php_before_delete_vvvvvxo); - var add_php_after_delete_vvvvvxo = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); - vvvvvxo(add_php_after_delete_vvvvvxo); + var add_php_after_delete_vvvvvxp = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); + vvvvvxp(add_php_after_delete_vvvvvxp); - var add_php_document_vvvvvxp = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvxp(add_php_document_vvvvvxp); + var add_php_document_vvvvvxq = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvxq(add_php_document_vvvvvxq); - var add_sql_vvvvvxq = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxq(add_sql_vvvvvxq); - - var source_vvvvvxr = jQuery("#jform_source input[type='radio']:checked").val(); var add_sql_vvvvvxr = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxr(source_vvvvvxr,add_sql_vvvvvxr); + vvvvvxr(add_sql_vvvvvxr); - var source_vvvvvxt = jQuery("#jform_source input[type='radio']:checked").val(); - var add_sql_vvvvvxt = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt); + var source_vvvvvxs = jQuery("#jform_source input[type='radio']:checked").val(); + var add_sql_vvvvvxs = jQuery("#jform_add_sql input[type='radio']:checked").val(); + vvvvvxs(source_vvvvvxs,add_sql_vvvvvxs); - var add_custom_import_vvvvvxv = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); - vvvvvxv(add_custom_import_vvvvvxv); + var source_vvvvvxu = jQuery("#jform_source input[type='radio']:checked").val(); + var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val(); + vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu); var add_custom_import_vvvvvxw = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); vvvvvxw(add_custom_import_vvvvvxw); - var add_custom_button_vvvvvxx = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvxx(add_custom_button_vvvvvxx); + var add_custom_import_vvvvvxx = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvxx(add_custom_import_vvvvvxx); + + var add_custom_button_vvvvvxy = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvxy(add_custom_button_vvvvvxy); }); -// the vvvvvwv function -function vvvvvwv(add_css_view_vvvvvwv) +// the vvvvvww function +function vvvvvww(add_css_view_vvvvvww) { // set the function logic - if (add_css_view_vvvvvwv == 1) + if (add_css_view_vvvvvww == 1) { jQuery('#jform_css_view').closest('.control-group').show(); - if (jform_vvvvvwvvwn_required) + if (jform_vvvvvwwvwp_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_vvvvvwvvwn_required = false; + jform_vvvvvwwvwp_required = false; } } else { jQuery('#jform_css_view').closest('.control-group').hide(); - if (!jform_vvvvvwvvwn_required) + if (!jform_vvvvvwwvwp_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_vvvvvwvvwn_required = true; + jform_vvvvvwwvwp_required = true; } } } -// the vvvvvww function -function vvvvvww(add_css_views_vvvvvww) +// the vvvvvwx function +function vvvvvwx(add_css_views_vvvvvwx) { // set the function logic - if (add_css_views_vvvvvww == 1) + if (add_css_views_vvvvvwx == 1) { jQuery('#jform_css_views').closest('.control-group').show(); - if (jform_vvvvvwwvwo_required) + if (jform_vvvvvwxvwq_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_vvvvvwwvwo_required = false; + jform_vvvvvwxvwq_required = false; } } else { jQuery('#jform_css_views').closest('.control-group').hide(); - if (!jform_vvvvvwwvwo_required) + if (!jform_vvvvvwxvwq_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_vvvvvwwvwo_required = true; + jform_vvvvvwxvwq_required = true; } } } -// the vvvvvwx function -function vvvvvwx(add_javascript_view_file_vvvvvwx) +// the vvvvvwy function +function vvvvvwy(add_javascript_view_file_vvvvvwy) { // set the function logic - if (add_javascript_view_file_vvvvvwx == 1) + if (add_javascript_view_file_vvvvvwy == 1) { jQuery('#jform_javascript_view_file').closest('.control-group').show(); - if (jform_vvvvvwxvwp_required) + if (jform_vvvvvwyvwr_required) { updateFieldRequired('javascript_view_file',0); jQuery('#jform_javascript_view_file').prop('required','required'); jQuery('#jform_javascript_view_file').attr('aria-required',true); jQuery('#jform_javascript_view_file').addClass('required'); - jform_vvvvvwxvwp_required = false; + jform_vvvvvwyvwr_required = false; } } else { jQuery('#jform_javascript_view_file').closest('.control-group').hide(); - if (!jform_vvvvvwxvwp_required) + if (!jform_vvvvvwyvwr_required) { updateFieldRequired('javascript_view_file',1); jQuery('#jform_javascript_view_file').removeAttr('required'); jQuery('#jform_javascript_view_file').removeAttr('aria-required'); jQuery('#jform_javascript_view_file').removeClass('required'); - jform_vvvvvwxvwp_required = true; + jform_vvvvvwyvwr_required = true; } } } -// the vvvvvwy function -function vvvvvwy(add_javascript_views_file_vvvvvwy) +// the vvvvvwz function +function vvvvvwz(add_javascript_views_file_vvvvvwz) { // set the function logic - if (add_javascript_views_file_vvvvvwy == 1) + if (add_javascript_views_file_vvvvvwz == 1) { jQuery('#jform_javascript_views_file').closest('.control-group').show(); - if (jform_vvvvvwyvwq_required) + if (jform_vvvvvwzvws_required) { updateFieldRequired('javascript_views_file',0); jQuery('#jform_javascript_views_file').prop('required','required'); jQuery('#jform_javascript_views_file').attr('aria-required',true); jQuery('#jform_javascript_views_file').addClass('required'); - jform_vvvvvwyvwq_required = false; + jform_vvvvvwzvws_required = false; } } else { jQuery('#jform_javascript_views_file').closest('.control-group').hide(); - if (!jform_vvvvvwyvwq_required) + if (!jform_vvvvvwzvws_required) { updateFieldRequired('javascript_views_file',1); jQuery('#jform_javascript_views_file').removeAttr('required'); jQuery('#jform_javascript_views_file').removeAttr('aria-required'); jQuery('#jform_javascript_views_file').removeClass('required'); - jform_vvvvvwyvwq_required = true; + jform_vvvvvwzvws_required = true; } } } -// the vvvvvwz function -function vvvvvwz(add_javascript_view_footer_vvvvvwz) +// the vvvvvxa function +function vvvvvxa(add_javascript_view_footer_vvvvvxa) { // set the function logic - if (add_javascript_view_footer_vvvvvwz == 1) + if (add_javascript_view_footer_vvvvvxa == 1) { jQuery('#jform_javascript_view_footer').closest('.control-group').show(); - if (jform_vvvvvwzvwr_required) + if (jform_vvvvvxavwt_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_vvvvvwzvwr_required = false; + jform_vvvvvxavwt_required = false; } } else { jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); - if (!jform_vvvvvwzvwr_required) + if (!jform_vvvvvxavwt_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_vvvvvwzvwr_required = true; + jform_vvvvvxavwt_required = true; } } } -// the vvvvvxa function -function vvvvvxa(add_javascript_views_footer_vvvvvxa) +// the vvvvvxb function +function vvvvvxb(add_javascript_views_footer_vvvvvxb) { // set the function logic - if (add_javascript_views_footer_vvvvvxa == 1) + if (add_javascript_views_footer_vvvvvxb == 1) { jQuery('#jform_javascript_views_footer').closest('.control-group').show(); - if (jform_vvvvvxavws_required) + if (jform_vvvvvxbvwu_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_vvvvvxavws_required = false; + jform_vvvvvxbvwu_required = false; } } else { jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); - if (!jform_vvvvvxavws_required) + if (!jform_vvvvvxbvwu_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_vvvvvxavws_required = true; + jform_vvvvvxbvwu_required = true; } } } -// the vvvvvxb function -function vvvvvxb(add_php_ajax_vvvvvxb) +// the vvvvvxc function +function vvvvvxc(add_php_ajax_vvvvvxc) { // set the function logic - if (add_php_ajax_vvvvvxb == 1) + if (add_php_ajax_vvvvvxc == 1) { jQuery('#jform_ajax_input').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod').closest('.control-group').show(); - if (jform_vvvvvxbvwt_required) + if (jform_vvvvvxcvwv_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_vvvvvxbvwt_required = false; + jform_vvvvvxcvwv_required = false; } } @@ -349,518 +349,518 @@ function vvvvvxb(add_php_ajax_vvvvvxb) { jQuery('#jform_ajax_input').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod').closest('.control-group').hide(); - if (!jform_vvvvvxbvwt_required) + if (!jform_vvvvvxcvwv_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_vvvvvxbvwt_required = true; + jform_vvvvvxcvwv_required = true; } } } -// the vvvvvxc function -function vvvvvxc(add_php_getitem_vvvvvxc) +// the vvvvvxd function +function vvvvvxd(add_php_getitem_vvvvvxd) { // set the function logic - if (add_php_getitem_vvvvvxc == 1) + if (add_php_getitem_vvvvvxd == 1) { jQuery('#jform_php_getitem').closest('.control-group').show(); - if (jform_vvvvvxcvwu_required) + if (jform_vvvvvxdvww_required) { updateFieldRequired('php_getitem',0); jQuery('#jform_php_getitem').prop('required','required'); jQuery('#jform_php_getitem').attr('aria-required',true); jQuery('#jform_php_getitem').addClass('required'); - jform_vvvvvxcvwu_required = false; + jform_vvvvvxdvww_required = false; } } else { jQuery('#jform_php_getitem').closest('.control-group').hide(); - if (!jform_vvvvvxcvwu_required) + if (!jform_vvvvvxdvww_required) { updateFieldRequired('php_getitem',1); jQuery('#jform_php_getitem').removeAttr('required'); jQuery('#jform_php_getitem').removeAttr('aria-required'); jQuery('#jform_php_getitem').removeClass('required'); - jform_vvvvvxcvwu_required = true; + jform_vvvvvxdvww_required = true; } } } -// the vvvvvxd function -function vvvvvxd(add_php_getitems_vvvvvxd) +// the vvvvvxe function +function vvvvvxe(add_php_getitems_vvvvvxe) { // set the function logic - if (add_php_getitems_vvvvvxd == 1) + if (add_php_getitems_vvvvvxe == 1) { jQuery('#jform_php_getitems').closest('.control-group').show(); - if (jform_vvvvvxdvwv_required) + if (jform_vvvvvxevwx_required) { updateFieldRequired('php_getitems',0); jQuery('#jform_php_getitems').prop('required','required'); jQuery('#jform_php_getitems').attr('aria-required',true); jQuery('#jform_php_getitems').addClass('required'); - jform_vvvvvxdvwv_required = false; + jform_vvvvvxevwx_required = false; } } else { jQuery('#jform_php_getitems').closest('.control-group').hide(); - if (!jform_vvvvvxdvwv_required) + if (!jform_vvvvvxevwx_required) { updateFieldRequired('php_getitems',1); jQuery('#jform_php_getitems').removeAttr('required'); jQuery('#jform_php_getitems').removeAttr('aria-required'); jQuery('#jform_php_getitems').removeClass('required'); - jform_vvvvvxdvwv_required = true; + jform_vvvvvxevwx_required = true; } } } -// the vvvvvxe function -function vvvvvxe(add_php_getitems_after_all_vvvvvxe) +// the vvvvvxf function +function vvvvvxf(add_php_getitems_after_all_vvvvvxf) { // set the function logic - if (add_php_getitems_after_all_vvvvvxe == 1) + if (add_php_getitems_after_all_vvvvvxf == 1) { jQuery('#jform_php_getitems_after_all').closest('.control-group').show(); - if (jform_vvvvvxevww_required) + if (jform_vvvvvxfvwy_required) { updateFieldRequired('php_getitems_after_all',0); jQuery('#jform_php_getitems_after_all').prop('required','required'); jQuery('#jform_php_getitems_after_all').attr('aria-required',true); jQuery('#jform_php_getitems_after_all').addClass('required'); - jform_vvvvvxevww_required = false; + jform_vvvvvxfvwy_required = false; } } else { jQuery('#jform_php_getitems_after_all').closest('.control-group').hide(); - if (!jform_vvvvvxevww_required) + if (!jform_vvvvvxfvwy_required) { updateFieldRequired('php_getitems_after_all',1); jQuery('#jform_php_getitems_after_all').removeAttr('required'); jQuery('#jform_php_getitems_after_all').removeAttr('aria-required'); jQuery('#jform_php_getitems_after_all').removeClass('required'); - jform_vvvvvxevww_required = true; + jform_vvvvvxfvwy_required = true; } } } -// the vvvvvxf function -function vvvvvxf(add_php_getlistquery_vvvvvxf) +// the vvvvvxg function +function vvvvvxg(add_php_getlistquery_vvvvvxg) { // set the function logic - if (add_php_getlistquery_vvvvvxf == 1) + if (add_php_getlistquery_vvvvvxg == 1) { jQuery('#jform_php_getlistquery').closest('.control-group').show(); - if (jform_vvvvvxfvwx_required) + if (jform_vvvvvxgvwz_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_vvvvvxfvwx_required = false; + jform_vvvvvxgvwz_required = false; } } else { jQuery('#jform_php_getlistquery').closest('.control-group').hide(); - if (!jform_vvvvvxfvwx_required) + if (!jform_vvvvvxgvwz_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_vvvvvxfvwx_required = true; + jform_vvvvvxgvwz_required = true; } } } -// the vvvvvxg function -function vvvvvxg(add_php_save_vvvvvxg) +// the vvvvvxh function +function vvvvvxh(add_php_save_vvvvvxh) { // set the function logic - if (add_php_save_vvvvvxg == 1) + if (add_php_save_vvvvvxh == 1) { jQuery('#jform_php_save').closest('.control-group').show(); - if (jform_vvvvvxgvwy_required) + if (jform_vvvvvxhvxa_required) { updateFieldRequired('php_save',0); jQuery('#jform_php_save').prop('required','required'); jQuery('#jform_php_save').attr('aria-required',true); jQuery('#jform_php_save').addClass('required'); - jform_vvvvvxgvwy_required = false; + jform_vvvvvxhvxa_required = false; } } else { jQuery('#jform_php_save').closest('.control-group').hide(); - if (!jform_vvvvvxgvwy_required) + if (!jform_vvvvvxhvxa_required) { updateFieldRequired('php_save',1); jQuery('#jform_php_save').removeAttr('required'); jQuery('#jform_php_save').removeAttr('aria-required'); jQuery('#jform_php_save').removeClass('required'); - jform_vvvvvxgvwy_required = true; + jform_vvvvvxhvxa_required = true; } } } -// the vvvvvxh function -function vvvvvxh(add_php_postsavehook_vvvvvxh) +// the vvvvvxi function +function vvvvvxi(add_php_postsavehook_vvvvvxi) { // set the function logic - if (add_php_postsavehook_vvvvvxh == 1) + if (add_php_postsavehook_vvvvvxi == 1) { jQuery('#jform_php_postsavehook').closest('.control-group').show(); - if (jform_vvvvvxhvwz_required) + if (jform_vvvvvxivxb_required) { updateFieldRequired('php_postsavehook',0); jQuery('#jform_php_postsavehook').prop('required','required'); jQuery('#jform_php_postsavehook').attr('aria-required',true); jQuery('#jform_php_postsavehook').addClass('required'); - jform_vvvvvxhvwz_required = false; + jform_vvvvvxivxb_required = false; } } else { jQuery('#jform_php_postsavehook').closest('.control-group').hide(); - if (!jform_vvvvvxhvwz_required) + if (!jform_vvvvvxivxb_required) { updateFieldRequired('php_postsavehook',1); jQuery('#jform_php_postsavehook').removeAttr('required'); jQuery('#jform_php_postsavehook').removeAttr('aria-required'); jQuery('#jform_php_postsavehook').removeClass('required'); - jform_vvvvvxhvwz_required = true; + jform_vvvvvxivxb_required = true; } } } -// the vvvvvxi function -function vvvvvxi(add_php_allowedit_vvvvvxi) +// the vvvvvxj function +function vvvvvxj(add_php_allowedit_vvvvvxj) { // set the function logic - if (add_php_allowedit_vvvvvxi == 1) + if (add_php_allowedit_vvvvvxj == 1) { jQuery('#jform_php_allowedit').closest('.control-group').show(); - if (jform_vvvvvxivxa_required) + if (jform_vvvvvxjvxc_required) { updateFieldRequired('php_allowedit',0); jQuery('#jform_php_allowedit').prop('required','required'); jQuery('#jform_php_allowedit').attr('aria-required',true); jQuery('#jform_php_allowedit').addClass('required'); - jform_vvvvvxivxa_required = false; + jform_vvvvvxjvxc_required = false; } } else { jQuery('#jform_php_allowedit').closest('.control-group').hide(); - if (!jform_vvvvvxivxa_required) + if (!jform_vvvvvxjvxc_required) { updateFieldRequired('php_allowedit',1); jQuery('#jform_php_allowedit').removeAttr('required'); jQuery('#jform_php_allowedit').removeAttr('aria-required'); jQuery('#jform_php_allowedit').removeClass('required'); - jform_vvvvvxivxa_required = true; + jform_vvvvvxjvxc_required = true; } } } -// the vvvvvxj function -function vvvvvxj(add_php_batchcopy_vvvvvxj) +// the vvvvvxk function +function vvvvvxk(add_php_batchcopy_vvvvvxk) { // set the function logic - if (add_php_batchcopy_vvvvvxj == 1) + if (add_php_batchcopy_vvvvvxk == 1) { jQuery('#jform_php_batchcopy').closest('.control-group').show(); - if (jform_vvvvvxjvxb_required) + if (jform_vvvvvxkvxd_required) { updateFieldRequired('php_batchcopy',0); jQuery('#jform_php_batchcopy').prop('required','required'); jQuery('#jform_php_batchcopy').attr('aria-required',true); jQuery('#jform_php_batchcopy').addClass('required'); - jform_vvvvvxjvxb_required = false; + jform_vvvvvxkvxd_required = false; } } else { jQuery('#jform_php_batchcopy').closest('.control-group').hide(); - if (!jform_vvvvvxjvxb_required) + if (!jform_vvvvvxkvxd_required) { updateFieldRequired('php_batchcopy',1); jQuery('#jform_php_batchcopy').removeAttr('required'); jQuery('#jform_php_batchcopy').removeAttr('aria-required'); jQuery('#jform_php_batchcopy').removeClass('required'); - jform_vvvvvxjvxb_required = true; + jform_vvvvvxkvxd_required = true; } } } -// the vvvvvxk function -function vvvvvxk(add_php_batchmove_vvvvvxk) +// the vvvvvxl function +function vvvvvxl(add_php_batchmove_vvvvvxl) { // set the function logic - if (add_php_batchmove_vvvvvxk == 1) + if (add_php_batchmove_vvvvvxl == 1) { jQuery('#jform_php_batchmove').closest('.control-group').show(); - if (jform_vvvvvxkvxc_required) + if (jform_vvvvvxlvxe_required) { updateFieldRequired('php_batchmove',0); jQuery('#jform_php_batchmove').prop('required','required'); jQuery('#jform_php_batchmove').attr('aria-required',true); jQuery('#jform_php_batchmove').addClass('required'); - jform_vvvvvxkvxc_required = false; + jform_vvvvvxlvxe_required = false; } } else { jQuery('#jform_php_batchmove').closest('.control-group').hide(); - if (!jform_vvvvvxkvxc_required) + if (!jform_vvvvvxlvxe_required) { updateFieldRequired('php_batchmove',1); jQuery('#jform_php_batchmove').removeAttr('required'); jQuery('#jform_php_batchmove').removeAttr('aria-required'); jQuery('#jform_php_batchmove').removeClass('required'); - jform_vvvvvxkvxc_required = true; + jform_vvvvvxlvxe_required = true; } } } -// the vvvvvxl function -function vvvvvxl(add_php_before_publish_vvvvvxl) +// the vvvvvxm function +function vvvvvxm(add_php_before_publish_vvvvvxm) { // set the function logic - if (add_php_before_publish_vvvvvxl == 1) + if (add_php_before_publish_vvvvvxm == 1) { jQuery('#jform_php_before_publish').closest('.control-group').show(); - if (jform_vvvvvxlvxd_required) + if (jform_vvvvvxmvxf_required) { updateFieldRequired('php_before_publish',0); jQuery('#jform_php_before_publish').prop('required','required'); jQuery('#jform_php_before_publish').attr('aria-required',true); jQuery('#jform_php_before_publish').addClass('required'); - jform_vvvvvxlvxd_required = false; + jform_vvvvvxmvxf_required = false; } } else { jQuery('#jform_php_before_publish').closest('.control-group').hide(); - if (!jform_vvvvvxlvxd_required) + if (!jform_vvvvvxmvxf_required) { updateFieldRequired('php_before_publish',1); jQuery('#jform_php_before_publish').removeAttr('required'); jQuery('#jform_php_before_publish').removeAttr('aria-required'); jQuery('#jform_php_before_publish').removeClass('required'); - jform_vvvvvxlvxd_required = true; + jform_vvvvvxmvxf_required = true; } } } -// the vvvvvxm function -function vvvvvxm(add_php_after_publish_vvvvvxm) +// the vvvvvxn function +function vvvvvxn(add_php_after_publish_vvvvvxn) { // set the function logic - if (add_php_after_publish_vvvvvxm == 1) + if (add_php_after_publish_vvvvvxn == 1) { jQuery('#jform_php_after_publish').closest('.control-group').show(); - if (jform_vvvvvxmvxe_required) + if (jform_vvvvvxnvxg_required) { updateFieldRequired('php_after_publish',0); jQuery('#jform_php_after_publish').prop('required','required'); jQuery('#jform_php_after_publish').attr('aria-required',true); jQuery('#jform_php_after_publish').addClass('required'); - jform_vvvvvxmvxe_required = false; + jform_vvvvvxnvxg_required = false; } } else { jQuery('#jform_php_after_publish').closest('.control-group').hide(); - if (!jform_vvvvvxmvxe_required) + if (!jform_vvvvvxnvxg_required) { updateFieldRequired('php_after_publish',1); jQuery('#jform_php_after_publish').removeAttr('required'); jQuery('#jform_php_after_publish').removeAttr('aria-required'); jQuery('#jform_php_after_publish').removeClass('required'); - jform_vvvvvxmvxe_required = true; + jform_vvvvvxnvxg_required = true; } } } -// the vvvvvxn function -function vvvvvxn(add_php_before_delete_vvvvvxn) +// the vvvvvxo function +function vvvvvxo(add_php_before_delete_vvvvvxo) { // set the function logic - if (add_php_before_delete_vvvvvxn == 1) + if (add_php_before_delete_vvvvvxo == 1) { jQuery('#jform_php_before_delete').closest('.control-group').show(); - if (jform_vvvvvxnvxf_required) + if (jform_vvvvvxovxh_required) { updateFieldRequired('php_before_delete',0); jQuery('#jform_php_before_delete').prop('required','required'); jQuery('#jform_php_before_delete').attr('aria-required',true); jQuery('#jform_php_before_delete').addClass('required'); - jform_vvvvvxnvxf_required = false; + jform_vvvvvxovxh_required = false; } } else { jQuery('#jform_php_before_delete').closest('.control-group').hide(); - if (!jform_vvvvvxnvxf_required) + if (!jform_vvvvvxovxh_required) { updateFieldRequired('php_before_delete',1); jQuery('#jform_php_before_delete').removeAttr('required'); jQuery('#jform_php_before_delete').removeAttr('aria-required'); jQuery('#jform_php_before_delete').removeClass('required'); - jform_vvvvvxnvxf_required = true; + jform_vvvvvxovxh_required = true; } } } -// the vvvvvxo function -function vvvvvxo(add_php_after_delete_vvvvvxo) +// the vvvvvxp function +function vvvvvxp(add_php_after_delete_vvvvvxp) { // set the function logic - if (add_php_after_delete_vvvvvxo == 1) + if (add_php_after_delete_vvvvvxp == 1) { jQuery('#jform_php_after_delete').closest('.control-group').show(); - if (jform_vvvvvxovxg_required) + if (jform_vvvvvxpvxi_required) { updateFieldRequired('php_after_delete',0); jQuery('#jform_php_after_delete').prop('required','required'); jQuery('#jform_php_after_delete').attr('aria-required',true); jQuery('#jform_php_after_delete').addClass('required'); - jform_vvvvvxovxg_required = false; + jform_vvvvvxpvxi_required = false; } } else { jQuery('#jform_php_after_delete').closest('.control-group').hide(); - if (!jform_vvvvvxovxg_required) + if (!jform_vvvvvxpvxi_required) { updateFieldRequired('php_after_delete',1); jQuery('#jform_php_after_delete').removeAttr('required'); jQuery('#jform_php_after_delete').removeAttr('aria-required'); jQuery('#jform_php_after_delete').removeClass('required'); - jform_vvvvvxovxg_required = true; + jform_vvvvvxpvxi_required = true; } } } -// the vvvvvxp function -function vvvvvxp(add_php_document_vvvvvxp) +// the vvvvvxq function +function vvvvvxq(add_php_document_vvvvvxq) { // set the function logic - if (add_php_document_vvvvvxp == 1) + if (add_php_document_vvvvvxq == 1) { jQuery('#jform_php_document').closest('.control-group').show(); - if (jform_vvvvvxpvxh_required) + if (jform_vvvvvxqvxj_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_vvvvvxpvxh_required = false; + jform_vvvvvxqvxj_required = false; } } else { jQuery('#jform_php_document').closest('.control-group').hide(); - if (!jform_vvvvvxpvxh_required) + if (!jform_vvvvvxqvxj_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_vvvvvxpvxh_required = true; + jform_vvvvvxqvxj_required = true; } } } -// the vvvvvxq function -function vvvvvxq(add_sql_vvvvvxq) +// the vvvvvxr function +function vvvvvxr(add_sql_vvvvvxr) { // set the function logic - if (add_sql_vvvvvxq == 1) + if (add_sql_vvvvvxr == 1) { jQuery('#jform_source').closest('.control-group').show(); - if (jform_vvvvvxqvxi_required) + if (jform_vvvvvxrvxk_required) { updateFieldRequired('source',0); jQuery('#jform_source').prop('required','required'); jQuery('#jform_source').attr('aria-required',true); jQuery('#jform_source').addClass('required'); - jform_vvvvvxqvxi_required = false; + jform_vvvvvxrvxk_required = false; } } else { jQuery('#jform_source').closest('.control-group').hide(); - if (!jform_vvvvvxqvxi_required) + if (!jform_vvvvvxrvxk_required) { updateFieldRequired('source',1); jQuery('#jform_source').removeAttr('required'); jQuery('#jform_source').removeAttr('aria-required'); jQuery('#jform_source').removeClass('required'); - jform_vvvvvxqvxi_required = true; + jform_vvvvvxrvxk_required = true; } } } -// the vvvvvxr function -function vvvvvxr(source_vvvvvxr,add_sql_vvvvvxr) +// the vvvvvxs function +function vvvvvxs(source_vvvvvxs,add_sql_vvvvvxs) { // set the function logic - if (source_vvvvvxr == 2 && add_sql_vvvvvxr == 1) + if (source_vvvvvxs == 2 && add_sql_vvvvvxs == 1) { jQuery('#jform_sql').closest('.control-group').show(); - if (jform_vvvvvxrvxj_required) + if (jform_vvvvvxsvxl_required) { updateFieldRequired('sql',0); jQuery('#jform_sql').prop('required','required'); jQuery('#jform_sql').attr('aria-required',true); jQuery('#jform_sql').addClass('required'); - jform_vvvvvxrvxj_required = false; + jform_vvvvvxsvxl_required = false; } } else { jQuery('#jform_sql').closest('.control-group').hide(); - if (!jform_vvvvvxrvxj_required) + if (!jform_vvvvvxsvxl_required) { updateFieldRequired('sql',1); jQuery('#jform_sql').removeAttr('required'); jQuery('#jform_sql').removeAttr('aria-required'); jQuery('#jform_sql').removeClass('required'); - jform_vvvvvxrvxj_required = true; + jform_vvvvvxsvxl_required = true; } } } -// the vvvvvxt function -function vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt) +// the vvvvvxu function +function vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu) { // set the function logic - if (source_vvvvvxt == 1 && add_sql_vvvvvxt == 1) + if (source_vvvvvxu == 1 && add_sql_vvvvvxu == 1) { jQuery('#jform_addtables').closest('.control-group').show(); } @@ -870,120 +870,120 @@ function vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt) } } -// the vvvvvxv function -function vvvvvxv(add_custom_import_vvvvvxv) +// the vvvvvxw function +function vvvvvxw(add_custom_import_vvvvvxw) { // set the function logic - if (add_custom_import_vvvvvxv == 1) + if (add_custom_import_vvvvvxw == 1) { jQuery('#jform_html_import_view').closest('.control-group').show(); - if (jform_vvvvvxvvxk_required) + if (jform_vvvvvxwvxm_required) { updateFieldRequired('html_import_view',0); jQuery('#jform_html_import_view').prop('required','required'); jQuery('#jform_html_import_view').attr('aria-required',true); jQuery('#jform_html_import_view').addClass('required'); - jform_vvvvvxvvxk_required = false; + jform_vvvvvxwvxm_required = false; } jQuery('.note_advanced_import').closest('.control-group').show(); jQuery('#jform_php_import_display').closest('.control-group').show(); - if (jform_vvvvvxvvxl_required) + if (jform_vvvvvxwvxn_required) { updateFieldRequired('php_import_display',0); jQuery('#jform_php_import_display').prop('required','required'); jQuery('#jform_php_import_display').attr('aria-required',true); jQuery('#jform_php_import_display').addClass('required'); - jform_vvvvvxvvxl_required = false; + jform_vvvvvxwvxn_required = false; } jQuery('#jform_php_import').closest('.control-group').show(); - if (jform_vvvvvxvvxm_required) + if (jform_vvvvvxwvxo_required) { updateFieldRequired('php_import',0); jQuery('#jform_php_import').prop('required','required'); jQuery('#jform_php_import').attr('aria-required',true); jQuery('#jform_php_import').addClass('required'); - jform_vvvvvxvvxm_required = false; + jform_vvvvvxwvxo_required = false; } jQuery('#jform_php_import_save').closest('.control-group').show(); - if (jform_vvvvvxvvxn_required) + if (jform_vvvvvxwvxp_required) { updateFieldRequired('php_import_save',0); jQuery('#jform_php_import_save').prop('required','required'); jQuery('#jform_php_import_save').attr('aria-required',true); jQuery('#jform_php_import_save').addClass('required'); - jform_vvvvvxvvxn_required = false; + jform_vvvvvxwvxp_required = false; } jQuery('#jform_php_import_setdata').closest('.control-group').show(); - if (jform_vvvvvxvvxo_required) + if (jform_vvvvvxwvxq_required) { updateFieldRequired('php_import_setdata',0); jQuery('#jform_php_import_setdata').prop('required','required'); jQuery('#jform_php_import_setdata').attr('aria-required',true); jQuery('#jform_php_import_setdata').addClass('required'); - jform_vvvvvxvvxo_required = false; + jform_vvvvvxwvxq_required = false; } } else { jQuery('#jform_html_import_view').closest('.control-group').hide(); - if (!jform_vvvvvxvvxk_required) + if (!jform_vvvvvxwvxm_required) { updateFieldRequired('html_import_view',1); jQuery('#jform_html_import_view').removeAttr('required'); jQuery('#jform_html_import_view').removeAttr('aria-required'); jQuery('#jform_html_import_view').removeClass('required'); - jform_vvvvvxvvxk_required = true; + jform_vvvvvxwvxm_required = true; } jQuery('.note_advanced_import').closest('.control-group').hide(); jQuery('#jform_php_import_display').closest('.control-group').hide(); - if (!jform_vvvvvxvvxl_required) + if (!jform_vvvvvxwvxn_required) { updateFieldRequired('php_import_display',1); jQuery('#jform_php_import_display').removeAttr('required'); jQuery('#jform_php_import_display').removeAttr('aria-required'); jQuery('#jform_php_import_display').removeClass('required'); - jform_vvvvvxvvxl_required = true; + jform_vvvvvxwvxn_required = true; } jQuery('#jform_php_import').closest('.control-group').hide(); - if (!jform_vvvvvxvvxm_required) + if (!jform_vvvvvxwvxo_required) { updateFieldRequired('php_import',1); jQuery('#jform_php_import').removeAttr('required'); jQuery('#jform_php_import').removeAttr('aria-required'); jQuery('#jform_php_import').removeClass('required'); - jform_vvvvvxvvxm_required = true; + jform_vvvvvxwvxo_required = true; } jQuery('#jform_php_import_save').closest('.control-group').hide(); - if (!jform_vvvvvxvvxn_required) + if (!jform_vvvvvxwvxp_required) { updateFieldRequired('php_import_save',1); jQuery('#jform_php_import_save').removeAttr('required'); jQuery('#jform_php_import_save').removeAttr('aria-required'); jQuery('#jform_php_import_save').removeClass('required'); - jform_vvvvvxvvxn_required = true; + jform_vvvvvxwvxp_required = true; } jQuery('#jform_php_import_setdata').closest('.control-group').hide(); - if (!jform_vvvvvxvvxo_required) + if (!jform_vvvvvxwvxq_required) { updateFieldRequired('php_import_setdata',1); jQuery('#jform_php_import_setdata').removeAttr('required'); jQuery('#jform_php_import_setdata').removeAttr('aria-required'); jQuery('#jform_php_import_setdata').removeClass('required'); - jform_vvvvvxvvxo_required = true; + jform_vvvvvxwvxq_required = true; } } } -// the vvvvvxw function -function vvvvvxw(add_custom_import_vvvvvxw) +// the vvvvvxx function +function vvvvvxx(add_custom_import_vvvvvxx) { // set the function logic - if (add_custom_import_vvvvvxw == 0) + if (add_custom_import_vvvvvxx == 0) { jQuery('.note_beginner_import').closest('.control-group').show(); } @@ -993,31 +993,31 @@ function vvvvvxw(add_custom_import_vvvvvxw) } } -// the vvvvvxx function -function vvvvvxx(add_custom_button_vvvvvxx) +// the vvvvvxy function +function vvvvvxy(add_custom_button_vvvvvxy) { // set the function logic - if (add_custom_button_vvvvvxx == 1) + if (add_custom_button_vvvvvxy == 1) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvxxvxp_required) + if (jform_vvvvvxyvxr_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_vvvvvxxvxp_required = false; + jform_vvvvvxyvxr_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvxxvxq_required) + if (jform_vvvvvxyvxs_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_vvvvvxxvxq_required = false; + jform_vvvvvxyvxs_required = false; } } @@ -1025,22 +1025,22 @@ function vvvvvxx(add_custom_button_vvvvvxx) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvxxvxp_required) + if (!jform_vvvvvxyvxr_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_vvvvvxxvxp_required = true; + jform_vvvvvxyvxr_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvxxvxq_required) + if (!jform_vvvvvxyvxs_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_vvvvvxxvxq_required = true; + jform_vvvvvxyvxs_required = true; } } } diff --git a/admin/models/forms/component.js b/admin/models/forms/component.js index c18fdcab6..16ba93169 100644 --- a/admin/models/forms/component.js +++ b/admin/models/forms/component.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.js @@ -39,6 +39,7 @@ jform_vvvvvwlvwh_required = false; jform_vvvvvwmvwi_required = false; jform_vvvvvwnvwj_required = false; jform_vvvvvwuvwk_required = false; +jform_vvvvvwvvwl_required = false; // Initial Script jQuery(document).ready(function() @@ -118,6 +119,9 @@ jQuery(document).ready(function() var add_update_server_vvvvvwu = jQuery("#jform_add_update_server input[type='radio']:checked").val(); vvvvvwu(add_update_server_vvvvvwu); + + var buildcomp_vvvvvwv = jQuery("#jform_buildcomp input[type='radio']:checked").val(); + vvvvvwv(buildcomp_vvvvvwv); }); // the vvvvvvv function @@ -740,6 +744,37 @@ function vvvvvwu(add_update_server_vvvvvwu) } } +// the vvvvvwv function +function vvvvvwv(buildcomp_vvvvvwv) +{ + // set the function logic + if (buildcomp_vvvvvwv == 1) + { + jQuery('#jform_buildcompsql').closest('.control-group').show(); + if (jform_vvvvvwvvwl_required) + { + updateFieldRequired('buildcompsql',0); + jQuery('#jform_buildcompsql').prop('required','required'); + jQuery('#jform_buildcompsql').attr('aria-required',true); + jQuery('#jform_buildcompsql').addClass('required'); + jform_vvvvvwvvwl_required = false; + } + + } + else + { + jQuery('#jform_buildcompsql').closest('.control-group').hide(); + if (!jform_vvvvvwvvwl_required) + { + updateFieldRequired('buildcompsql',1); + jQuery('#jform_buildcompsql').removeAttr('required'); + jQuery('#jform_buildcompsql').removeAttr('aria-required'); + jQuery('#jform_buildcompsql').removeClass('required'); + jform_vvvvvwvvwl_required = true; + } + } +} + // update required fields function updateFieldRequired(name,status) { diff --git a/admin/models/forms/component.xml b/admin/models/forms/component.xml index 3b646a265..ff9c97100 100644 --- a/admin/models/forms/component.xml +++ b/admin/models/forms/component.xml @@ -197,28 +197,29 @@ - - - - - + + + + + + + + + - + + type="radio" + name="add_sql" + label="COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - - + + + + + + - + - - - - + type="textarea" + name="css" + label="COM_COMPONENTBUILDER_COMPONENT_CSS_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_COMPONENT_CSS_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_COMPONENT_CSS_HINT" + required="true" + /> COM_COMPONENTBUILDER_COMPONENT_NO - + + type="radio" + name="add_php_helper_site" + label="COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_HELPER_SITE_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + - - - + type="repeatable" + name="dashboard_tab" + label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_TAB_LABEL" + id="dashboard_tab" + class="dashboard_tabs" + select="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_TAB_SELECT" + icon="list" + maximum="5" + filter="raw"> + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + COM_COMPONENTBUILDER_COMPONENT_YES @@ -882,26 +934,28 @@ hint="COM_COMPONENTBUILDER_COMPONENT_LICENSE_HINT" required="true" /> - - - - - + + + + + + + + + @@ -1522,20 +1576,19 @@ - + - - - - + type="textarea" + name="php_helper_both" + label="COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_BOTH_LABEL" + rows="80" + cols="15" + description="COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_BOTH_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_BOTH_HINT" + required="true" + /> - + - - - - + type="textarea" + name="php_helper_admin" + label="COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_ADMIN_LABEL" + rows="80" + cols="15" + description="COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_ADMIN_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_ADMIN_HINT" + required="true" + /> - + - - - - - - - + type="textarea" + name="php_admin_event" + label="COM_COMPONENTBUILDER_COMPONENT_PHP_ADMIN_EVENT_LABEL" + rows="17" + cols="5" + description="COM_COMPONENTBUILDER_COMPONENT_PHP_ADMIN_EVENT_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_COMPONENT_PHP_ADMIN_EVENT_HINT" + required="true" + /> + + + - - - - + type="textarea" + name="php_helper_site" + label="COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_SITE_LABEL" + rows="80" + cols="15" + description="COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_SITE_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_SITE_HINT" + required="true" + /> - + - - - - + type="textarea" + name="php_site_event" + label="COM_COMPONENTBUILDER_COMPONENT_PHP_SITE_EVENT_LABEL" + rows="17" + cols="5" + description="COM_COMPONENTBUILDER_COMPONENT_PHP_SITE_EVENT_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_COMPONENT_PHP_SITE_EVENT_HINT" + required="true" + /> - + + + + + + + + + @@ -2314,83 +2393,6 @@ - - - - - - - - - - - - - + - - - + type="radio" + name="add_php_preflight_update" + label="COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_PREFLIGHT_UPDATE_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + + + + + type="radio" + name="add_php_postflight_install" + label="COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_POSTFLIGHT_INSTALL_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + + type="radio" + name="add_php_postflight_update" + label="COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_POSTFLIGHT_UPDATE_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + + type="radio" + name="add_php_method_uninstall" + label="COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_METHOD_UNINSTALL_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + + type="radio" + name="addreadme" + label="COM_COMPONENTBUILDER_COMPONENT_ADDREADME_LABEL" + class="btn-group btn-group-yesno" + default="0"> + + + + - - + + COM_COMPONENTBUILDER_COMPONENT_NO - + + + + + + + + + + + + + diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js index a871a6763..4a1ed0fff 100644 --- a/admin/models/forms/custom_admin_view.js +++ b/admin/models/forms/custom_admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.js @@ -23,255 +23,255 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvxyvxs_required = false; -jform_vvvvvxzvxt_required = false; -jform_vvvvvyavxu_required = false; -jform_vvvvvybvxv_required = false; -jform_vvvvvycvxw_required = false; -jform_vvvvvydvxx_required = false; -jform_vvvvvyevxy_required = false; +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_vvvvvyfvyb_required = false; +jform_vvvvvygvyc_required = false; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvxy = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvxy(add_php_view_vvvvvxy); + var add_php_view_vvvvvxz = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvxz(add_php_view_vvvvvxz); - var add_php_jview_display_vvvvvxz = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); - vvvvvxz(add_php_jview_display_vvvvvxz); + var add_php_jview_display_vvvvvya = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); + vvvvvya(add_php_jview_display_vvvvvya); - var add_php_jview_vvvvvya = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); - vvvvvya(add_php_jview_vvvvvya); + var add_php_jview_vvvvvyb = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); + vvvvvyb(add_php_jview_vvvvvyb); - var add_php_document_vvvvvyb = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvyb(add_php_document_vvvvvyb); + var add_php_document_vvvvvyc = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvyc(add_php_document_vvvvvyc); - var add_css_document_vvvvvyc = jQuery("#jform_add_css_document input[type='radio']:checked").val(); - vvvvvyc(add_css_document_vvvvvyc); + var add_css_document_vvvvvyd = jQuery("#jform_add_css_document input[type='radio']:checked").val(); + vvvvvyd(add_css_document_vvvvvyd); - var add_js_document_vvvvvyd = jQuery("#jform_add_js_document input[type='radio']:checked").val(); - vvvvvyd(add_js_document_vvvvvyd); + var add_js_document_vvvvvye = jQuery("#jform_add_js_document input[type='radio']:checked").val(); + vvvvvye(add_js_document_vvvvvye); - var add_custom_button_vvvvvye = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvye(add_custom_button_vvvvvye); + var add_custom_button_vvvvvyf = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvyf(add_custom_button_vvvvvyf); - var add_css_vvvvvyf = jQuery("#jform_add_css input[type='radio']:checked").val(); - vvvvvyf(add_css_vvvvvyf); + var add_css_vvvvvyg = jQuery("#jform_add_css input[type='radio']:checked").val(); + vvvvvyg(add_css_vvvvvyg); }); -// the vvvvvxy function -function vvvvvxy(add_php_view_vvvvvxy) +// the vvvvvxz function +function vvvvvxz(add_php_view_vvvvvxz) { // set the function logic - if (add_php_view_vvvvvxy == 1) + if (add_php_view_vvvvvxz == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvxyvxs_required) + if (jform_vvvvvxzvxu_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_vvvvvxyvxs_required = false; + jform_vvvvvxzvxu_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvxyvxs_required) + if (!jform_vvvvvxzvxu_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_vvvvvxyvxs_required = true; + jform_vvvvvxzvxu_required = true; } } } -// the vvvvvxz function -function vvvvvxz(add_php_jview_display_vvvvvxz) +// the vvvvvya function +function vvvvvya(add_php_jview_display_vvvvvya) { // set the function logic - if (add_php_jview_display_vvvvvxz == 1) + if (add_php_jview_display_vvvvvya == 1) { jQuery('#jform_php_jview_display').closest('.control-group').show(); - if (jform_vvvvvxzvxt_required) + if (jform_vvvvvyavxv_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_vvvvvxzvxt_required = false; + jform_vvvvvyavxv_required = false; } } else { jQuery('#jform_php_jview_display').closest('.control-group').hide(); - if (!jform_vvvvvxzvxt_required) + if (!jform_vvvvvyavxv_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_vvvvvxzvxt_required = true; + jform_vvvvvyavxv_required = true; } } } -// the vvvvvya function -function vvvvvya(add_php_jview_vvvvvya) +// the vvvvvyb function +function vvvvvyb(add_php_jview_vvvvvyb) { // set the function logic - if (add_php_jview_vvvvvya == 1) + if (add_php_jview_vvvvvyb == 1) { jQuery('#jform_php_jview').closest('.control-group').show(); - if (jform_vvvvvyavxu_required) + if (jform_vvvvvybvxw_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_vvvvvyavxu_required = false; + jform_vvvvvybvxw_required = false; } } else { jQuery('#jform_php_jview').closest('.control-group').hide(); - if (!jform_vvvvvyavxu_required) + if (!jform_vvvvvybvxw_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_vvvvvyavxu_required = true; + jform_vvvvvybvxw_required = true; } } } -// the vvvvvyb function -function vvvvvyb(add_php_document_vvvvvyb) +// the vvvvvyc function +function vvvvvyc(add_php_document_vvvvvyc) { // set the function logic - if (add_php_document_vvvvvyb == 1) + if (add_php_document_vvvvvyc == 1) { jQuery('#jform_php_document').closest('.control-group').show(); - if (jform_vvvvvybvxv_required) + if (jform_vvvvvycvxx_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_vvvvvybvxv_required = false; + jform_vvvvvycvxx_required = false; } } else { jQuery('#jform_php_document').closest('.control-group').hide(); - if (!jform_vvvvvybvxv_required) + if (!jform_vvvvvycvxx_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_vvvvvybvxv_required = true; + jform_vvvvvycvxx_required = true; } } } -// the vvvvvyc function -function vvvvvyc(add_css_document_vvvvvyc) +// the vvvvvyd function +function vvvvvyd(add_css_document_vvvvvyd) { // set the function logic - if (add_css_document_vvvvvyc == 1) + if (add_css_document_vvvvvyd == 1) { jQuery('#jform_css_document').closest('.control-group').show(); - if (jform_vvvvvycvxw_required) + if (jform_vvvvvydvxy_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_vvvvvycvxw_required = false; + jform_vvvvvydvxy_required = false; } } else { jQuery('#jform_css_document').closest('.control-group').hide(); - if (!jform_vvvvvycvxw_required) + if (!jform_vvvvvydvxy_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_vvvvvycvxw_required = true; + jform_vvvvvydvxy_required = true; } } } -// the vvvvvyd function -function vvvvvyd(add_js_document_vvvvvyd) +// the vvvvvye function +function vvvvvye(add_js_document_vvvvvye) { // set the function logic - if (add_js_document_vvvvvyd == 1) + if (add_js_document_vvvvvye == 1) { jQuery('#jform_js_document').closest('.control-group').show(); - if (jform_vvvvvydvxx_required) + if (jform_vvvvvyevxz_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_vvvvvydvxx_required = false; + jform_vvvvvyevxz_required = false; } } else { jQuery('#jform_js_document').closest('.control-group').hide(); - if (!jform_vvvvvydvxx_required) + if (!jform_vvvvvyevxz_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_vvvvvydvxx_required = true; + jform_vvvvvyevxz_required = true; } } } -// the vvvvvye function -function vvvvvye(add_custom_button_vvvvvye) +// the vvvvvyf function +function vvvvvyf(add_custom_button_vvvvvyf) { // set the function logic - if (add_custom_button_vvvvvye == 1) + if (add_custom_button_vvvvvyf == 1) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvyevxy_required) + if (jform_vvvvvyfvya_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_vvvvvyevxy_required = false; + jform_vvvvvyfvya_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvyevxz_required) + if (jform_vvvvvyfvyb_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_vvvvvyevxz_required = false; + jform_vvvvvyfvyb_required = false; } } @@ -279,53 +279,53 @@ function vvvvvye(add_custom_button_vvvvvye) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvyevxy_required) + if (!jform_vvvvvyfvya_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_vvvvvyevxy_required = true; + jform_vvvvvyfvya_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvyevxz_required) + if (!jform_vvvvvyfvyb_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_vvvvvyevxz_required = true; + jform_vvvvvyfvyb_required = true; } } } -// the vvvvvyf function -function vvvvvyf(add_css_vvvvvyf) +// the vvvvvyg function +function vvvvvyg(add_css_vvvvvyg) { // set the function logic - if (add_css_vvvvvyf == 1) + if (add_css_vvvvvyg == 1) { jQuery('#jform_css').closest('.control-group').show(); - if (jform_vvvvvyfvya_required) + if (jform_vvvvvygvyc_required) { updateFieldRequired('css',0); jQuery('#jform_css').prop('required','required'); jQuery('#jform_css').attr('aria-required',true); jQuery('#jform_css').addClass('required'); - jform_vvvvvyfvya_required = false; + jform_vvvvvygvyc_required = false; } } else { jQuery('#jform_css').closest('.control-group').hide(); - if (!jform_vvvvvyfvya_required) + if (!jform_vvvvvygvyc_required) { updateFieldRequired('css',1); jQuery('#jform_css').removeAttr('required'); jQuery('#jform_css').removeAttr('aria-required'); jQuery('#jform_css').removeClass('required'); - jform_vvvvvyfvya_required = true; + jform_vvvvvygvyc_required = true; } } } diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js index 29e88fb36..66f30f20d 100644 --- a/admin/models/forms/dynamic_get.js +++ b/admin/models/forms/dynamic_get.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.js @@ -23,33 +23,30 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvyrvyn_required = false; -jform_vvvvvysvyo_required = false; -jform_vvvvvytvyp_required = false; -jform_vvvvvyuvyq_required = false; -jform_vvvvvyvvyr_required = false; -jform_vvvvvywvys_required = false; -jform_vvvvvzbvyt_required = false; -jform_vvvvvzdvyu_required = false; -jform_vvvvvzevyv_required = false; -jform_vvvvvzgvyw_required = false; -jform_vvvvvzgvyx_required = false; +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_vvvvvzivyz_required = false; -jform_vvvvvzjvza_required = false; -jform_vvvvvzlvzb_required = false; -jform_vvvvvzlvzc_required = false; -jform_vvvvvzlvzd_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; // Initial Script jQuery(document).ready(function() { - var gettype_vvvvvyr = jQuery("#jform_gettype").val(); - vvvvvyr(gettype_vvvvvyr); - - var main_source_vvvvvys = jQuery("#jform_main_source").val(); - vvvvvys(main_source_vvvvvys); + var gettype_vvvvvys = jQuery("#jform_gettype").val(); + vvvvvys(gettype_vvvvvys); var main_source_vvvvvyt = jQuery("#jform_main_source").val(); vvvvvyt(main_source_vvvvvyt); @@ -60,157 +57,105 @@ jQuery(document).ready(function() var main_source_vvvvvyv = jQuery("#jform_main_source").val(); vvvvvyv(main_source_vvvvvyv); - var addcalculation_vvvvvyw = jQuery("#jform_addcalculation input[type='radio']:checked").val(); - vvvvvyw(addcalculation_vvvvvyw); + var main_source_vvvvvyw = jQuery("#jform_main_source").val(); + vvvvvyw(main_source_vvvvvyw); var addcalculation_vvvvvyx = jQuery("#jform_addcalculation input[type='radio']:checked").val(); - var gettype_vvvvvyx = jQuery("#jform_gettype").val(); - vvvvvyx(addcalculation_vvvvvyx,gettype_vvvvvyx); + vvvvvyx(addcalculation_vvvvvyx); var addcalculation_vvvvvyy = jQuery("#jform_addcalculation input[type='radio']:checked").val(); var gettype_vvvvvyy = jQuery("#jform_gettype").val(); vvvvvyy(addcalculation_vvvvvyy,gettype_vvvvvyy); - var main_source_vvvvvzb = jQuery("#jform_main_source").val(); - vvvvvzb(main_source_vvvvvzb); + var addcalculation_vvvvvyz = jQuery("#jform_addcalculation input[type='radio']:checked").val(); + var gettype_vvvvvyz = jQuery("#jform_gettype").val(); + vvvvvyz(addcalculation_vvvvvyz,gettype_vvvvvyz); var main_source_vvvvvzc = jQuery("#jform_main_source").val(); vvvvvzc(main_source_vvvvvzc); - var add_php_before_getitem_vvvvvzd = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val(); - var gettype_vvvvvzd = jQuery("#jform_gettype").val(); - vvvvvzd(add_php_before_getitem_vvvvvzd,gettype_vvvvvzd); + var main_source_vvvvvzd = jQuery("#jform_main_source").val(); + vvvvvzd(main_source_vvvvvzd); - var add_php_after_getitem_vvvvvze = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val(); + var add_php_before_getitem_vvvvvze = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val(); var gettype_vvvvvze = jQuery("#jform_gettype").val(); - vvvvvze(add_php_after_getitem_vvvvvze,gettype_vvvvvze); + vvvvvze(add_php_before_getitem_vvvvvze,gettype_vvvvvze); - var gettype_vvvvvzg = jQuery("#jform_gettype").val(); - vvvvvzg(gettype_vvvvvzg); + var add_php_after_getitem_vvvvvzf = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val(); + var gettype_vvvvvzf = jQuery("#jform_gettype").val(); + vvvvvzf(add_php_after_getitem_vvvvvzf,gettype_vvvvvzf); - var add_php_getlistquery_vvvvvzh = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); var gettype_vvvvvzh = jQuery("#jform_gettype").val(); - vvvvvzh(add_php_getlistquery_vvvvvzh,gettype_vvvvvzh); + vvvvvzh(gettype_vvvvvzh); - var add_php_before_getitems_vvvvvzi = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val(); + var add_php_getlistquery_vvvvvzi = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); var gettype_vvvvvzi = jQuery("#jform_gettype").val(); - vvvvvzi(add_php_before_getitems_vvvvvzi,gettype_vvvvvzi); + vvvvvzi(add_php_getlistquery_vvvvvzi,gettype_vvvvvzi); - var add_php_after_getitems_vvvvvzj = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val(); + var add_php_before_getitems_vvvvvzj = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val(); var gettype_vvvvvzj = jQuery("#jform_gettype").val(); - vvvvvzj(add_php_after_getitems_vvvvvzj,gettype_vvvvvzj); + vvvvvzj(add_php_before_getitems_vvvvvzj,gettype_vvvvvzj); - var gettype_vvvvvzl = jQuery("#jform_gettype").val(); - vvvvvzl(gettype_vvvvvzl); + var add_php_after_getitems_vvvvvzk = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val(); + var gettype_vvvvvzk = jQuery("#jform_gettype").val(); + vvvvvzk(add_php_after_getitems_vvvvvzk,gettype_vvvvvzk); var gettype_vvvvvzm = jQuery("#jform_gettype").val(); vvvvvzm(gettype_vvvvvzm); + + var gettype_vvvvvzn = jQuery("#jform_gettype").val(); + vvvvvzn(gettype_vvvvvzn); }); -// the vvvvvyr function -function vvvvvyr(gettype_vvvvvyr) +// the vvvvvys function +function vvvvvys(gettype_vvvvvys) { - if (isSet(gettype_vvvvvyr) && gettype_vvvvvyr.constructor !== Array) + if (isSet(gettype_vvvvvys) && gettype_vvvvvys.constructor !== Array) { - var temp_vvvvvyr = gettype_vvvvvyr; - var gettype_vvvvvyr = []; - gettype_vvvvvyr.push(temp_vvvvvyr); + var temp_vvvvvys = gettype_vvvvvys; + var gettype_vvvvvys = []; + gettype_vvvvvys.push(temp_vvvvvys); } - else if (!isSet(gettype_vvvvvyr)) + else if (!isSet(gettype_vvvvvys)) { - var gettype_vvvvvyr = []; + var gettype_vvvvvys = []; } - var gettype = gettype_vvvvvyr.some(gettype_vvvvvyr_SomeFunc); + var gettype = gettype_vvvvvys.some(gettype_vvvvvys_SomeFunc); // set this function logic if (gettype) { jQuery('#jform_getcustom').closest('.control-group').show(); - if (jform_vvvvvyrvyn_required) + if (jform_vvvvvysvyp_required) { updateFieldRequired('getcustom',0); jQuery('#jform_getcustom').prop('required','required'); jQuery('#jform_getcustom').attr('aria-required',true); jQuery('#jform_getcustom').addClass('required'); - jform_vvvvvyrvyn_required = false; + jform_vvvvvysvyp_required = false; } } else { jQuery('#jform_getcustom').closest('.control-group').hide(); - if (!jform_vvvvvyrvyn_required) + if (!jform_vvvvvysvyp_required) { updateFieldRequired('getcustom',1); jQuery('#jform_getcustom').removeAttr('required'); jQuery('#jform_getcustom').removeAttr('aria-required'); jQuery('#jform_getcustom').removeClass('required'); - jform_vvvvvyrvyn_required = true; - } - } -} - -// the vvvvvyr Some function -function gettype_vvvvvyr_SomeFunc(gettype_vvvvvyr) -{ - // set the function logic - if (gettype_vvvvvyr == 3 || gettype_vvvvvyr == 4) - { - return true; - } - return false; -} - -// the vvvvvys function -function vvvvvys(main_source_vvvvvys) -{ - if (isSet(main_source_vvvvvys) && main_source_vvvvvys.constructor !== Array) - { - var temp_vvvvvys = main_source_vvvvvys; - var main_source_vvvvvys = []; - main_source_vvvvvys.push(temp_vvvvvys); - } - else if (!isSet(main_source_vvvvvys)) - { - var main_source_vvvvvys = []; - } - var main_source = main_source_vvvvvys.some(main_source_vvvvvys_SomeFunc); - - - // set this function logic - if (main_source) - { - jQuery('#jform_view_table_main').closest('.control-group').show(); - if (jform_vvvvvysvyo_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_vvvvvysvyo_required = false; - } - - } - else - { - jQuery('#jform_view_table_main').closest('.control-group').hide(); - if (!jform_vvvvvysvyo_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_vvvvvysvyo_required = true; + jform_vvvvvysvyp_required = true; } } } // the vvvvvys Some function -function main_source_vvvvvys_SomeFunc(main_source_vvvvvys) +function gettype_vvvvvys_SomeFunc(gettype_vvvvvys) { // set the function logic - if (main_source_vvvvvys == 1) + if (gettype_vvvvvys == 3 || gettype_vvvvvys == 4) { return true; } @@ -236,27 +181,27 @@ function vvvvvyt(main_source_vvvvvyt) // set this function logic if (main_source) { - jQuery('#jform_view_selection').closest('.control-group').show(); - if (jform_vvvvvytvyp_required) + jQuery('#jform_view_table_main').closest('.control-group').show(); + if (jform_vvvvvytvyq_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_vvvvvytvyp_required = false; + 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; } } else { - jQuery('#jform_view_selection').closest('.control-group').hide(); - if (!jform_vvvvvytvyp_required) + jQuery('#jform_view_table_main').closest('.control-group').hide(); + if (!jform_vvvvvytvyq_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_vvvvvytvyp_required = true; + 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; } } } @@ -291,27 +236,27 @@ function vvvvvyu(main_source_vvvvvyu) // set this function logic if (main_source) { - jQuery('#jform_db_table_main').closest('.control-group').show(); - if (jform_vvvvvyuvyq_required) + jQuery('#jform_view_selection').closest('.control-group').show(); + if (jform_vvvvvyuvyr_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_vvvvvyuvyq_required = false; + 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; } } else { - jQuery('#jform_db_table_main').closest('.control-group').hide(); - if (!jform_vvvvvyuvyq_required) + jQuery('#jform_view_selection').closest('.control-group').hide(); + if (!jform_vvvvvyuvyr_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_vvvvvyuvyq_required = true; + 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; } } } @@ -320,7 +265,7 @@ function vvvvvyu(main_source_vvvvvyu) function main_source_vvvvvyu_SomeFunc(main_source_vvvvvyu) { // set the function logic - if (main_source_vvvvvyu == 2) + if (main_source_vvvvvyu == 1) { return true; } @@ -346,27 +291,27 @@ function vvvvvyv(main_source_vvvvvyv) // set this function logic if (main_source) { - jQuery('#jform_db_selection').closest('.control-group').show(); - if (jform_vvvvvyvvyr_required) + jQuery('#jform_db_table_main').closest('.control-group').show(); + if (jform_vvvvvyvvys_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_vvvvvyvvyr_required = false; + 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; } } else { - jQuery('#jform_db_selection').closest('.control-group').hide(); - if (!jform_vvvvvyvvyr_required) + jQuery('#jform_db_table_main').closest('.control-group').hide(); + if (!jform_vvvvvyvvys_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_vvvvvyvvyr_required = true; + 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; } } } @@ -383,97 +328,91 @@ function main_source_vvvvvyv_SomeFunc(main_source_vvvvvyv) } // the vvvvvyw function -function vvvvvyw(addcalculation_vvvvvyw) +function vvvvvyw(main_source_vvvvvyw) +{ + if (isSet(main_source_vvvvvyw) && main_source_vvvvvyw.constructor !== Array) + { + var temp_vvvvvyw = main_source_vvvvvyw; + var main_source_vvvvvyw = []; + main_source_vvvvvyw.push(temp_vvvvvyw); + } + else if (!isSet(main_source_vvvvvyw)) + { + var main_source_vvvvvyw = []; + } + var main_source = main_source_vvvvvyw.some(main_source_vvvvvyw_SomeFunc); + + + // set this function logic + if (main_source) + { + jQuery('#jform_db_selection').closest('.control-group').show(); + if (jform_vvvvvywvyt_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; + } + + } + else + { + jQuery('#jform_db_selection').closest('.control-group').hide(); + if (!jform_vvvvvywvyt_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; + } + } +} + +// the vvvvvyw Some function +function main_source_vvvvvyw_SomeFunc(main_source_vvvvvyw) { // set the function logic - if (addcalculation_vvvvvyw == 1) + if (main_source_vvvvvyw == 2) + { + return true; + } + return false; +} + +// the vvvvvyx function +function vvvvvyx(addcalculation_vvvvvyx) +{ + // set the function logic + if (addcalculation_vvvvvyx == 1) { jQuery('#jform_php_calculation').closest('.control-group').show(); - if (jform_vvvvvywvys_required) + if (jform_vvvvvyxvyu_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_vvvvvywvys_required = false; + jform_vvvvvyxvyu_required = false; } } else { jQuery('#jform_php_calculation').closest('.control-group').hide(); - if (!jform_vvvvvywvys_required) + if (!jform_vvvvvyxvyu_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_vvvvvywvys_required = true; + jform_vvvvvyxvyu_required = true; } } } -// the vvvvvyx function -function vvvvvyx(addcalculation_vvvvvyx,gettype_vvvvvyx) -{ - if (isSet(addcalculation_vvvvvyx) && addcalculation_vvvvvyx.constructor !== Array) - { - var temp_vvvvvyx = addcalculation_vvvvvyx; - var addcalculation_vvvvvyx = []; - addcalculation_vvvvvyx.push(temp_vvvvvyx); - } - else if (!isSet(addcalculation_vvvvvyx)) - { - var addcalculation_vvvvvyx = []; - } - var addcalculation = addcalculation_vvvvvyx.some(addcalculation_vvvvvyx_SomeFunc); - - if (isSet(gettype_vvvvvyx) && gettype_vvvvvyx.constructor !== Array) - { - var temp_vvvvvyx = gettype_vvvvvyx; - var gettype_vvvvvyx = []; - gettype_vvvvvyx.push(temp_vvvvvyx); - } - else if (!isSet(gettype_vvvvvyx)) - { - var gettype_vvvvvyx = []; - } - var gettype = gettype_vvvvvyx.some(gettype_vvvvvyx_SomeFunc); - - - // set this function logic - if (addcalculation && gettype) - { - jQuery('.note_calculation_item').closest('.control-group').show(); - } - else - { - jQuery('.note_calculation_item').closest('.control-group').hide(); - } -} - -// the vvvvvyx Some function -function addcalculation_vvvvvyx_SomeFunc(addcalculation_vvvvvyx) -{ - // set the function logic - if (addcalculation_vvvvvyx == 1) - { - return true; - } - return false; -} - -// the vvvvvyx Some function -function gettype_vvvvvyx_SomeFunc(gettype_vvvvvyx) -{ - // set the function logic - if (gettype_vvvvvyx == 1 || gettype_vvvvvyx == 3) - { - return true; - } - return false; -} - // the vvvvvyy function function vvvvvyy(addcalculation_vvvvvyy,gettype_vvvvvyy) { @@ -505,11 +444,11 @@ function vvvvvyy(addcalculation_vvvvvyy,gettype_vvvvvyy) // set this function logic if (addcalculation && gettype) { - jQuery('.note_calculation_items').closest('.control-group').show(); + jQuery('.note_calculation_item').closest('.control-group').show(); } else { - jQuery('.note_calculation_items').closest('.control-group').hide(); + jQuery('.note_calculation_item').closest('.control-group').hide(); } } @@ -528,62 +467,68 @@ function addcalculation_vvvvvyy_SomeFunc(addcalculation_vvvvvyy) function gettype_vvvvvyy_SomeFunc(gettype_vvvvvyy) { // set the function logic - if (gettype_vvvvvyy == 2 || gettype_vvvvvyy == 4) + if (gettype_vvvvvyy == 1 || gettype_vvvvvyy == 3) { return true; } return false; } -// the vvvvvzb function -function vvvvvzb(main_source_vvvvvzb) +// the vvvvvyz function +function vvvvvyz(addcalculation_vvvvvyz,gettype_vvvvvyz) { - if (isSet(main_source_vvvvvzb) && main_source_vvvvvzb.constructor !== Array) + if (isSet(addcalculation_vvvvvyz) && addcalculation_vvvvvyz.constructor !== Array) { - var temp_vvvvvzb = main_source_vvvvvzb; - var main_source_vvvvvzb = []; - main_source_vvvvvzb.push(temp_vvvvvzb); + var temp_vvvvvyz = addcalculation_vvvvvyz; + var addcalculation_vvvvvyz = []; + addcalculation_vvvvvyz.push(temp_vvvvvyz); } - else if (!isSet(main_source_vvvvvzb)) + else if (!isSet(addcalculation_vvvvvyz)) { - var main_source_vvvvvzb = []; + var addcalculation_vvvvvyz = []; } - var main_source = main_source_vvvvvzb.some(main_source_vvvvvzb_SomeFunc); + var addcalculation = addcalculation_vvvvvyz.some(addcalculation_vvvvvyz_SomeFunc); + + if (isSet(gettype_vvvvvyz) && gettype_vvvvvyz.constructor !== Array) + { + var temp_vvvvvyz = gettype_vvvvvyz; + var gettype_vvvvvyz = []; + gettype_vvvvvyz.push(temp_vvvvvyz); + } + else if (!isSet(gettype_vvvvvyz)) + { + var gettype_vvvvvyz = []; + } + var gettype = gettype_vvvvvyz.some(gettype_vvvvvyz_SomeFunc); // set this function logic - if (main_source) + if (addcalculation && gettype) { - jQuery('#jform_php_custom_get').closest('.control-group').show(); - if (jform_vvvvvzbvyt_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_vvvvvzbvyt_required = false; - } - + jQuery('.note_calculation_items').closest('.control-group').show(); } else { - jQuery('#jform_php_custom_get').closest('.control-group').hide(); - if (!jform_vvvvvzbvyt_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_vvvvvzbvyt_required = true; - } + jQuery('.note_calculation_items').closest('.control-group').hide(); } } -// the vvvvvzb Some function -function main_source_vvvvvzb_SomeFunc(main_source_vvvvvzb) +// the vvvvvyz Some function +function addcalculation_vvvvvyz_SomeFunc(addcalculation_vvvvvyz) { // set the function logic - if (main_source_vvvvvzb == 3) + if (addcalculation_vvvvvyz == 1) + { + return true; + } + return false; +} + +// the vvvvvyz Some function +function gettype_vvvvvyz_SomeFunc(gettype_vvvvvyz) +{ + // set the function logic + if (gettype_vvvvvyz == 2 || gettype_vvvvvyz == 4) { return true; } @@ -606,6 +551,61 @@ function vvvvvzc(main_source_vvvvvzc) var main_source = main_source_vvvvvzc.some(main_source_vvvvvzc_SomeFunc); + // set this function logic + if (main_source) + { + jQuery('#jform_php_custom_get').closest('.control-group').show(); + if (jform_vvvvvzcvyv_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; + } + + } + else + { + jQuery('#jform_php_custom_get').closest('.control-group').hide(); + if (!jform_vvvvvzcvyv_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; + } + } +} + +// the vvvvvzc Some function +function main_source_vvvvvzc_SomeFunc(main_source_vvvvvzc) +{ + // set the function logic + if (main_source_vvvvvzc == 3) + { + return true; + } + return false; +} + +// the vvvvvzd function +function vvvvvzd(main_source_vvvvvzd) +{ + if (isSet(main_source_vvvvvzd) && main_source_vvvvvzd.constructor !== Array) + { + var temp_vvvvvzd = main_source_vvvvvzd; + var main_source_vvvvvzd = []; + main_source_vvvvvzd.push(temp_vvvvvzd); + } + else if (!isSet(main_source_vvvvvzd)) + { + var main_source_vvvvvzd = []; + } + var main_source = main_source_vvvvvzd.some(main_source_vvvvvzd_SomeFunc); + + // set this function logic if (main_source) { @@ -625,89 +625,11 @@ function vvvvvzc(main_source_vvvvvzc) } } -// the vvvvvzc Some function -function main_source_vvvvvzc_SomeFunc(main_source_vvvvvzc) -{ - // set the function logic - if (main_source_vvvvvzc == 1 || main_source_vvvvvzc == 2) - { - return true; - } - return false; -} - -// the vvvvvzd function -function vvvvvzd(add_php_before_getitem_vvvvvzd,gettype_vvvvvzd) -{ - if (isSet(add_php_before_getitem_vvvvvzd) && add_php_before_getitem_vvvvvzd.constructor !== Array) - { - var temp_vvvvvzd = add_php_before_getitem_vvvvvzd; - var add_php_before_getitem_vvvvvzd = []; - add_php_before_getitem_vvvvvzd.push(temp_vvvvvzd); - } - else if (!isSet(add_php_before_getitem_vvvvvzd)) - { - var add_php_before_getitem_vvvvvzd = []; - } - var add_php_before_getitem = add_php_before_getitem_vvvvvzd.some(add_php_before_getitem_vvvvvzd_SomeFunc); - - if (isSet(gettype_vvvvvzd) && gettype_vvvvvzd.constructor !== Array) - { - var temp_vvvvvzd = gettype_vvvvvzd; - var gettype_vvvvvzd = []; - gettype_vvvvvzd.push(temp_vvvvvzd); - } - else if (!isSet(gettype_vvvvvzd)) - { - var gettype_vvvvvzd = []; - } - var gettype = gettype_vvvvvzd.some(gettype_vvvvvzd_SomeFunc); - - - // set this function logic - if (add_php_before_getitem && gettype) - { - jQuery('#jform_php_before_getitem').closest('.control-group').show(); - if (jform_vvvvvzdvyu_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_vvvvvzdvyu_required = false; - } - - } - else - { - jQuery('#jform_php_before_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzdvyu_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_vvvvvzdvyu_required = true; - } - } -} - // the vvvvvzd Some function -function add_php_before_getitem_vvvvvzd_SomeFunc(add_php_before_getitem_vvvvvzd) +function main_source_vvvvvzd_SomeFunc(main_source_vvvvvzd) { // set the function logic - if (add_php_before_getitem_vvvvvzd == 1) - { - return true; - } - return false; -} - -// the vvvvvzd Some function -function gettype_vvvvvzd_SomeFunc(gettype_vvvvvzd) -{ - // set the function logic - if (gettype_vvvvvzd == 1 || gettype_vvvvvzd == 3) + if (main_source_vvvvvzd == 1 || main_source_vvvvvzd == 2) { return true; } @@ -715,19 +637,19 @@ function gettype_vvvvvzd_SomeFunc(gettype_vvvvvzd) } // the vvvvvze function -function vvvvvze(add_php_after_getitem_vvvvvze,gettype_vvvvvze) +function vvvvvze(add_php_before_getitem_vvvvvze,gettype_vvvvvze) { - if (isSet(add_php_after_getitem_vvvvvze) && add_php_after_getitem_vvvvvze.constructor !== Array) + if (isSet(add_php_before_getitem_vvvvvze) && add_php_before_getitem_vvvvvze.constructor !== Array) { - var temp_vvvvvze = add_php_after_getitem_vvvvvze; - var add_php_after_getitem_vvvvvze = []; - add_php_after_getitem_vvvvvze.push(temp_vvvvvze); + var temp_vvvvvze = add_php_before_getitem_vvvvvze; + var add_php_before_getitem_vvvvvze = []; + add_php_before_getitem_vvvvvze.push(temp_vvvvvze); } - else if (!isSet(add_php_after_getitem_vvvvvze)) + else if (!isSet(add_php_before_getitem_vvvvvze)) { - var add_php_after_getitem_vvvvvze = []; + var add_php_before_getitem_vvvvvze = []; } - var add_php_after_getitem = add_php_after_getitem_vvvvvze.some(add_php_after_getitem_vvvvvze_SomeFunc); + var add_php_before_getitem = add_php_before_getitem_vvvvvze.some(add_php_before_getitem_vvvvvze_SomeFunc); if (isSet(gettype_vvvvvze) && gettype_vvvvvze.constructor !== Array) { @@ -743,38 +665,38 @@ function vvvvvze(add_php_after_getitem_vvvvvze,gettype_vvvvvze) // set this function logic - if (add_php_after_getitem && gettype) + if (add_php_before_getitem && gettype) { - jQuery('#jform_php_after_getitem').closest('.control-group').show(); - if (jform_vvvvvzevyv_required) + jQuery('#jform_php_before_getitem').closest('.control-group').show(); + if (jform_vvvvvzevyw_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_vvvvvzevyv_required = false; + 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; } } else { - jQuery('#jform_php_after_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzevyv_required) + jQuery('#jform_php_before_getitem').closest('.control-group').hide(); + if (!jform_vvvvvzevyw_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_vvvvvzevyv_required = true; + 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; } } } // the vvvvvze Some function -function add_php_after_getitem_vvvvvze_SomeFunc(add_php_after_getitem_vvvvvze) +function add_php_before_getitem_vvvvvze_SomeFunc(add_php_before_getitem_vvvvvze) { // set the function logic - if (add_php_after_getitem_vvvvvze == 1) + if (add_php_before_getitem_vvvvvze == 1) { return true; } @@ -792,74 +714,78 @@ function gettype_vvvvvze_SomeFunc(gettype_vvvvvze) return false; } -// the vvvvvzg function -function vvvvvzg(gettype_vvvvvzg) +// the vvvvvzf function +function vvvvvzf(add_php_after_getitem_vvvvvzf,gettype_vvvvvzf) { - if (isSet(gettype_vvvvvzg) && gettype_vvvvvzg.constructor !== Array) + if (isSet(add_php_after_getitem_vvvvvzf) && add_php_after_getitem_vvvvvzf.constructor !== Array) { - var temp_vvvvvzg = gettype_vvvvvzg; - var gettype_vvvvvzg = []; - gettype_vvvvvzg.push(temp_vvvvvzg); + var temp_vvvvvzf = add_php_after_getitem_vvvvvzf; + var add_php_after_getitem_vvvvvzf = []; + add_php_after_getitem_vvvvvzf.push(temp_vvvvvzf); } - else if (!isSet(gettype_vvvvvzg)) + else if (!isSet(add_php_after_getitem_vvvvvzf)) { - var gettype_vvvvvzg = []; + var add_php_after_getitem_vvvvvzf = []; } - var gettype = gettype_vvvvvzg.some(gettype_vvvvvzg_SomeFunc); + var add_php_after_getitem = add_php_after_getitem_vvvvvzf.some(add_php_after_getitem_vvvvvzf_SomeFunc); + + if (isSet(gettype_vvvvvzf) && gettype_vvvvvzf.constructor !== Array) + { + var temp_vvvvvzf = gettype_vvvvvzf; + var gettype_vvvvvzf = []; + gettype_vvvvvzf.push(temp_vvvvvzf); + } + else if (!isSet(gettype_vvvvvzf)) + { + var gettype_vvvvvzf = []; + } + var gettype = gettype_vvvvvzf.some(gettype_vvvvvzf_SomeFunc); // set this function logic - if (gettype) + if (add_php_after_getitem && gettype) { - jQuery('#jform_add_php_after_getitem').closest('.control-group').show(); - if (jform_vvvvvzgvyw_required) + jQuery('#jform_php_after_getitem').closest('.control-group').show(); + if (jform_vvvvvzfvyx_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_vvvvvzgvyw_required = false; - } - - jQuery('#jform_add_php_before_getitem').closest('.control-group').show(); - if (jform_vvvvvzgvyx_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_vvvvvzgvyx_required = false; + 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; } } else { - jQuery('#jform_add_php_after_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzgvyw_required) + jQuery('#jform_php_after_getitem').closest('.control-group').hide(); + if (!jform_vvvvvzfvyx_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_vvvvvzgvyw_required = true; - } - jQuery('#jform_add_php_before_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzgvyx_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_vvvvvzgvyx_required = true; + 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; } } } -// the vvvvvzg Some function -function gettype_vvvvvzg_SomeFunc(gettype_vvvvvzg) +// the vvvvvzf Some function +function add_php_after_getitem_vvvvvzf_SomeFunc(add_php_after_getitem_vvvvvzf) { // set the function logic - if (gettype_vvvvvzg == 1 || gettype_vvvvvzg == 3) + if (add_php_after_getitem_vvvvvzf == 1) + { + return true; + } + return false; +} + +// the vvvvvzf Some function +function gettype_vvvvvzf_SomeFunc(gettype_vvvvvzf) +{ + // set the function logic + if (gettype_vvvvvzf == 1 || gettype_vvvvvzf == 3) { return true; } @@ -867,20 +793,8 @@ function gettype_vvvvvzg_SomeFunc(gettype_vvvvvzg) } // the vvvvvzh function -function vvvvvzh(add_php_getlistquery_vvvvvzh,gettype_vvvvvzh) +function vvvvvzh(gettype_vvvvvzh) { - if (isSet(add_php_getlistquery_vvvvvzh) && add_php_getlistquery_vvvvvzh.constructor !== Array) - { - var temp_vvvvvzh = add_php_getlistquery_vvvvvzh; - var add_php_getlistquery_vvvvvzh = []; - add_php_getlistquery_vvvvvzh.push(temp_vvvvvzh); - } - else if (!isSet(add_php_getlistquery_vvvvvzh)) - { - var add_php_getlistquery_vvvvvzh = []; - } - var add_php_getlistquery = add_php_getlistquery_vvvvvzh.some(add_php_getlistquery_vvvvvzh_SomeFunc); - if (isSet(gettype_vvvvvzh) && gettype_vvvvvzh.constructor !== Array) { var temp_vvvvvzh = gettype_vvvvvzh; @@ -895,49 +809,57 @@ function vvvvvzh(add_php_getlistquery_vvvvvzh,gettype_vvvvvzh) // set this function logic - if (add_php_getlistquery && gettype) + if (gettype) { - jQuery('#jform_php_getlistquery').closest('.control-group').show(); + jQuery('#jform_add_php_after_getitem').closest('.control-group').show(); if (jform_vvvvvzhvyy_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'); + 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; } + jQuery('#jform_add_php_before_getitem').closest('.control-group').show(); + if (jform_vvvvvzhvyz_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; + } + } else { - jQuery('#jform_php_getlistquery').closest('.control-group').hide(); + jQuery('#jform_add_php_after_getitem').closest('.control-group').hide(); if (!jform_vvvvvzhvyy_required) { - updateFieldRequired('php_getlistquery',1); - jQuery('#jform_php_getlistquery').removeAttr('required'); - jQuery('#jform_php_getlistquery').removeAttr('aria-required'); - jQuery('#jform_php_getlistquery').removeClass('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; } + jQuery('#jform_add_php_before_getitem').closest('.control-group').hide(); + if (!jform_vvvvvzhvyz_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; + } } } -// the vvvvvzh Some function -function add_php_getlistquery_vvvvvzh_SomeFunc(add_php_getlistquery_vvvvvzh) -{ - // set the function logic - if (add_php_getlistquery_vvvvvzh == 1) - { - return true; - } - return false; -} - // the vvvvvzh Some function function gettype_vvvvvzh_SomeFunc(gettype_vvvvvzh) { // set the function logic - if (gettype_vvvvvzh == 2 || gettype_vvvvvzh == 4) + if (gettype_vvvvvzh == 1 || gettype_vvvvvzh == 3) { return true; } @@ -945,19 +867,19 @@ function gettype_vvvvvzh_SomeFunc(gettype_vvvvvzh) } // the vvvvvzi function -function vvvvvzi(add_php_before_getitems_vvvvvzi,gettype_vvvvvzi) +function vvvvvzi(add_php_getlistquery_vvvvvzi,gettype_vvvvvzi) { - if (isSet(add_php_before_getitems_vvvvvzi) && add_php_before_getitems_vvvvvzi.constructor !== Array) + if (isSet(add_php_getlistquery_vvvvvzi) && add_php_getlistquery_vvvvvzi.constructor !== Array) { - var temp_vvvvvzi = add_php_before_getitems_vvvvvzi; - var add_php_before_getitems_vvvvvzi = []; - add_php_before_getitems_vvvvvzi.push(temp_vvvvvzi); + var temp_vvvvvzi = add_php_getlistquery_vvvvvzi; + var add_php_getlistquery_vvvvvzi = []; + add_php_getlistquery_vvvvvzi.push(temp_vvvvvzi); } - else if (!isSet(add_php_before_getitems_vvvvvzi)) + else if (!isSet(add_php_getlistquery_vvvvvzi)) { - var add_php_before_getitems_vvvvvzi = []; + var add_php_getlistquery_vvvvvzi = []; } - var add_php_before_getitems = add_php_before_getitems_vvvvvzi.some(add_php_before_getitems_vvvvvzi_SomeFunc); + var add_php_getlistquery = add_php_getlistquery_vvvvvzi.some(add_php_getlistquery_vvvvvzi_SomeFunc); if (isSet(gettype_vvvvvzi) && gettype_vvvvvzi.constructor !== Array) { @@ -973,38 +895,38 @@ function vvvvvzi(add_php_before_getitems_vvvvvzi,gettype_vvvvvzi) // set this function logic - if (add_php_before_getitems && gettype) + if (add_php_getlistquery && gettype) { - jQuery('#jform_php_before_getitems').closest('.control-group').show(); - if (jform_vvvvvzivyz_required) + jQuery('#jform_php_getlistquery').closest('.control-group').show(); + if (jform_vvvvvzivza_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_vvvvvzivyz_required = false; + 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; } } else { - jQuery('#jform_php_before_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzivyz_required) + jQuery('#jform_php_getlistquery').closest('.control-group').hide(); + if (!jform_vvvvvzivza_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_vvvvvzivyz_required = true; + 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; } } } // the vvvvvzi Some function -function add_php_before_getitems_vvvvvzi_SomeFunc(add_php_before_getitems_vvvvvzi) +function add_php_getlistquery_vvvvvzi_SomeFunc(add_php_getlistquery_vvvvvzi) { // set the function logic - if (add_php_before_getitems_vvvvvzi == 1) + if (add_php_getlistquery_vvvvvzi == 1) { return true; } @@ -1023,19 +945,19 @@ function gettype_vvvvvzi_SomeFunc(gettype_vvvvvzi) } // the vvvvvzj function -function vvvvvzj(add_php_after_getitems_vvvvvzj,gettype_vvvvvzj) +function vvvvvzj(add_php_before_getitems_vvvvvzj,gettype_vvvvvzj) { - if (isSet(add_php_after_getitems_vvvvvzj) && add_php_after_getitems_vvvvvzj.constructor !== Array) + if (isSet(add_php_before_getitems_vvvvvzj) && add_php_before_getitems_vvvvvzj.constructor !== Array) { - var temp_vvvvvzj = add_php_after_getitems_vvvvvzj; - var add_php_after_getitems_vvvvvzj = []; - add_php_after_getitems_vvvvvzj.push(temp_vvvvvzj); + var temp_vvvvvzj = add_php_before_getitems_vvvvvzj; + var add_php_before_getitems_vvvvvzj = []; + add_php_before_getitems_vvvvvzj.push(temp_vvvvvzj); } - else if (!isSet(add_php_after_getitems_vvvvvzj)) + else if (!isSet(add_php_before_getitems_vvvvvzj)) { - var add_php_after_getitems_vvvvvzj = []; + var add_php_before_getitems_vvvvvzj = []; } - var add_php_after_getitems = add_php_after_getitems_vvvvvzj.some(add_php_after_getitems_vvvvvzj_SomeFunc); + var add_php_before_getitems = add_php_before_getitems_vvvvvzj.some(add_php_before_getitems_vvvvvzj_SomeFunc); if (isSet(gettype_vvvvvzj) && gettype_vvvvvzj.constructor !== Array) { @@ -1051,38 +973,38 @@ function vvvvvzj(add_php_after_getitems_vvvvvzj,gettype_vvvvvzj) // set this function logic - if (add_php_after_getitems && gettype) + if (add_php_before_getitems && gettype) { - jQuery('#jform_php_after_getitems').closest('.control-group').show(); - if (jform_vvvvvzjvza_required) + jQuery('#jform_php_before_getitems').closest('.control-group').show(); + if (jform_vvvvvzjvzb_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_vvvvvzjvza_required = false; + 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; } } else { - jQuery('#jform_php_after_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzjvza_required) + jQuery('#jform_php_before_getitems').closest('.control-group').hide(); + if (!jform_vvvvvzjvzb_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_vvvvvzjvza_required = true; + 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; } } } // the vvvvvzj Some function -function add_php_after_getitems_vvvvvzj_SomeFunc(add_php_after_getitems_vvvvvzj) +function add_php_before_getitems_vvvvvzj_SomeFunc(add_php_before_getitems_vvvvvzj) { // set the function logic - if (add_php_after_getitems_vvvvvzj == 1) + if (add_php_before_getitems_vvvvvzj == 1) { return true; } @@ -1100,93 +1022,78 @@ function gettype_vvvvvzj_SomeFunc(gettype_vvvvvzj) return false; } -// the vvvvvzl function -function vvvvvzl(gettype_vvvvvzl) +// the vvvvvzk function +function vvvvvzk(add_php_after_getitems_vvvvvzk,gettype_vvvvvzk) { - if (isSet(gettype_vvvvvzl) && gettype_vvvvvzl.constructor !== Array) + if (isSet(add_php_after_getitems_vvvvvzk) && add_php_after_getitems_vvvvvzk.constructor !== Array) { - var temp_vvvvvzl = gettype_vvvvvzl; - var gettype_vvvvvzl = []; - gettype_vvvvvzl.push(temp_vvvvvzl); + var temp_vvvvvzk = add_php_after_getitems_vvvvvzk; + var add_php_after_getitems_vvvvvzk = []; + add_php_after_getitems_vvvvvzk.push(temp_vvvvvzk); } - else if (!isSet(gettype_vvvvvzl)) + else if (!isSet(add_php_after_getitems_vvvvvzk)) { - var gettype_vvvvvzl = []; + var add_php_after_getitems_vvvvvzk = []; } - var gettype = gettype_vvvvvzl.some(gettype_vvvvvzl_SomeFunc); + var add_php_after_getitems = add_php_after_getitems_vvvvvzk.some(add_php_after_getitems_vvvvvzk_SomeFunc); + + if (isSet(gettype_vvvvvzk) && gettype_vvvvvzk.constructor !== Array) + { + var temp_vvvvvzk = gettype_vvvvvzk; + var gettype_vvvvvzk = []; + gettype_vvvvvzk.push(temp_vvvvvzk); + } + else if (!isSet(gettype_vvvvvzk)) + { + var gettype_vvvvvzk = []; + } + var gettype = gettype_vvvvvzk.some(gettype_vvvvvzk_SomeFunc); // set this function logic - if (gettype) + if (add_php_after_getitems && gettype) { - jQuery('#jform_add_php_after_getitems').closest('.control-group').show(); - if (jform_vvvvvzlvzb_required) + jQuery('#jform_php_after_getitems').closest('.control-group').show(); + if (jform_vvvvvzkvzc_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_vvvvvzlvzb_required = false; - } - - jQuery('#jform_add_php_before_getitems').closest('.control-group').show(); - if (jform_vvvvvzlvzc_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_vvvvvzlvzc_required = false; - } - - jQuery('#jform_add_php_getlistquery').closest('.control-group').show(); - if (jform_vvvvvzlvzd_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_vvvvvzlvzd_required = false; + 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; } } else { - jQuery('#jform_add_php_after_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzlvzb_required) + jQuery('#jform_php_after_getitems').closest('.control-group').hide(); + if (!jform_vvvvvzkvzc_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_vvvvvzlvzb_required = true; - } - jQuery('#jform_add_php_before_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzlvzc_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_vvvvvzlvzc_required = true; - } - jQuery('#jform_add_php_getlistquery').closest('.control-group').hide(); - if (!jform_vvvvvzlvzd_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_vvvvvzlvzd_required = true; + 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; } } } -// the vvvvvzl Some function -function gettype_vvvvvzl_SomeFunc(gettype_vvvvvzl) +// the vvvvvzk Some function +function add_php_after_getitems_vvvvvzk_SomeFunc(add_php_after_getitems_vvvvvzk) { // set the function logic - if (gettype_vvvvvzl == 2 || gettype_vvvvvzl == 4) + if (add_php_after_getitems_vvvvvzk == 1) + { + return true; + } + return false; +} + +// the vvvvvzk Some function +function gettype_vvvvvzk_SomeFunc(gettype_vvvvvzk) +{ + // set the function logic + if (gettype_vvvvvzk == 2 || gettype_vvvvvzk == 4) { return true; } @@ -1212,28 +1119,66 @@ function vvvvvzm(gettype_vvvvvzm) // set this function logic if (gettype) { - jQuery('#jform_pagination').closest('.control-group').show(); + jQuery('#jform_add_php_after_getitems').closest('.control-group').show(); + if (jform_vvvvvzmvzd_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; + } + + jQuery('#jform_add_php_before_getitems').closest('.control-group').show(); if (jform_vvvvvzmvze_required) { - updateFieldRequired('pagination',0); - jQuery('#jform_pagination').prop('required','required'); - jQuery('#jform_pagination').attr('aria-required',true); - jQuery('#jform_pagination').addClass('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; } + jQuery('#jform_add_php_getlistquery').closest('.control-group').show(); + if (jform_vvvvvzmvzf_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; + } + } else { - jQuery('#jform_pagination').closest('.control-group').hide(); + jQuery('#jform_add_php_after_getitems').closest('.control-group').hide(); + if (!jform_vvvvvzmvzd_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; + } + jQuery('#jform_add_php_before_getitems').closest('.control-group').hide(); if (!jform_vvvvvzmvze_required) { - updateFieldRequired('pagination',1); - jQuery('#jform_pagination').removeAttr('required'); - jQuery('#jform_pagination').removeAttr('aria-required'); - jQuery('#jform_pagination').removeClass('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; } + jQuery('#jform_add_php_getlistquery').closest('.control-group').hide(); + if (!jform_vvvvvzmvzf_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; + } } } @@ -1241,7 +1186,62 @@ function vvvvvzm(gettype_vvvvvzm) function gettype_vvvvvzm_SomeFunc(gettype_vvvvvzm) { // set the function logic - if (gettype_vvvvvzm == 2) + if (gettype_vvvvvzm == 2 || gettype_vvvvvzm == 4) + { + return true; + } + return false; +} + +// the vvvvvzn function +function vvvvvzn(gettype_vvvvvzn) +{ + if (isSet(gettype_vvvvvzn) && gettype_vvvvvzn.constructor !== Array) + { + var temp_vvvvvzn = gettype_vvvvvzn; + var gettype_vvvvvzn = []; + gettype_vvvvvzn.push(temp_vvvvvzn); + } + else if (!isSet(gettype_vvvvvzn)) + { + var gettype_vvvvvzn = []; + } + var gettype = gettype_vvvvvzn.some(gettype_vvvvvzn_SomeFunc); + + + // set this function logic + if (gettype) + { + jQuery('#jform_pagination').closest('.control-group').show(); + if (jform_vvvvvznvzg_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; + } + + } + else + { + jQuery('#jform_pagination').closest('.control-group').hide(); + if (!jform_vvvvvznvzg_required) + { + updateFieldRequired('pagination',1); + jQuery('#jform_pagination').removeAttr('required'); + jQuery('#jform_pagination').removeAttr('aria-required'); + jQuery('#jform_pagination').removeClass('required'); + jform_vvvvvznvzg_required = true; + } + } +} + +// the vvvvvzn Some function +function gettype_vvvvvzn_SomeFunc(gettype_vvvvvzn) +{ + // set the function logic + if (gettype_vvvvvzn == 2) { return true; } diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js index 143befe03..cc13d335f 100644 --- a/admin/models/forms/field.js +++ b/admin/models/forms/field.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.js @@ -23,151 +23,96 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvznvzf_required = false; -jform_vvvvvzovzg_required = false; -jform_vvvvvzpvzh_required = false; -jform_vvvvvzqvzi_required = false; -jform_vvvvvztvzj_required = false; -jform_vvvvvzuvzk_required = false; -jform_vvvvvzvvzl_required = false; -jform_vvvvvzwvzm_required = false; +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; // Initial Script jQuery(document).ready(function() { - var datalenght_vvvvvzn = jQuery("#jform_datalenght").val(); - vvvvvzn(datalenght_vvvvvzn); + var datalenght_vvvvvzo = jQuery("#jform_datalenght").val(); + vvvvvzo(datalenght_vvvvvzo); - var datadefault_vvvvvzo = jQuery("#jform_datadefault").val(); - vvvvvzo(datadefault_vvvvvzo); - - var datatype_vvvvvzp = jQuery("#jform_datatype").val(); - vvvvvzp(datatype_vvvvvzp); + var datadefault_vvvvvzp = jQuery("#jform_datadefault").val(); + vvvvvzp(datadefault_vvvvvzp); var datatype_vvvvvzq = jQuery("#jform_datatype").val(); vvvvvzq(datatype_vvvvvzq); - var store_vvvvvzr = jQuery("#jform_store").val(); var datatype_vvvvvzr = jQuery("#jform_datatype").val(); - vvvvvzr(store_vvvvvzr,datatype_vvvvvzr); + vvvvvzr(datatype_vvvvvzr); - var add_css_view_vvvvvzt = jQuery("#jform_add_css_view input[type='radio']:checked").val(); - vvvvvzt(add_css_view_vvvvvzt); + var store_vvvvvzs = jQuery("#jform_store").val(); + var datatype_vvvvvzs = jQuery("#jform_datatype").val(); + vvvvvzs(store_vvvvvzs,datatype_vvvvvzs); - var add_css_views_vvvvvzu = jQuery("#jform_add_css_views input[type='radio']:checked").val(); - vvvvvzu(add_css_views_vvvvvzu); + var add_css_view_vvvvvzu = jQuery("#jform_add_css_view input[type='radio']:checked").val(); + vvvvvzu(add_css_view_vvvvvzu); - var add_javascript_view_footer_vvvvvzv = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); - vvvvvzv(add_javascript_view_footer_vvvvvzv); + var add_css_views_vvvvvzv = jQuery("#jform_add_css_views input[type='radio']:checked").val(); + vvvvvzv(add_css_views_vvvvvzv); - var add_javascript_views_footer_vvvvvzw = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); - vvvvvzw(add_javascript_views_footer_vvvvvzw); + var add_javascript_view_footer_vvvvvzw = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); + vvvvvzw(add_javascript_view_footer_vvvvvzw); + + var add_javascript_views_footer_vvvvvzx = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); + vvvvvzx(add_javascript_views_footer_vvvvvzx); }); -// the vvvvvzn function -function vvvvvzn(datalenght_vvvvvzn) +// the vvvvvzo function +function vvvvvzo(datalenght_vvvvvzo) { - if (isSet(datalenght_vvvvvzn) && datalenght_vvvvvzn.constructor !== Array) + if (isSet(datalenght_vvvvvzo) && datalenght_vvvvvzo.constructor !== Array) { - var temp_vvvvvzn = datalenght_vvvvvzn; - var datalenght_vvvvvzn = []; - datalenght_vvvvvzn.push(temp_vvvvvzn); + var temp_vvvvvzo = datalenght_vvvvvzo; + var datalenght_vvvvvzo = []; + datalenght_vvvvvzo.push(temp_vvvvvzo); } - else if (!isSet(datalenght_vvvvvzn)) + else if (!isSet(datalenght_vvvvvzo)) { - var datalenght_vvvvvzn = []; + var datalenght_vvvvvzo = []; } - var datalenght = datalenght_vvvvvzn.some(datalenght_vvvvvzn_SomeFunc); + var datalenght = datalenght_vvvvvzo.some(datalenght_vvvvvzo_SomeFunc); // set this function logic if (datalenght) { jQuery('#jform_datalenght_other').closest('.control-group').show(); - if (jform_vvvvvznvzf_required) + if (jform_vvvvvzovzh_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_vvvvvznvzf_required = false; + jform_vvvvvzovzh_required = false; } } else { jQuery('#jform_datalenght_other').closest('.control-group').hide(); - if (!jform_vvvvvznvzf_required) + if (!jform_vvvvvzovzh_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_vvvvvznvzf_required = true; - } - } -} - -// the vvvvvzn Some function -function datalenght_vvvvvzn_SomeFunc(datalenght_vvvvvzn) -{ - // set the function logic - if (datalenght_vvvvvzn == 'Other') - { - return true; - } - return false; -} - -// the vvvvvzo function -function vvvvvzo(datadefault_vvvvvzo) -{ - if (isSet(datadefault_vvvvvzo) && datadefault_vvvvvzo.constructor !== Array) - { - var temp_vvvvvzo = datadefault_vvvvvzo; - var datadefault_vvvvvzo = []; - datadefault_vvvvvzo.push(temp_vvvvvzo); - } - else if (!isSet(datadefault_vvvvvzo)) - { - var datadefault_vvvvvzo = []; - } - var datadefault = datadefault_vvvvvzo.some(datadefault_vvvvvzo_SomeFunc); - - - // set this function logic - if (datadefault) - { - jQuery('#jform_datadefault_other').closest('.control-group').show(); - if (jform_vvvvvzovzg_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_vvvvvzovzg_required = false; - } - - } - else - { - jQuery('#jform_datadefault_other').closest('.control-group').hide(); - if (!jform_vvvvvzovzg_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_vvvvvzovzg_required = true; + jform_vvvvvzovzh_required = true; } } } // the vvvvvzo Some function -function datadefault_vvvvvzo_SomeFunc(datadefault_vvvvvzo) +function datalenght_vvvvvzo_SomeFunc(datalenght_vvvvvzo) { // set the function logic - if (datadefault_vvvvvzo == 'Other') + if (datalenght_vvvvvzo == 'Other') { return true; } @@ -175,58 +120,54 @@ function datadefault_vvvvvzo_SomeFunc(datadefault_vvvvvzo) } // the vvvvvzp function -function vvvvvzp(datatype_vvvvvzp) +function vvvvvzp(datadefault_vvvvvzp) { - if (isSet(datatype_vvvvvzp) && datatype_vvvvvzp.constructor !== Array) + if (isSet(datadefault_vvvvvzp) && datadefault_vvvvvzp.constructor !== Array) { - var temp_vvvvvzp = datatype_vvvvvzp; - var datatype_vvvvvzp = []; - datatype_vvvvvzp.push(temp_vvvvvzp); + var temp_vvvvvzp = datadefault_vvvvvzp; + var datadefault_vvvvvzp = []; + datadefault_vvvvvzp.push(temp_vvvvvzp); } - else if (!isSet(datatype_vvvvvzp)) + else if (!isSet(datadefault_vvvvvzp)) { - var datatype_vvvvvzp = []; + var datadefault_vvvvvzp = []; } - var datatype = datatype_vvvvvzp.some(datatype_vvvvvzp_SomeFunc); + var datadefault = datadefault_vvvvvzp.some(datadefault_vvvvvzp_SomeFunc); // set this function logic - if (datatype) + if (datadefault) { - jQuery('#jform_datadefault').closest('.control-group').show(); - jQuery('#jform_datalenght').closest('.control-group').show(); - jQuery('#jform_indexes').closest('.control-group').show(); - if (jform_vvvvvzpvzh_required) + jQuery('#jform_datadefault_other').closest('.control-group').show(); + if (jform_vvvvvzpvzi_required) { - updateFieldRequired('indexes',0); - jQuery('#jform_indexes').prop('required','required'); - jQuery('#jform_indexes').attr('aria-required',true); - jQuery('#jform_indexes').addClass('required'); - jform_vvvvvzpvzh_required = false; + 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; } } else { - jQuery('#jform_datadefault').closest('.control-group').hide(); - jQuery('#jform_datalenght').closest('.control-group').hide(); - jQuery('#jform_indexes').closest('.control-group').hide(); - if (!jform_vvvvvzpvzh_required) + jQuery('#jform_datadefault_other').closest('.control-group').hide(); + if (!jform_vvvvvzpvzi_required) { - updateFieldRequired('indexes',1); - jQuery('#jform_indexes').removeAttr('required'); - jQuery('#jform_indexes').removeAttr('aria-required'); - jQuery('#jform_indexes').removeClass('required'); - jform_vvvvvzpvzh_required = true; + 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; } } } // the vvvvvzp Some function -function datatype_vvvvvzp_SomeFunc(datatype_vvvvvzp) +function datadefault_vvvvvzp_SomeFunc(datadefault_vvvvvzp) { // set the function logic - if (datatype_vvvvvzp == 'CHAR' || datatype_vvvvvzp == 'VARCHAR' || datatype_vvvvvzp == 'DATETIME' || datatype_vvvvvzp == 'DATE' || datatype_vvvvvzp == 'TIME' || datatype_vvvvvzp == 'INT' || datatype_vvvvvzp == 'TINYINT' || datatype_vvvvvzp == 'BIGINT' || datatype_vvvvvzp == 'FLOAT' || datatype_vvvvvzp == 'DECIMAL' || datatype_vvvvvzp == 'DOUBLE') + if (datadefault_vvvvvzp == 'Other') { return true; } @@ -252,27 +193,31 @@ function vvvvvzq(datatype_vvvvvzq) // set this function logic if (datatype) { - jQuery('#jform_store').closest('.control-group').show(); - if (jform_vvvvvzqvzi_required) + 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) { - updateFieldRequired('store',0); - jQuery('#jform_store').prop('required','required'); - jQuery('#jform_store').attr('aria-required',true); - jQuery('#jform_store').addClass('required'); - jform_vvvvvzqvzi_required = false; + 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; } } else { - jQuery('#jform_store').closest('.control-group').hide(); - if (!jform_vvvvvzqvzi_required) + 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) { - updateFieldRequired('store',1); - jQuery('#jform_store').removeAttr('required'); - jQuery('#jform_store').removeAttr('aria-required'); - jQuery('#jform_store').removeClass('required'); - jform_vvvvvzqvzi_required = true; + updateFieldRequired('indexes',1); + jQuery('#jform_indexes').removeAttr('required'); + jQuery('#jform_indexes').removeAttr('aria-required'); + jQuery('#jform_indexes').removeClass('required'); + jform_vvvvvzqvzj_required = true; } } } @@ -281,7 +226,7 @@ function vvvvvzq(datatype_vvvvvzq) function datatype_vvvvvzq_SomeFunc(datatype_vvvvvzq) { // set the function logic - if (datatype_vvvvvzq == 'CHAR' || datatype_vvvvvzq == 'VARCHAR' || datatype_vvvvvzq == 'TEXT' || datatype_vvvvvzq == 'MEDIUMTEXT' || datatype_vvvvvzq == 'LONGTEXT') + if (datatype_vvvvvzq == 'CHAR' || datatype_vvvvvzq == 'VARCHAR' || datatype_vvvvvzq == 'DATETIME' || datatype_vvvvvzq == 'DATE' || datatype_vvvvvzq == 'TIME' || datatype_vvvvvzq == 'INT' || datatype_vvvvvzq == 'TINYINT' || datatype_vvvvvzq == 'BIGINT' || datatype_vvvvvzq == 'FLOAT' || datatype_vvvvvzq == 'DECIMAL' || datatype_vvvvvzq == 'DOUBLE') { return true; } @@ -289,20 +234,8 @@ function datatype_vvvvvzq_SomeFunc(datatype_vvvvvzq) } // the vvvvvzr function -function vvvvvzr(store_vvvvvzr,datatype_vvvvvzr) +function vvvvvzr(datatype_vvvvvzr) { - if (isSet(store_vvvvvzr) && store_vvvvvzr.constructor !== Array) - { - var temp_vvvvvzr = store_vvvvvzr; - var store_vvvvvzr = []; - store_vvvvvzr.push(temp_vvvvvzr); - } - else if (!isSet(store_vvvvvzr)) - { - var store_vvvvvzr = []; - } - var store = store_vvvvvzr.some(store_vvvvvzr_SomeFunc); - if (isSet(datatype_vvvvvzr) && datatype_vvvvvzr.constructor !== Array) { var temp_vvvvvzr = datatype_vvvvvzr; @@ -317,27 +250,33 @@ function vvvvvzr(store_vvvvvzr,datatype_vvvvvzr) // set this function logic - if (store && datatype) + if (datatype) { - jQuery('.note_vdm_encryption').closest('.control-group').show(); + jQuery('#jform_store').closest('.control-group').show(); + if (jform_vvvvvzrvzk_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; + } + } else { - jQuery('.note_vdm_encryption').closest('.control-group').hide(); + jQuery('#jform_store').closest('.control-group').hide(); + if (!jform_vvvvvzrvzk_required) + { + updateFieldRequired('store',1); + jQuery('#jform_store').removeAttr('required'); + jQuery('#jform_store').removeAttr('aria-required'); + jQuery('#jform_store').removeClass('required'); + jform_vvvvvzrvzk_required = true; + } } } -// the vvvvvzr Some function -function store_vvvvvzr_SomeFunc(store_vvvvvzr) -{ - // set the function logic - if (store_vvvvvzr == 4) - { - return true; - } - return false; -} - // the vvvvvzr Some function function datatype_vvvvvzr_SomeFunc(datatype_vvvvvzr) { @@ -349,126 +288,187 @@ function datatype_vvvvvzr_SomeFunc(datatype_vvvvvzr) return false; } -// the vvvvvzt function -function vvvvvzt(add_css_view_vvvvvzt) +// the vvvvvzs function +function vvvvvzs(store_vvvvvzs,datatype_vvvvvzs) +{ + if (isSet(store_vvvvvzs) && store_vvvvvzs.constructor !== Array) + { + var temp_vvvvvzs = store_vvvvvzs; + var store_vvvvvzs = []; + store_vvvvvzs.push(temp_vvvvvzs); + } + else if (!isSet(store_vvvvvzs)) + { + var store_vvvvvzs = []; + } + var store = store_vvvvvzs.some(store_vvvvvzs_SomeFunc); + + if (isSet(datatype_vvvvvzs) && datatype_vvvvvzs.constructor !== Array) + { + var temp_vvvvvzs = datatype_vvvvvzs; + var datatype_vvvvvzs = []; + datatype_vvvvvzs.push(temp_vvvvvzs); + } + else if (!isSet(datatype_vvvvvzs)) + { + var datatype_vvvvvzs = []; + } + var datatype = datatype_vvvvvzs.some(datatype_vvvvvzs_SomeFunc); + + + // set this function logic + if (store && datatype) + { + jQuery('.note_vdm_encryption').closest('.control-group').show(); + } + else + { + jQuery('.note_vdm_encryption').closest('.control-group').hide(); + } +} + +// the vvvvvzs Some function +function store_vvvvvzs_SomeFunc(store_vvvvvzs) { // set the function logic - if (add_css_view_vvvvvzt == 1) + if (store_vvvvvzs == 4) + { + return true; + } + return false; +} + +// the vvvvvzs Some function +function datatype_vvvvvzs_SomeFunc(datatype_vvvvvzs) +{ + // set the function logic + if (datatype_vvvvvzs == 'CHAR' || datatype_vvvvvzs == 'VARCHAR' || datatype_vvvvvzs == 'TEXT' || datatype_vvvvvzs == 'MEDIUMTEXT' || datatype_vvvvvzs == 'LONGTEXT') + { + return true; + } + return false; +} + +// the vvvvvzu function +function vvvvvzu(add_css_view_vvvvvzu) +{ + // set the function logic + if (add_css_view_vvvvvzu == 1) { jQuery('#jform_css_view').closest('.control-group').show(); - if (jform_vvvvvztvzj_required) + if (jform_vvvvvzuvzl_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_vvvvvztvzj_required = false; + jform_vvvvvzuvzl_required = false; } } else { jQuery('#jform_css_view').closest('.control-group').hide(); - if (!jform_vvvvvztvzj_required) + if (!jform_vvvvvzuvzl_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_vvvvvztvzj_required = true; + jform_vvvvvzuvzl_required = true; } } } -// the vvvvvzu function -function vvvvvzu(add_css_views_vvvvvzu) +// the vvvvvzv function +function vvvvvzv(add_css_views_vvvvvzv) { // set the function logic - if (add_css_views_vvvvvzu == 1) + if (add_css_views_vvvvvzv == 1) { jQuery('#jform_css_views').closest('.control-group').show(); - if (jform_vvvvvzuvzk_required) + if (jform_vvvvvzvvzm_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_vvvvvzuvzk_required = false; + jform_vvvvvzvvzm_required = false; } } else { jQuery('#jform_css_views').closest('.control-group').hide(); - if (!jform_vvvvvzuvzk_required) + if (!jform_vvvvvzvvzm_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_vvvvvzuvzk_required = true; + jform_vvvvvzvvzm_required = true; } } } -// the vvvvvzv function -function vvvvvzv(add_javascript_view_footer_vvvvvzv) +// the vvvvvzw function +function vvvvvzw(add_javascript_view_footer_vvvvvzw) { // set the function logic - if (add_javascript_view_footer_vvvvvzv == 1) + if (add_javascript_view_footer_vvvvvzw == 1) { jQuery('#jform_javascript_view_footer').closest('.control-group').show(); - if (jform_vvvvvzvvzl_required) + if (jform_vvvvvzwvzn_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_vvvvvzvvzl_required = false; + jform_vvvvvzwvzn_required = false; } } else { jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); - if (!jform_vvvvvzvvzl_required) + if (!jform_vvvvvzwvzn_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_vvvvvzvvzl_required = true; + jform_vvvvvzwvzn_required = true; } } } -// the vvvvvzw function -function vvvvvzw(add_javascript_views_footer_vvvvvzw) +// the vvvvvzx function +function vvvvvzx(add_javascript_views_footer_vvvvvzx) { // set the function logic - if (add_javascript_views_footer_vvvvvzw == 1) + if (add_javascript_views_footer_vvvvvzx == 1) { jQuery('#jform_javascript_views_footer').closest('.control-group').show(); - if (jform_vvvvvzwvzm_required) + if (jform_vvvvvzxvzo_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_vvvvvzwvzm_required = false; + jform_vvvvvzxvzo_required = false; } } else { jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); - if (!jform_vvvvvzwvzm_required) + if (!jform_vvvvvzxvzo_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_vvvvvzwvzm_required = true; + jform_vvvvvzxvzo_required = true; } } } diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js index e53895c64..1f18010a9 100644 --- a/admin/models/forms/fieldtype.js +++ b/admin/models/forms/fieldtype.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7649ad87b..d21d55c7e 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.js @@ -23,24 +23,21 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvzxvzo_required = false; -jform_vvvvvzyvzp_required = false; -jform_vvvvvzzvzq_required = false; -jform_vvvvwaavzr_required = false; -jform_vvvvwabvzs_required = false; -jform_vvvvwacvzt_required = false; +jform_vvvvvzyvzq_required = false; +jform_vvvvvzzvzr_required = false; +jform_vvvvwaavzs_required = false; +jform_vvvvwabvzt_required = false; +jform_vvvvwacvzu_required = false; +jform_vvvvwadvzv_required = false; // Initial Script jQuery(document).ready(function() { - var location_vvvvvzx = jQuery("#jform_location input[type='radio']:checked").val(); - vvvvvzx(location_vvvvvzx); - var location_vvvvvzy = jQuery("#jform_location input[type='radio']:checked").val(); vvvvvzy(location_vvvvvzy); - var type_vvvvvzz = jQuery("#jform_type").val(); - vvvvvzz(type_vvvvvzz); + var location_vvvvvzz = jQuery("#jform_location input[type='radio']:checked").val(); + vvvvvzz(location_vvvvvzz); var type_vvvvwaa = jQuery("#jform_type").val(); vvvvwaa(type_vvvvwaa); @@ -48,127 +45,75 @@ jQuery(document).ready(function() var type_vvvvwab = jQuery("#jform_type").val(); vvvvwab(type_vvvvwab); - var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val(); - vvvvwac(target_vvvvwac); + var type_vvvvwac = jQuery("#jform_type").val(); + vvvvwac(type_vvvvwac); + + var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val(); + vvvvwad(target_vvvvwad); }); -// the vvvvvzx function -function vvvvvzx(location_vvvvvzx) +// the vvvvvzy function +function vvvvvzy(location_vvvvvzy) { // set the function logic - if (location_vvvvvzx == 1) + if (location_vvvvvzy == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); - if (jform_vvvvvzxvzo_required) + if (jform_vvvvvzyvzq_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_vvvvvzxvzo_required = false; + jform_vvvvvzyvzq_required = false; } } else { jQuery('#jform_admin_view').closest('.control-group').hide(); - if (!jform_vvvvvzxvzo_required) + if (!jform_vvvvvzyvzq_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_vvvvvzxvzo_required = true; + jform_vvvvvzyvzq_required = true; } } } -// the vvvvvzy function -function vvvvvzy(location_vvvvvzy) +// the vvvvvzz function +function vvvvvzz(location_vvvvvzz) { // set the function logic - if (location_vvvvvzy == 2) + if (location_vvvvvzz == 2) { jQuery('#jform_site_view').closest('.control-group').show(); - if (jform_vvvvvzyvzp_required) + if (jform_vvvvvzzvzr_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_vvvvvzyvzp_required = false; + jform_vvvvvzzvzr_required = false; } } else { jQuery('#jform_site_view').closest('.control-group').hide(); - if (!jform_vvvvvzyvzp_required) + if (!jform_vvvvvzzvzr_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_vvvvvzyvzp_required = true; + jform_vvvvvzzvzr_required = true; } } } -// the vvvvvzz function -function vvvvvzz(type_vvvvvzz) -{ - if (isSet(type_vvvvvzz) && type_vvvvvzz.constructor !== Array) - { - var temp_vvvvvzz = type_vvvvvzz; - var type_vvvvvzz = []; - type_vvvvvzz.push(temp_vvvvvzz); - } - else if (!isSet(type_vvvvvzz)) - { - var type_vvvvvzz = []; - } - var type = type_vvvvvzz.some(type_vvvvvzz_SomeFunc); - - - // set this function logic - if (type) - { - jQuery('#jform_url').closest('.control-group').show(); - if (jform_vvvvvzzvzq_required) - { - updateFieldRequired('url',0); - jQuery('#jform_url').prop('required','required'); - jQuery('#jform_url').attr('aria-required',true); - jQuery('#jform_url').addClass('required'); - jform_vvvvvzzvzq_required = false; - } - - } - else - { - jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_vvvvvzzvzq_required) - { - updateFieldRequired('url',1); - jQuery('#jform_url').removeAttr('required'); - jQuery('#jform_url').removeAttr('aria-required'); - jQuery('#jform_url').removeClass('required'); - jform_vvvvvzzvzq_required = true; - } - } -} - -// the vvvvvzz Some function -function type_vvvvvzz_SomeFunc(type_vvvvvzz) -{ - // set the function logic - if (type_vvvvvzz == 3) - { - return true; - } - return false; -} - // the vvvvwaa function function vvvvwaa(type_vvvvwaa) { @@ -188,27 +133,27 @@ function vvvvwaa(type_vvvvwaa) // set this function logic if (type) { - jQuery('#jform_article').closest('.control-group').show(); - if (jform_vvvvwaavzr_required) + jQuery('#jform_url').closest('.control-group').show(); + if (jform_vvvvwaavzs_required) { - updateFieldRequired('article',0); - jQuery('#jform_article').prop('required','required'); - jQuery('#jform_article').attr('aria-required',true); - jQuery('#jform_article').addClass('required'); - jform_vvvvwaavzr_required = false; + updateFieldRequired('url',0); + jQuery('#jform_url').prop('required','required'); + jQuery('#jform_url').attr('aria-required',true); + jQuery('#jform_url').addClass('required'); + jform_vvvvwaavzs_required = false; } } else { - jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_vvvvwaavzr_required) + jQuery('#jform_url').closest('.control-group').hide(); + if (!jform_vvvvwaavzs_required) { - updateFieldRequired('article',1); - jQuery('#jform_article').removeAttr('required'); - jQuery('#jform_article').removeAttr('aria-required'); - jQuery('#jform_article').removeClass('required'); - jform_vvvvwaavzr_required = true; + updateFieldRequired('url',1); + jQuery('#jform_url').removeAttr('required'); + jQuery('#jform_url').removeAttr('aria-required'); + jQuery('#jform_url').removeClass('required'); + jform_vvvvwaavzs_required = true; } } } @@ -217,7 +162,7 @@ function vvvvwaa(type_vvvvwaa) function type_vvvvwaa_SomeFunc(type_vvvvwaa) { // set the function logic - if (type_vvvvwaa == 1) + if (type_vvvvwaa == 3) { return true; } @@ -243,27 +188,27 @@ function vvvvwab(type_vvvvwab) // set this function logic if (type) { - jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_vvvvwabvzs_required) + jQuery('#jform_article').closest('.control-group').show(); + if (jform_vvvvwabvzt_required) { - updateFieldRequired('content',0); - jQuery('#jform_content').prop('required','required'); - jQuery('#jform_content').attr('aria-required',true); - jQuery('#jform_content').addClass('required'); - jform_vvvvwabvzs_required = false; + updateFieldRequired('article',0); + jQuery('#jform_article').prop('required','required'); + jQuery('#jform_article').attr('aria-required',true); + jQuery('#jform_article').addClass('required'); + jform_vvvvwabvzt_required = false; } } else { - jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_vvvvwabvzs_required) + jQuery('#jform_article').closest('.control-group').hide(); + if (!jform_vvvvwabvzt_required) { - updateFieldRequired('content',1); - jQuery('#jform_content').removeAttr('required'); - jQuery('#jform_content').removeAttr('aria-required'); - jQuery('#jform_content').removeClass('required'); - jform_vvvvwabvzs_required = true; + updateFieldRequired('article',1); + jQuery('#jform_article').removeAttr('required'); + jQuery('#jform_article').removeAttr('aria-required'); + jQuery('#jform_article').removeClass('required'); + jform_vvvvwabvzt_required = true; } } } @@ -272,7 +217,7 @@ function vvvvwab(type_vvvvwab) function type_vvvvwab_SomeFunc(type_vvvvwab) { // set the function logic - if (type_vvvvwab == 2) + if (type_vvvvwab == 1) { return true; } @@ -280,32 +225,87 @@ function type_vvvvwab_SomeFunc(type_vvvvwab) } // the vvvvwac function -function vvvvwac(target_vvvvwac) +function vvvvwac(type_vvvvwac) +{ + if (isSet(type_vvvvwac) && type_vvvvwac.constructor !== Array) + { + var temp_vvvvwac = type_vvvvwac; + var type_vvvvwac = []; + type_vvvvwac.push(temp_vvvvwac); + } + else if (!isSet(type_vvvvwac)) + { + var type_vvvvwac = []; + } + var type = type_vvvvwac.some(type_vvvvwac_SomeFunc); + + + // set this function logic + if (type) + { + jQuery('#jform_content-lbl').closest('.control-group').show(); + if (jform_vvvvwacvzu_required) + { + updateFieldRequired('content',0); + jQuery('#jform_content').prop('required','required'); + jQuery('#jform_content').attr('aria-required',true); + jQuery('#jform_content').addClass('required'); + jform_vvvvwacvzu_required = false; + } + + } + else + { + jQuery('#jform_content-lbl').closest('.control-group').hide(); + if (!jform_vvvvwacvzu_required) + { + updateFieldRequired('content',1); + jQuery('#jform_content').removeAttr('required'); + jQuery('#jform_content').removeAttr('aria-required'); + jQuery('#jform_content').removeClass('required'); + jform_vvvvwacvzu_required = true; + } + } +} + +// the vvvvwac Some function +function type_vvvvwac_SomeFunc(type_vvvvwac) { // set the function logic - if (target_vvvvwac == 1) + if (type_vvvvwac == 2) + { + return true; + } + return false; +} + +// the vvvvwad function +function vvvvwad(target_vvvvwad) +{ + // set the function logic + if (target_vvvvwad == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_vvvvwacvzt_required) + if (jform_vvvvwadvzv_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_vvvvwacvzt_required = false; + jform_vvvvwadvzv_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_vvvvwacvzt_required) + if (!jform_vvvvwadvzv_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvwacvzt_required = true; + jform_vvvvwadvzv_required = true; } } } diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js index 74abcaee5..6a1908b6e 100644 --- a/admin/models/forms/layout.js +++ b/admin/models/forms/layout.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.js @@ -23,42 +23,42 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvyqvym_required = false; +jform_vvvvvyrvyo_required = false; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvyq = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvyq(add_php_view_vvvvvyq); + var add_php_view_vvvvvyr = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvyr(add_php_view_vvvvvyr); }); -// the vvvvvyq function -function vvvvvyq(add_php_view_vvvvvyq) +// the vvvvvyr function +function vvvvvyr(add_php_view_vvvvvyr) { // set the function logic - if (add_php_view_vvvvvyq == 1) + if (add_php_view_vvvvvyr == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvyqvym_required) + if (jform_vvvvvyrvyo_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_vvvvvyqvym_required = false; + jform_vvvvvyrvyo_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvyqvym_required) + if (!jform_vvvvvyrvyo_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_vvvvvyqvym_required = true; + jform_vvvvvyrvyo_required = true; } } } diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js index 6cb9abdd6..9da57aaab 100644 --- a/admin/models/forms/site_view.js +++ b/admin/models/forms/site_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.js @@ -23,280 +23,280 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvygvyb_required = false; -jform_vvvvvyhvyc_required = false; -jform_vvvvvyivyd_required = false; -jform_vvvvvyjvye_required = false; -jform_vvvvvykvyf_required = false; -jform_vvvvvylvyg_required = false; -jform_vvvvvymvyh_required = false; -jform_vvvvvynvyi_required = false; -jform_vvvvvyovyj_required = false; +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; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvyg = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvyg(add_php_view_vvvvvyg); + var add_php_view_vvvvvyh = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvyh(add_php_view_vvvvvyh); - var add_php_jview_display_vvvvvyh = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); - vvvvvyh(add_php_jview_display_vvvvvyh); + var add_php_jview_display_vvvvvyi = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); + vvvvvyi(add_php_jview_display_vvvvvyi); - var add_php_jview_vvvvvyi = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); - vvvvvyi(add_php_jview_vvvvvyi); + var add_php_jview_vvvvvyj = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); + vvvvvyj(add_php_jview_vvvvvyj); - var add_php_document_vvvvvyj = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvyj(add_php_document_vvvvvyj); + var add_php_document_vvvvvyk = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvyk(add_php_document_vvvvvyk); - var add_css_document_vvvvvyk = jQuery("#jform_add_css_document input[type='radio']:checked").val(); - vvvvvyk(add_css_document_vvvvvyk); + var add_css_document_vvvvvyl = jQuery("#jform_add_css_document input[type='radio']:checked").val(); + vvvvvyl(add_css_document_vvvvvyl); - var add_js_document_vvvvvyl = jQuery("#jform_add_js_document input[type='radio']:checked").val(); - vvvvvyl(add_js_document_vvvvvyl); + var add_js_document_vvvvvym = jQuery("#jform_add_js_document input[type='radio']:checked").val(); + vvvvvym(add_js_document_vvvvvym); - var add_css_vvvvvym = jQuery("#jform_add_css input[type='radio']:checked").val(); - vvvvvym(add_css_vvvvvym); + var add_css_vvvvvyn = jQuery("#jform_add_css input[type='radio']:checked").val(); + vvvvvyn(add_css_vvvvvyn); - var add_php_ajax_vvvvvyn = jQuery("#jform_add_php_ajax input[type='radio']:checked").val(); - vvvvvyn(add_php_ajax_vvvvvyn); + var add_php_ajax_vvvvvyo = jQuery("#jform_add_php_ajax input[type='radio']:checked").val(); + vvvvvyo(add_php_ajax_vvvvvyo); - var add_custom_button_vvvvvyo = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvyo(add_custom_button_vvvvvyo); + var add_custom_button_vvvvvyp = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvyp(add_custom_button_vvvvvyp); }); -// the vvvvvyg function -function vvvvvyg(add_php_view_vvvvvyg) +// the vvvvvyh function +function vvvvvyh(add_php_view_vvvvvyh) { // set the function logic - if (add_php_view_vvvvvyg == 1) + if (add_php_view_vvvvvyh == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvygvyb_required) + if (jform_vvvvvyhvyd_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_vvvvvygvyb_required = false; + jform_vvvvvyhvyd_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvygvyb_required) + if (!jform_vvvvvyhvyd_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_vvvvvygvyb_required = true; + jform_vvvvvyhvyd_required = true; } } } -// the vvvvvyh function -function vvvvvyh(add_php_jview_display_vvvvvyh) +// the vvvvvyi function +function vvvvvyi(add_php_jview_display_vvvvvyi) { // set the function logic - if (add_php_jview_display_vvvvvyh == 1) + if (add_php_jview_display_vvvvvyi == 1) { jQuery('#jform_php_jview_display').closest('.control-group').show(); - if (jform_vvvvvyhvyc_required) + if (jform_vvvvvyivye_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_vvvvvyhvyc_required = false; + jform_vvvvvyivye_required = false; } } else { jQuery('#jform_php_jview_display').closest('.control-group').hide(); - if (!jform_vvvvvyhvyc_required) + if (!jform_vvvvvyivye_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_vvvvvyhvyc_required = true; + jform_vvvvvyivye_required = true; } } } -// the vvvvvyi function -function vvvvvyi(add_php_jview_vvvvvyi) +// the vvvvvyj function +function vvvvvyj(add_php_jview_vvvvvyj) { // set the function logic - if (add_php_jview_vvvvvyi == 1) + if (add_php_jview_vvvvvyj == 1) { jQuery('#jform_php_jview').closest('.control-group').show(); - if (jform_vvvvvyivyd_required) + if (jform_vvvvvyjvyf_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_vvvvvyivyd_required = false; + jform_vvvvvyjvyf_required = false; } } else { jQuery('#jform_php_jview').closest('.control-group').hide(); - if (!jform_vvvvvyivyd_required) + if (!jform_vvvvvyjvyf_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_vvvvvyivyd_required = true; + jform_vvvvvyjvyf_required = true; } } } -// the vvvvvyj function -function vvvvvyj(add_php_document_vvvvvyj) +// the vvvvvyk function +function vvvvvyk(add_php_document_vvvvvyk) { // set the function logic - if (add_php_document_vvvvvyj == 1) + if (add_php_document_vvvvvyk == 1) { jQuery('#jform_php_document').closest('.control-group').show(); - if (jform_vvvvvyjvye_required) + if (jform_vvvvvykvyg_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_vvvvvyjvye_required = false; + jform_vvvvvykvyg_required = false; } } else { jQuery('#jform_php_document').closest('.control-group').hide(); - if (!jform_vvvvvyjvye_required) + if (!jform_vvvvvykvyg_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_vvvvvyjvye_required = true; + jform_vvvvvykvyg_required = true; } } } -// the vvvvvyk function -function vvvvvyk(add_css_document_vvvvvyk) +// the vvvvvyl function +function vvvvvyl(add_css_document_vvvvvyl) { // set the function logic - if (add_css_document_vvvvvyk == 1) + if (add_css_document_vvvvvyl == 1) { jQuery('#jform_css_document').closest('.control-group').show(); - if (jform_vvvvvykvyf_required) + if (jform_vvvvvylvyh_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_vvvvvykvyf_required = false; + jform_vvvvvylvyh_required = false; } } else { jQuery('#jform_css_document').closest('.control-group').hide(); - if (!jform_vvvvvykvyf_required) + if (!jform_vvvvvylvyh_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_vvvvvykvyf_required = true; + jform_vvvvvylvyh_required = true; } } } -// the vvvvvyl function -function vvvvvyl(add_js_document_vvvvvyl) +// the vvvvvym function +function vvvvvym(add_js_document_vvvvvym) { // set the function logic - if (add_js_document_vvvvvyl == 1) + if (add_js_document_vvvvvym == 1) { jQuery('#jform_js_document').closest('.control-group').show(); - if (jform_vvvvvylvyg_required) + if (jform_vvvvvymvyi_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_vvvvvylvyg_required = false; + jform_vvvvvymvyi_required = false; } } else { jQuery('#jform_js_document').closest('.control-group').hide(); - if (!jform_vvvvvylvyg_required) + if (!jform_vvvvvymvyi_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_vvvvvylvyg_required = true; + jform_vvvvvymvyi_required = true; } } } -// the vvvvvym function -function vvvvvym(add_css_vvvvvym) +// the vvvvvyn function +function vvvvvyn(add_css_vvvvvyn) { // set the function logic - if (add_css_vvvvvym == 1) + if (add_css_vvvvvyn == 1) { jQuery('#jform_css').closest('.control-group').show(); - if (jform_vvvvvymvyh_required) + if (jform_vvvvvynvyj_required) { updateFieldRequired('css',0); jQuery('#jform_css').prop('required','required'); jQuery('#jform_css').attr('aria-required',true); jQuery('#jform_css').addClass('required'); - jform_vvvvvymvyh_required = false; + jform_vvvvvynvyj_required = false; } } else { jQuery('#jform_css').closest('.control-group').hide(); - if (!jform_vvvvvymvyh_required) + if (!jform_vvvvvynvyj_required) { updateFieldRequired('css',1); jQuery('#jform_css').removeAttr('required'); jQuery('#jform_css').removeAttr('aria-required'); jQuery('#jform_css').removeClass('required'); - jform_vvvvvymvyh_required = true; + jform_vvvvvynvyj_required = true; } } } -// the vvvvvyn function -function vvvvvyn(add_php_ajax_vvvvvyn) +// the vvvvvyo function +function vvvvvyo(add_php_ajax_vvvvvyo) { // set the function logic - if (add_php_ajax_vvvvvyn == 1) + if (add_php_ajax_vvvvvyo == 1) { jQuery('#jform_ajax_input').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod').closest('.control-group').show(); - if (jform_vvvvvynvyi_required) + if (jform_vvvvvyovyk_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_vvvvvynvyi_required = false; + jform_vvvvvyovyk_required = false; } } @@ -304,42 +304,42 @@ function vvvvvyn(add_php_ajax_vvvvvyn) { jQuery('#jform_ajax_input').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod').closest('.control-group').hide(); - if (!jform_vvvvvynvyi_required) + if (!jform_vvvvvyovyk_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_vvvvvynvyi_required = true; + jform_vvvvvyovyk_required = true; } } } -// the vvvvvyo function -function vvvvvyo(add_custom_button_vvvvvyo) +// the vvvvvyp function +function vvvvvyp(add_custom_button_vvvvvyp) { // set the function logic - if (add_custom_button_vvvvvyo == 1) + if (add_custom_button_vvvvvyp == 1) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvyovyj_required) + if (jform_vvvvvypvyl_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_vvvvvyovyj_required = false; + jform_vvvvvypvyl_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvyovyk_required) + if (jform_vvvvvypvym_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_vvvvvyovyk_required = false; + jform_vvvvvypvym_required = false; } } @@ -347,22 +347,22 @@ function vvvvvyo(add_custom_button_vvvvvyo) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvyovyj_required) + if (!jform_vvvvvypvyl_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_vvvvvyovyj_required = true; + jform_vvvvvypvyl_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvyovyk_required) + if (!jform_vvvvvypvym_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_vvvvvyovyk_required = true; + jform_vvvvvypvym_required = true; } } } diff --git a/admin/models/forms/snippet.js b/admin/models/forms/snippet.js index 90ec58f8c..83d2a8a18 100644 --- a/admin/models/forms/snippet.js +++ b/admin/models/forms/snippet.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 9d6832f1c..099efc31d 100644 --- a/admin/models/forms/template.js +++ b/admin/models/forms/template.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.js @@ -23,42 +23,42 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvypvyl_required = false; +jform_vvvvvyqvyn_required = false; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvyp = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvyp(add_php_view_vvvvvyp); + var add_php_view_vvvvvyq = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvyq(add_php_view_vvvvvyq); }); -// the vvvvvyp function -function vvvvvyp(add_php_view_vvvvvyp) +// the vvvvvyq function +function vvvvvyq(add_php_view_vvvvvyq) { // set the function logic - if (add_php_view_vvvvvyp == 1) + if (add_php_view_vvvvvyq == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvypvyl_required) + if (jform_vvvvvyqvyn_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_vvvvvypvyl_required = false; + jform_vvvvvyqvyn_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvypvyl_required) + if (!jform_vvvvvyqvyn_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_vvvvvypvyl_required = true; + jform_vvvvvyqvyn_required = true; } } } diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 470326699..92748a0a2 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 adf302d08..f46daee9b 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.php diff --git a/admin/models/import.php b/admin/models/import.php index 61da24cab..eca34ad9e 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/layout.php b/admin/models/layout.php index 2522bbfcb..cda7ab965 100644 --- a/admin/models/layout.php +++ b/admin/models/layout.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.php diff --git a/admin/models/layouts.php b/admin/models/layouts.php index f76d7f6b8..58cb40114 100644 --- a/admin/models/layouts.php +++ b/admin/models/layouts.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 cdbc3a0b0..f5b352187 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/models/site_views.php b/admin/models/site_views.php index 9dd6f4169..37bc7376e 100644 --- a/admin/models/site_views.php +++ b/admin/models/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/models/snippet.php b/admin/models/snippet.php index d043ce5ec..be0512cf8 100644 --- a/admin/models/snippet.php +++ b/admin/models/snippet.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/models/snippets.php b/admin/models/snippets.php index 0f200a16f..4ebeb7b58 100644 --- a/admin/models/snippets.php +++ b/admin/models/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/template.php b/admin/models/template.php index 25454945b..94657236f 100644 --- a/admin/models/template.php +++ b/admin/models/template.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.php diff --git a/admin/models/templates.php b/admin/models/templates.php index a56f568d2..bac4b2243 100644 --- a/admin/models/templates.php +++ b/admin/models/templates.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.php diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 48006533f..f3f4c09ee 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -1,5 +1,5 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `add_admin_event` TINYINT(1) NOT NULL DEFAULT '0', `add_css` TINYINT(1) NOT NULL DEFAULT '0', @@ -31,6 +31,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component` ( `adduikit` TINYINT(1) NOT NULL DEFAULT '0', `author` VARCHAR(255) NOT NULL DEFAULT '', `bom` CHAR(64) NOT NULL DEFAULT '', + `buildcomp` TINYINT(1) NOT NULL DEFAULT '0', + `buildcompsql` MEDIUMTEXT NOT NULL, `companyname` CHAR(64) NOT NULL DEFAULT '', `component_version` CHAR(64) NOT NULL DEFAULT '', `copyright` VARCHAR(255) NOT NULL DEFAULT '', @@ -73,17 +75,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component` ( `whmcs_key` VARCHAR(255) NOT NULL DEFAULT '', `whmcs_url` VARCHAR(255) NOT NULL DEFAULT '', `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `published` TINYINT(1) NOT NULL DEFAULT '1', + `created_by` INT(11) NOT NULL DEFAULT '0', + `modified_by` INT(11) NOT NULL DEFAULT '0', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` INT(11) NOT NULL, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(11) NOT NULL DEFAULT '1', + `hits` INT(11) NOT NULL DEFAULT '0', + `access` INT(11) DEFAULT NULL, + `ordering` INT(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), @@ -92,35 +94,35 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component` ( KEY `idx_state` (`published`), KEY `idx_name_code` (`name_code`), KEY `idx_update_server_target` (`update_server_target`), - KEY `idx_adduikit` (`adduikit`), - KEY `idx_add_email_helper` (`add_email_helper`), + KEY `idx_add_php_helper_admin` (`add_php_helper_admin`), + KEY `idx_creatuserhelper` (`creatuserhelper`), + KEY `idx_add_sql` (`add_sql`), KEY `idx_debug_linenr` (`debug_linenr`), - KEY `idx_add_php_preflight_install` (`add_php_preflight_install`), - KEY `idx_add_css` (`add_css`), - KEY `idx_add_update_server` (`add_update_server`), - KEY `idx_add_php_postflight_install` (`add_php_postflight_install`), - KEY `idx_add_php_method_uninstall` (`add_php_method_uninstall`), + KEY `idx_add_php_helper_site` (`add_php_helper_site`), KEY `idx_name` (`name`), - KEY `idx_add_php_preflight_update` (`add_php_preflight_update`), - KEY `idx_add_php_postflight_update` (`add_php_postflight_update`), - KEY `idx_addreadme` (`addreadme`), - KEY `idx_add_sales_server` (`add_sales_server`), + KEY `idx_addfootable` (`addfootable`), + KEY `idx_add_update_server` (`add_update_server`), + KEY `idx_add_php_helper_both` (`add_php_helper_both`), + KEY `idx_add_admin_event` (`add_admin_event`), + KEY `idx_add_site_event` (`add_site_event`), + KEY `idx_add_php_dashboard_methods` (`add_php_dashboard_methods`), KEY `idx_add_license` (`add_license`), KEY `idx_license_type` (`license_type`), - KEY `idx_creatuserhelper` (`creatuserhelper`), - KEY `idx_addfootable` (`addfootable`), - KEY `idx_add_php_helper_both` (`add_php_helper_both`), - KEY `idx_add_php_helper_admin` (`add_php_helper_admin`), - KEY `idx_add_admin_event` (`add_admin_event`), - KEY `idx_add_php_helper_site` (`add_php_helper_site`), - KEY `idx_add_site_event` (`add_site_event`), - KEY `idx_add_sql` (`add_sql`), - KEY `idx_add_php_dashboard_methods` (`add_php_dashboard_methods`), - KEY `idx_emptycontributors` (`emptycontributors`) + KEY `idx_adduikit` (`adduikit`), + KEY `idx_add_css` (`add_css`), + KEY `idx_add_email_helper` (`add_email_helper`), + KEY `idx_add_php_preflight_install` (`add_php_preflight_install`), + KEY `idx_add_php_preflight_update` (`add_php_preflight_update`), + KEY `idx_add_php_postflight_install` (`add_php_postflight_install`), + KEY `idx_add_php_postflight_update` (`add_php_postflight_update`), + KEY `idx_add_php_method_uninstall` (`add_php_method_uninstall`), + KEY `idx_addreadme` (`addreadme`), + KEY `idx_emptycontributors` (`emptycontributors`), + KEY `idx_add_sales_server` (`add_sales_server`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `add_css_view` TINYINT(1) NOT NULL DEFAULT '0', `add_css_views` TINYINT(1) NOT NULL DEFAULT '0', @@ -196,17 +198,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `system_name` VARCHAR(255) NOT NULL DEFAULT '', `type` INT(11) NOT NULL DEFAULT '0', `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `published` TINYINT(1) NOT NULL DEFAULT '1', + `created_by` INT(11) NOT NULL DEFAULT '0', + `modified_by` INT(11) NOT NULL DEFAULT '0', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` INT(11) NOT NULL, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(11) NOT NULL DEFAULT '1', + `hits` INT(11) NOT NULL DEFAULT '0', + `access` INT(11) DEFAULT NULL, + `ordering` INT(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), @@ -245,7 +247,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `add_css` TINYINT(1) NOT NULL DEFAULT '0', `add_css_document` TINYINT(1) NOT NULL DEFAULT '0', @@ -277,17 +279,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` ( `snippet` INT(11) NOT NULL DEFAULT '0', `system_name` VARCHAR(255) NOT NULL DEFAULT '', `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `published` TINYINT(1) NOT NULL DEFAULT '1', + `created_by` INT(11) NOT NULL DEFAULT '0', + `modified_by` INT(11) NOT NULL DEFAULT '0', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` INT(11) NOT NULL, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(11) NOT NULL DEFAULT '1', + `hits` INT(11) NOT NULL DEFAULT '0', + `access` INT(11) DEFAULT NULL, + `ordering` INT(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), @@ -309,7 +311,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `add_css` TINYINT(1) NOT NULL DEFAULT '0', `add_css_document` TINYINT(1) NOT NULL DEFAULT '0', @@ -344,17 +346,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` ( `snippet` INT(11) NOT NULL DEFAULT '0', `system_name` VARCHAR(255) NOT NULL DEFAULT '', `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `published` TINYINT(1) NOT NULL DEFAULT '1', + `created_by` INT(11) NOT NULL DEFAULT '0', + `modified_by` INT(11) NOT NULL DEFAULT '0', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` INT(11) NOT NULL, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(11) NOT NULL DEFAULT '1', + `hits` INT(11) NOT NULL DEFAULT '0', + `access` INT(11) DEFAULT NULL, + `ordering` INT(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), @@ -378,7 +380,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `add_php_view` TINYINT(1) NOT NULL DEFAULT '0', `alias` VARCHAR(255) NOT NULL DEFAULT '', @@ -390,17 +392,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` ( `snippet` INT(11) NOT NULL DEFAULT '0', `template` TEXT NOT NULL, `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `published` TINYINT(1) NOT NULL DEFAULT '1', + `created_by` INT(11) NOT NULL DEFAULT '0', + `modified_by` INT(11) NOT NULL DEFAULT '0', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` INT(11) NOT NULL, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(11) NOT NULL DEFAULT '1', + `hits` INT(11) NOT NULL DEFAULT '0', + `access` INT(11) DEFAULT NULL, + `ordering` INT(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), @@ -414,7 +416,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_layout` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `add_php_view` TINYINT(1) NOT NULL DEFAULT '0', `alias` VARCHAR(255) NOT NULL DEFAULT '', @@ -426,17 +428,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_layout` ( `php_view` MEDIUMTEXT NOT NULL, `snippet` INT(11) NOT NULL DEFAULT '0', `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `published` TINYINT(1) NOT NULL DEFAULT '1', + `created_by` INT(11) NOT NULL DEFAULT '0', + `modified_by` INT(11) NOT NULL DEFAULT '0', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` INT(11) NOT NULL, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(11) NOT NULL DEFAULT '1', + `hits` INT(11) NOT NULL DEFAULT '0', + `access` INT(11) DEFAULT NULL, + `ordering` INT(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), @@ -450,7 +452,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_layout` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `add_php_after_getitem` TINYINT(1) NOT NULL DEFAULT '0', `add_php_after_getitems` TINYINT(1) NOT NULL DEFAULT '0', @@ -482,17 +484,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` ( `view_table_main` INT(11) NOT NULL DEFAULT '0', `where` TEXT NOT NULL, `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `published` TINYINT(1) NOT NULL DEFAULT '1', + `created_by` INT(11) NOT NULL DEFAULT '0', + `modified_by` INT(11) NOT NULL DEFAULT '0', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` INT(11) NOT NULL, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(11) NOT NULL DEFAULT '1', + `hits` INT(11) NOT NULL DEFAULT '0', + `access` INT(11) DEFAULT NULL, + `ordering` INT(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), @@ -512,7 +514,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `description` TEXT NOT NULL, `heading` VARCHAR(255) NOT NULL DEFAULT '', @@ -522,17 +524,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` ( `url` VARCHAR(255) NOT NULL DEFAULT '', `usage` TEXT NOT NULL, `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `published` TINYINT(1) NOT NULL DEFAULT '1', + `created_by` INT(11) NOT NULL DEFAULT '0', + `modified_by` INT(11) NOT NULL DEFAULT '0', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` INT(11) NOT NULL, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(11) NOT NULL DEFAULT '1', + `hits` INT(11) NOT NULL DEFAULT '0', + `access` INT(11) DEFAULT NULL, + `ordering` INT(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), @@ -544,7 +546,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `add_css_view` TINYINT(1) NOT NULL DEFAULT '0', `add_css_views` TINYINT(1) NOT NULL DEFAULT '0', @@ -568,17 +570,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` ( `store` INT(11) NOT NULL DEFAULT '0', `xml` TEXT NOT NULL, `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `published` TINYINT(1) NOT NULL DEFAULT '1', + `created_by` INT(11) NOT NULL DEFAULT '0', + `modified_by` INT(11) NOT NULL DEFAULT '0', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` INT(11) NOT NULL, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(11) NOT NULL DEFAULT '1', + `hits` INT(11) NOT NULL DEFAULT '0', + `access` INT(11) DEFAULT NULL, + `ordering` INT(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), @@ -602,7 +604,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `catid` INT(11) NOT NULL DEFAULT '0', `description` TEXT NOT NULL, @@ -610,17 +612,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` ( `properties` TEXT NOT NULL, `short_description` VARCHAR(255) NOT NULL DEFAULT '', `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `published` TINYINT(1) NOT NULL DEFAULT '1', + `created_by` INT(11) NOT NULL DEFAULT '0', + `modified_by` INT(11) NOT NULL DEFAULT '0', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` INT(11) NOT NULL, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(11) NOT NULL DEFAULT '1', + `hits` INT(11) NOT NULL DEFAULT '0', + `access` INT(11) DEFAULT NULL, + `ordering` INT(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `idx_access` (`access`), KEY `idx_checkout` (`checked_out`), @@ -632,7 +634,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `admin_view` CHAR(255) NOT NULL DEFAULT '', `alias` CHAR(64) NOT NULL DEFAULT '', @@ -647,16 +649,16 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` ( `type` TINYINT(1) NOT NULL DEFAULT '0', `url` VARCHAR(255) NOT NULL DEFAULT '', `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `published` TINYINT(1) NOT NULL DEFAULT '1', + `created_by` INT(11) NOT NULL DEFAULT '0', + `modified_by` INT(11) NOT NULL DEFAULT '0', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` INT(11) NOT NULL, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(11) NOT NULL DEFAULT '1', + `hits` INT(11) NOT NULL DEFAULT '0', + `ordering` INT(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), @@ -676,8 +678,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` ( -- Dumping data for table `#__componentbuilder_component` -- -INSERT INTO `#__componentbuilder_component` (`id`, `add_license`, `license_type`, `add_css`, `add_email_helper`, `add_php_helper_admin`, `add_php_helper_site`, `add_php_postflight_install`, `add_php_method_uninstall`, `add_php_postflight_update`, `add_php_preflight_install`, `add_php_preflight_update`, `add_sql`, `addadmin_views`, `addconfig`, `addcontributors`, `addcustom_admin_views`, `addcustommenus`, `addfiles`, `addfolders`, `addfootable`, `adduikit`, `addsite_views`, `add_admin_event`, `add_site_event`, `add_update_server`, `add_sales_server`, `add_php_dashboard_methods`, `php_dashboard_methods`, `dashboard_tab`, `sales_server_ftp`, `update_server_ftp`, `php_admin_event`, `php_site_event`, `addreadme`, `readme`, `author`, `bom`, `companyname`, `component_version`, `update_server`, `copyright`, `creatuserhelper`, `css`, `debug_linenr`, `description`, `email`, `emptycontributors`, `image`, `license`, `name`, `system_name`, `name_code`, `not_required`, `number`, `php_helper_admin`, `php_helper_site`, `php_postflight_install`, `php_method_uninstall`, `php_postflight_update`, `php_preflight_install`, `php_preflight_update`, `short_description`, `sql`, `sql_tweak`, `website`, `version_update`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `whmcs_key`, `whmcs_url`) VALUES -(25, '', 1, '', '', '', 1, 1, '', '', '', '', '', '{\"adminview\":[\"109\"],\"icomoon\":[\"eye-open\"],\"mainmenu\":[\"1\"],\"dashboard_add\":[\"1\"],\"dashboard_list\":[\"1\"],\"submenu\":[\"1\"],\"checkin\":[\"1\"],\"history\":[\"1\"],\"metadata\":[\"1\"],\"access\":[\"1\"],\"port\":[\"1\"],\"edit_create_site_view\":[\"1\"],\"order\":[\"1\"]}', '', '', '', '', '', '', '', 1, '{\"siteview\":[\"23\",\"25\"],\"menu\":[\"1\",\"0\"],\"metadata\":[\"1\",\"1\"],\"default_view\":[\"1\",\"0\"],\"access\":[\"1\",\"1\"]}', '', '', 1, '', '', '', '', '8IHqgrfIr+IIpK80mIzzN3p/Q3rhpefNAk83xAEOlVyXd+LztC7c5NDELw4Ovu7weZ4d7YhVaF+up4ICe2igIUlO/f2Fb7PxbK3pzTkul64QjMB//4PIr/KVepUyMYQ1Qd+ZRCDrpPa1+RUVRzwl6F5r+p1dnQkWeaPDPywhxZ2ICTsXh794TtQt1bhsuaZf', 'z96S4v8jVOYiF2hrlh9qMp9WnXhXNPh4CioSKMkU1nEGsUChF6lmnrvs/5BQwqY62rq+BDMYVL5KxHImZWN7UcJ8NqJW78I/xR/Ow7k8SSZzhuHvuj7n+Wlo1c6AiCvBQ77YdW5waA+of9+Cs8p0STLyGTW4cPAizaJkLgazXcw2l+m5UyPPLKrRqyihQMdO', '', '', 1, 'IyAjIyNDb21wb25lbnRfbmFtZSMjIyAoIyMjVkVSU0lPTiMjIykNCg0KIVsjIyNDb21wb25lbnRfbmFtZSMjIyBpbWFnZV0gKGh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS9uYW1pYmlhL2RlbW8tam9vbWxhLTMtY29tcG9uZW50L21hc3Rlci9hZG1pbi9hc3NldHMvaW1hZ2VzL2NvbXBvbmVudC0zMDAuanBnICJUaGUgIyMjQ29tcG9uZW50X25hbWUjIyMiKQ0KDQojIyNERVNDUklQVElPTiMjIw0KDQojIEJ1aWxkIERldGFpbHMNCg0KKyAqQ29tcGFueSo6IFsjIyNDT01QQU5ZTkFNRSMjI10gKCMjI0FVVEhPUldFQlNJVEUjIyMpDQorICpBdXRob3IqOiBbIyMjQVVUSE9SIyMjXSAobWFpbHRvOiMjI0FVVEhPUkVNQUlMIyMjKQ0KKyAqTmFtZSo6IFsjIyNDb21wb25lbnRfbmFtZSMjI10gKCMjI0FVVEhPUldFQlNJVEUjIyMpDQorICpGaXJzdCBCdWlsZCo6ICMjI0NSRUFUSU9OREFURSMjIw0KKyAqTGFzdCBCdWlsZCo6ICMjI0JVSUxEREFURSMjIw0KKyAqVmVyc2lvbio6ICMjI1ZFUlNJT04jIyMNCisgKkNvcHlyaWdodCo6ICMjI0NPUFlSSUdIVCMjIw0KKyAqTGljZW5zZSo6ICMjI0xJQ0VOU0UjIyMNCg0KIyMgQnVpbGQgVGltZQ0KDQoqKiMjI3RvdGFsSG91cnMjIyMgSG91cnMqKiBvciAqKiMjI3RvdGFsRGF5cyMjIyBFaWdodCBIb3VyIERheXMqKiAoYWN0dWFsIHRpbWUgdGhlIGF1dGhvciBzYXZlZCAtDQpkdWUgdG8gW0F1dG9tYXRlZCBDb21wb25lbnQgQnVpbGRlcl0gKGh0dHBzOi8vd3d3LnZkbS5pby9qb29tbGEtY29tcG9uZW50LWJ1aWxkZXIpKQ0KDQo+IChpZiBjcmVhdGluZyBhIGZvbGRlciBhbmQgZmlsZSB0b29rICoqNSBzZWNvbmRzKiogYW5kIHdyaXRpbmcgb25lIGxpbmUgb2YgY29kZSB0b29rICoqMTAgc2Vjb25kcyoqLA0KPiBuZXZlciBtYWtpbmcgb25lIG1pc3Rha2Ugb3IgdGFraW5nIGFueSBjb2ZmZWUgYnJlYWsuKQ0KDQorICpMaW5lIGNvdW50KjogKiojIyNMSU5FX0NPVU5UIyMjKioNCisgKkZpbGUgY291bnQqOiAqKiMjI0ZJTEVfQ09VTlQjIyMqKg0KKyAqRm9sZGVyIGNvdW50KjogKiojIyNGT0xERVJfQ09VTlQjIyMqKg0KDQoqKiMjI2FjdHVhbEhvdXJzU3BlbnQjIyMgSG91cnMqKiBvciAqKiMjI2FjdHVhbERheXNTcGVudCMjIyBFaWdodCBIb3VyIERheXMqKiAodGhlIGFjdHVhbCB0aW1lIHRoZSBhdXRob3Igc3BlbnQpDQoNCj4gKHdpdGggdGhlIGZvbGxvd2luZyBicmVhayBkb3duOg0KPiAqKmRlYnVnZ2luZyBAIyMjZGVidWdnaW5nSG91cnMjIyNob3VycyoqID0gY29kaW5ndGltZSAvIDQ7DQo+ICoqcGxhbm5pbmcgQCMjI3BsYW5uaW5nSG91cnMjIyNob3VycyoqID0gY29kaW5ndGltZSAvIDc7DQo+ICoqbWFwcGluZyBAIyMjbWFwcGluZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyAxMDsNCj4gKipvZmZpY2UgQCMjI29mZmljZUhvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA2OykNCg0KKiojIyNhY3R1YWxUb3RhbEhvdXJzIyMjIEhvdXJzKiogb3IgKiojIyNhY3R1YWxUb3RhbERheXMjIyMgRWlnaHQgSG91ciBEYXlzKioNCihhIHRvdGFsIG9mIHRoZSByZWFsaXN0aWMgdGltZSBmcmFtZSBmb3IgdGhpcyBwcm9qZWN0KQ0KDQo+IChpZiBjcmVhdGluZyBhIGZvbGRlciBhbmQgZmlsZSB0b29rICoqNSBzZWNvbmRzKiogYW5kIHdyaXRpbmcgb25lIGxpbmUgb2YgY29kZSB0b29rICoqMTAgc2Vjb25kcyoqLA0KPiB3aXRoIHRoZSBub3JtYWwgZXZlcnlkYXkgcmVhbGl0aWVzIGF0IHRoZSBvZmZpY2UsIHRoYXQgaW5jbHVkZXMgdGhlIGNvbXBvbmVudCBwbGFubmluZywgbWFwcGluZyAmIGRlYnVnZ2luZy4pDQoNClByb2plY3QgZHVyYXRpb246ICoqIyMjcHJvamVjdFdlZWtUaW1lIyMjIHdlZWtzKiogb3IgKiojIyNwcm9qZWN0TW9udGhUaW1lIyMjIG1vbnRocyoqDQoNCj4gVGhpcyAqKmNvbXBvbmVudCoqIHdhcyBidWlsZCB3aXRoIGEgSm9vbWxhIFtBdXRvbWF0ZWQgQ29tcG9uZW50IEJ1aWxkZXJdIChodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKS4NCj4gRGV2ZWxvcGVkIGJ5IFtMbGV3ZWxseW4gdmFuIGRlciBNZXJ3ZV0gKG1haWx0bzpqb29tbGFAdmRtLmlvKQ0KDQojIyBEb25hdGlvbnMNCg0KIElmIHlvdSB3YW50IHRvIHN1cHBvcnQgdGhpcyBwcm9qZWN0LCBwbGVhc2UgY29uc2lkZXIgZG9uYXRpbmc6DQogKiBQYXlQYWw6IHBheUB2ZG0uaW8NCiAqIEJpdGNvaW46IDNIMzVQWXdpa0Vvc3ZjanhIWEdQTFMxR3VmWjRiNGlGdTM=', 'Llewellyn van der Merwe', 'default.txt', 'Vast Development Method', '2.0.0', 'https://www.vdm.io/updates/demo_update_server.xml', 'Copyright (C) 2015. All Rights Reserved', '', '', '', 'Just a basic demo of the most basic implementations of the [Joomla] (http://www.joomla.org) Component Builder\'s ability.', 'info@vdm.io', '', 'images/demo300.jpg', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html', 'Demo', 'Demo', 'demo', '', 4, '', 'CS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGZhbmN5IGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF0ZSgkZGF0ZSkNCgl7DQoJCWlmICghc2VsZjo6aXNWYWxpZFRpbWVTdGFtcCgkZGF0ZSkpDQoJCXsNCgkJCSRkYXRlID0gc3RydG90aW1lKCRkYXRlKTsNCgkJfQ0KCQlyZXR1cm4gZGF0ZSgnalMgXG9cZiBGIFknLCRkYXRlKTsNCgl9DQoNCgkvKioNCgkgKglDaGFuZ2UgdG8gbmljZSBmYW5jeSB0aW1lIGFuZCBkYXRlDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeURhdGVUaW1lKCR0aW1lKQ0KCXsNCgkJaWYgKCFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCR0aW1lKSkNCgkJew0KCQkJJHRpbWUgPSBzdHJ0b3RpbWUoJHRpbWUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCcoRzppKSBqUyBcb1xmIEYgWScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGhvdXI6bWludXRlcyB0aW1lDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeVRpbWUoJHRpbWUpDQoJew0KCQlpZiAoIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0c6aScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoZWNrIGlmIHN0cmluZyBpcyBhIHZhbGlkIHRpbWUgc3RhbXANCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGlzVmFsaWRUaW1lU3RhbXAoJHRpbWVzdGFtcCkNCgl7DQoJCXJldHVybiAoKGludCkgJHRpbWVzdGFtcCA9PT0gJHRpbWVzdGFtcCkNCgkJJiYgKCR0aW1lc3RhbXAgPD0gUEhQX0lOVF9NQVgpDQoJCSYmICgkdGltZXN0YW1wID49IH5QSFBfSU5UX01BWCk7DQoJfQ0K', 'CQkvLyBHZXQgQXBwbGljYXRpb24gb2JqZWN0DQoJCSRhcHAgPSBKRmFjdG9yeTo6Z2V0QXBwbGljYXRpb24oKTsNCgkJJGFwcC0+ZW5xdWV1ZU1lc3NhZ2UoJ0ZpcnN0IHNldCB0aGUgY29tcG9uZW50cyBnbG9iYWwgc2V0dGluZ3MgYW5kIHBlcm1pc3Npb25zIGluIHRoZSA8Yj5PcHRpb25zPC9iPiBhcmVhLCBvciB0aGUgZnJvbnQtZW5kIG9mIHRoZSBjb21wb25lbnQgd2lsbCBub3Qgd29yayBhcyBleHBlY3RlZC4gPGJyIC8+UGxlYXNlIG5vdGUgdGhhdCBlYWNoIHZpZXcgb24gdGhlIGZyb250LWVuZCBoYXMgYWNjZXNzIGFuZCBwZXJtaXNzaW9ucywgc28gaWYgeW91IHdvdWxkIGxpa2UgdGhlIHB1YmxpYyB0byBhY2Nlc3MgdGhvc2Ugdmlld3MgdGhleSBtdXN0IGJlIGdpdmVuIHRoZSBhY2Nlc3MgYW5kIHBlcm1pc3Npb24uJywgJ0luZm8nKTs=', '', '', '', '', 'Demo Component', '', '', 'https://www.vdm.io/', '{\"version\":[\"1.0.5\",\"2.0.0\"],\"mysql\":[\"\",\"\"],\"url\":[\"https://github.com/namibia/demo-joomla-3-component/archive/v1.0.5.zip\",\"https://github.com/namibia/demo-joomla-3-component/archive/v2.0.0.zip\"]}', '', 1, '2016-10-18 11:44:09', '2016-10-20 19:40:28', 11, '', 3, 'A+pthATayZ7y2WEY2sGyz9UXL0LF37gyvakAn+ADoSo=', ''); +INSERT INTO `#__componentbuilder_component` (`id`, `add_license`, `license_type`, `add_css`, `add_email_helper`, `add_php_helper_admin`, `add_php_helper_both`, `add_php_helper_site`, `add_php_postflight_install`, `add_php_method_uninstall`, `add_php_postflight_update`, `add_php_preflight_install`, `add_php_preflight_update`, `add_sql`, `addadmin_views`, `addconfig`, `addcontributors`, `addcustom_admin_views`, `addcustommenus`, `addfiles`, `addfolders`, `addfootable`, `adduikit`, `addsite_views`, `add_admin_event`, `add_site_event`, `add_update_server`, `add_sales_server`, `add_php_dashboard_methods`, `php_dashboard_methods`, `dashboard_tab`, `sales_server_ftp`, `update_server_ftp`, `update_server_target`, `php_admin_event`, `php_site_event`, `addreadme`, `readme`, `author`, `bom`, `companyname`, `component_version`, `update_server`, `copyright`, `creatuserhelper`, `css`, `debug_linenr`, `description`, `email`, `emptycontributors`, `image`, `license`, `name`, `system_name`, `name_code`, `not_required`, `number`, `php_helper_admin`, `php_helper_both`, `php_helper_site`, `php_postflight_install`, `php_method_uninstall`, `php_postflight_update`, `php_preflight_install`, `php_preflight_update`, `short_description`, `sql`, `sql_tweak`, `website`, `version_update`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `whmcs_key`, `whmcs_url`) VALUES +(25, '', 1, '', '', '', '', 1, 1, '', '', '', '', '', '{\"adminview\":[\"109\"],\"icomoon\":[\"eye-open\"],\"mainmenu\":[\"1\"],\"dashboard_add\":[\"1\"],\"dashboard_list\":[\"1\"],\"submenu\":[\"1\"],\"checkin\":[\"1\"],\"history\":[\"1\"],\"metadata\":[\"1\"],\"access\":[\"1\"],\"port\":[\"1\"],\"edit_create_site_view\":[\"1\"],\"order\":[\"1\"]}', '', '', '', '', '', '', '', 1, '{\"siteview\":[\"23\",\"25\"],\"menu\":[\"1\",\"0\"],\"metadata\":[\"1\",\"1\"],\"default_view\":[\"1\",\"0\"],\"access\":[\"1\",\"1\"]}', '', '', 1, '', '', '', '', '8BpZB8pANkIdk9v7tFAf8et50EaLqXXxYimUYjVXskqy4EzDuKtde1ceeaxfmBg1OhTl7Ztr9bBvwh0LxU5G6jphPt4/IWTX3yDwA3C2JoKKU8N71TJ7zErVzVP7EY86iUwMOdAkHVl2rqgkZ2zRnVs24wa7aOuXmT9g5wasuo875J669Ef9Gtpz2oai7XCO', 'h+OalY2AZSUrxLQ7XZvISIZ0yKw1cahHMh4dE4Hm11lK/J3dj1TnWnFbwHZbgyqKVV/ymhqSERLukDUZ5Nwa6jniWmNXLahZl4CiNlplacKcb6VnYHbRRRU91meQRXqqX+nrIxNUR/U9jdPrRSx/VuteiTjc1enxdgAiVm4IH+GeaYsR2TelrozWtjNgukNV', 2, '', '', 1, 'IyAjIyNDb21wb25lbnRfbmFtZSMjIyAoIyMjVkVSU0lPTiMjIykNCg0KIVsjIyNDb21wb25lbnRfbmFtZSMjIyBpbWFnZV0gKGh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS9uYW1pYmlhL2RlbW8tam9vbWxhLTMtY29tcG9uZW50L21hc3Rlci9hZG1pbi9hc3NldHMvaW1hZ2VzL2NvbXBvbmVudC0zMDAuanBnICJUaGUgIyMjQ29tcG9uZW50X25hbWUjIyMiKQ0KDQojIyNERVNDUklQVElPTiMjIw0KDQojIEJ1aWxkIERldGFpbHMNCg0KKyAqQ29tcGFueSo6IFsjIyNDT01QQU5ZTkFNRSMjI10gKCMjI0FVVEhPUldFQlNJVEUjIyMpDQorICpBdXRob3IqOiBbIyMjQVVUSE9SIyMjXSAobWFpbHRvOiMjI0FVVEhPUkVNQUlMIyMjKQ0KKyAqTmFtZSo6IFsjIyNDb21wb25lbnRfbmFtZSMjI10gKCMjI0FVVEhPUldFQlNJVEUjIyMpDQorICpGaXJzdCBCdWlsZCo6ICMjI0NSRUFUSU9OREFURSMjIw0KKyAqTGFzdCBCdWlsZCo6ICMjI0JVSUxEREFURSMjIw0KKyAqVmVyc2lvbio6ICMjI1ZFUlNJT04jIyMNCisgKkNvcHlyaWdodCo6ICMjI0NPUFlSSUdIVCMjIw0KKyAqTGljZW5zZSo6ICMjI0xJQ0VOU0UjIyMNCg0KIyMgQnVpbGQgVGltZQ0KDQoqKiMjI3RvdGFsSG91cnMjIyMgSG91cnMqKiBvciAqKiMjI3RvdGFsRGF5cyMjIyBFaWdodCBIb3VyIERheXMqKiAoYWN0dWFsIHRpbWUgdGhlIGF1dGhvciBzYXZlZCAtDQpkdWUgdG8gW0F1dG9tYXRlZCBDb21wb25lbnQgQnVpbGRlcl0gKGh0dHBzOi8vd3d3LnZkbS5pby9qb29tbGEtY29tcG9uZW50LWJ1aWxkZXIpKQ0KDQo+IChpZiBjcmVhdGluZyBhIGZvbGRlciBhbmQgZmlsZSB0b29rICoqNSBzZWNvbmRzKiogYW5kIHdyaXRpbmcgb25lIGxpbmUgb2YgY29kZSB0b29rICoqMTAgc2Vjb25kcyoqLA0KPiBuZXZlciBtYWtpbmcgb25lIG1pc3Rha2Ugb3IgdGFraW5nIGFueSBjb2ZmZWUgYnJlYWsuKQ0KDQorICpMaW5lIGNvdW50KjogKiojIyNMSU5FX0NPVU5UIyMjKioNCisgKkZpbGUgY291bnQqOiAqKiMjI0ZJTEVfQ09VTlQjIyMqKg0KKyAqRm9sZGVyIGNvdW50KjogKiojIyNGT0xERVJfQ09VTlQjIyMqKg0KDQoqKiMjI2FjdHVhbEhvdXJzU3BlbnQjIyMgSG91cnMqKiBvciAqKiMjI2FjdHVhbERheXNTcGVudCMjIyBFaWdodCBIb3VyIERheXMqKiAodGhlIGFjdHVhbCB0aW1lIHRoZSBhdXRob3Igc3BlbnQpDQoNCj4gKHdpdGggdGhlIGZvbGxvd2luZyBicmVhayBkb3duOg0KPiAqKmRlYnVnZ2luZyBAIyMjZGVidWdnaW5nSG91cnMjIyNob3VycyoqID0gY29kaW5ndGltZSAvIDQ7DQo+ICoqcGxhbm5pbmcgQCMjI3BsYW5uaW5nSG91cnMjIyNob3VycyoqID0gY29kaW5ndGltZSAvIDc7DQo+ICoqbWFwcGluZyBAIyMjbWFwcGluZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyAxMDsNCj4gKipvZmZpY2UgQCMjI29mZmljZUhvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA2OykNCg0KKiojIyNhY3R1YWxUb3RhbEhvdXJzIyMjIEhvdXJzKiogb3IgKiojIyNhY3R1YWxUb3RhbERheXMjIyMgRWlnaHQgSG91ciBEYXlzKioNCihhIHRvdGFsIG9mIHRoZSByZWFsaXN0aWMgdGltZSBmcmFtZSBmb3IgdGhpcyBwcm9qZWN0KQ0KDQo+IChpZiBjcmVhdGluZyBhIGZvbGRlciBhbmQgZmlsZSB0b29rICoqNSBzZWNvbmRzKiogYW5kIHdyaXRpbmcgb25lIGxpbmUgb2YgY29kZSB0b29rICoqMTAgc2Vjb25kcyoqLA0KPiB3aXRoIHRoZSBub3JtYWwgZXZlcnlkYXkgcmVhbGl0aWVzIGF0IHRoZSBvZmZpY2UsIHRoYXQgaW5jbHVkZXMgdGhlIGNvbXBvbmVudCBwbGFubmluZywgbWFwcGluZyAmIGRlYnVnZ2luZy4pDQoNClByb2plY3QgZHVyYXRpb246ICoqIyMjcHJvamVjdFdlZWtUaW1lIyMjIHdlZWtzKiogb3IgKiojIyNwcm9qZWN0TW9udGhUaW1lIyMjIG1vbnRocyoqDQoNCj4gVGhpcyAqKmNvbXBvbmVudCoqIHdhcyBidWlsZCB3aXRoIGEgSm9vbWxhIFtBdXRvbWF0ZWQgQ29tcG9uZW50IEJ1aWxkZXJdIChodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKS4NCj4gRGV2ZWxvcGVkIGJ5IFtMbGV3ZWxseW4gdmFuIGRlciBNZXJ3ZV0gKG1haWx0bzpqb29tbGFAdmRtLmlvKQ0KDQojIyBEb25hdGlvbnMNCg0KIElmIHlvdSB3YW50IHRvIHN1cHBvcnQgdGhpcyBwcm9qZWN0LCBwbGVhc2UgY29uc2lkZXIgZG9uYXRpbmc6DQogKiBQYXlQYWw6IHBheUB2ZG0uaW8NCiAqIEJpdGNvaW46IDNIMzVQWXdpa0Vvc3ZjanhIWEdQTFMxR3VmWjRiNGlGdTM=', 'Llewellyn van der Merwe', 'default.txt', 'Vast Development Method', '2.0.0', 'https://www.vdm.io/updates/demo_update_server.xml', 'Copyright (C) 2015. All Rights Reserved', '', '', '', 'Just a basic demo of the most basic implementations of the [Joomla] (http://www.joomla.org) Component Builder\'s ability.', 'info@vdm.io', '', 'images/demo300.jpg', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html', 'Demo', 'Demo', 'demo', '', 4, '', '', 'CS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGZhbmN5IGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF0ZSgkZGF0ZSkNCgl7DQoJCWlmICghc2VsZjo6aXNWYWxpZFRpbWVTdGFtcCgkZGF0ZSkpDQoJCXsNCgkJCSRkYXRlID0gc3RydG90aW1lKCRkYXRlKTsNCgkJfQ0KCQlyZXR1cm4gZGF0ZSgnalMgXG9cZiBGIFknLCRkYXRlKTsNCgl9DQoNCgkvKioNCgkgKglDaGFuZ2UgdG8gbmljZSBmYW5jeSB0aW1lIGFuZCBkYXRlDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeURhdGVUaW1lKCR0aW1lKQ0KCXsNCgkJaWYgKCFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCR0aW1lKSkNCgkJew0KCQkJJHRpbWUgPSBzdHJ0b3RpbWUoJHRpbWUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCcoRzppKSBqUyBcb1xmIEYgWScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGhvdXI6bWludXRlcyB0aW1lDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeVRpbWUoJHRpbWUpDQoJew0KCQlpZiAoIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0c6aScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoZWNrIGlmIHN0cmluZyBpcyBhIHZhbGlkIHRpbWUgc3RhbXANCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGlzVmFsaWRUaW1lU3RhbXAoJHRpbWVzdGFtcCkNCgl7DQoJCXJldHVybiAoKGludCkgJHRpbWVzdGFtcCA9PT0gJHRpbWVzdGFtcCkNCgkJJiYgKCR0aW1lc3RhbXAgPD0gUEhQX0lOVF9NQVgpDQoJCSYmICgkdGltZXN0YW1wID49IH5QSFBfSU5UX01BWCk7DQoJfQ0K', 'CQkvLyBHZXQgQXBwbGljYXRpb24gb2JqZWN0DQoJCSRhcHAgPSBKRmFjdG9yeTo6Z2V0QXBwbGljYXRpb24oKTsNCgkJJGFwcC0+ZW5xdWV1ZU1lc3NhZ2UoJ0ZpcnN0IHNldCB0aGUgY29tcG9uZW50cyBnbG9iYWwgc2V0dGluZ3MgYW5kIHBlcm1pc3Npb25zIGluIHRoZSA8Yj5PcHRpb25zPC9iPiBhcmVhLCBvciB0aGUgZnJvbnQtZW5kIG9mIHRoZSBjb21wb25lbnQgd2lsbCBub3Qgd29yayBhcyBleHBlY3RlZC4gPGJyIC8+UGxlYXNlIG5vdGUgdGhhdCBlYWNoIHZpZXcgb24gdGhlIGZyb250LWVuZCBoYXMgYWNjZXNzIGFuZCBwZXJtaXNzaW9ucywgc28gaWYgeW91IHdvdWxkIGxpa2UgdGhlIHB1YmxpYyB0byBhY2Nlc3MgdGhvc2Ugdmlld3MgdGhleSBtdXN0IGJlIGdpdmVuIHRoZSBhY2Nlc3MgYW5kIHBlcm1pc3Npb24uJywgJ0luZm8nKTs=', '', '', '', '', 'Demo Component', '', '', 'https://www.vdm.io/', '{\"version\":[\"1.0.5\",\"2.0.0\"],\"mysql\":[\"\",\"\"],\"url\":[\"https://github.com/namibia/demo-joomla-3-component/archive/v1.0.5.zip\",\"https://github.com/namibia/demo-joomla-3-component/archive/v2.0.0.zip\"]}', '', 1, '2016-10-18 11:44:09', '2016-12-29 13:03:03', 21, '', 3, 'wR4ynueprv7ttNNbcupI3y4uT8pzLaR4tezmTD52HuQ=', ''); -- -- Dumping data for table `#__componentbuilder_admin_view` diff --git a/admin/sql/updates/mysql/2.2.5.sql b/admin/sql/updates/mysql/2.2.5.sql new file mode 100644 index 000000000..0fdeef4d1 --- /dev/null +++ b/admin/sql/updates/mysql/2.2.5.sql @@ -0,0 +1,2 @@ +ALTER TABLE `#__componentbuilder_component` ADD `buildcomp` TINYINT(1) NOT NULL DEFAULT '0' AFTER `bom`, +ADD `buildcompsql` MEDIUMTEXT NOT NULL AFTER `buildcomp`; diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index 76100a572..488fc00ab 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/tables/component.php b/admin/tables/component.php index f2a5494d2..3eee1ee54 100644 --- a/admin/tables/component.php +++ b/admin/tables/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 b783b6a46..de6e52c4c 100644 --- a/admin/tables/custom_admin_view.php +++ b/admin/tables/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 7e6968a3f..947e4cb09 100644 --- a/admin/tables/dynamic_get.php +++ b/admin/tables/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/tables/field.php b/admin/tables/field.php index a5de6cb3a..0d4d3a0da 100644 --- a/admin/tables/field.php +++ b/admin/tables/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/tables/fieldtype.php b/admin/tables/fieldtype.php index 468a113ec..551c060ab 100644 --- a/admin/tables/fieldtype.php +++ b/admin/tables/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 052d1c254..113581ce2 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.php diff --git a/admin/tables/layout.php b/admin/tables/layout.php index 53fd44d25..ac73bb308 100644 --- a/admin/tables/layout.php +++ b/admin/tables/layout.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 f8bdab73c..0d2c1aa42 100644 --- a/admin/tables/site_view.php +++ b/admin/tables/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/tables/snippet.php b/admin/tables/snippet.php index 260714b00..e1899399c 100644 --- a/admin/tables/snippet.php +++ b/admin/tables/snippet.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/tables/template.php b/admin/tables/template.php index fa414fd7d..71f8045b3 100644 --- a/admin/tables/template.php +++ b/admin/tables/template.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 388ac7ac7..05eb71146 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @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 b0a35da0e..4c450d064 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.5 - @build 22nd December, 2016 + @version 2.2.6 + @build 30th December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -198,416 +198,401 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');