From 3d1ba0321a354a01aebb7a689f4d71cd0132ea9a Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 6 Oct 2017 16:53:22 +0200 Subject: [PATCH] Added Wiki to JCB. Resolved gh-125 to insure phone numbers are treated as strings. Resolved gh-128 by adding field to Joomla Component View that allows javascript to be added globaly. Converted a few more repeatable fields to subform fields, this is an ongoing project to remove repeatable fields from JCB. --- README.md | 16 +- admin/README.txt | 16 +- admin/access.xml | 62 +- admin/assets/css/admin.css | 4 +- admin/assets/css/custom_admin_view.css | 4 +- admin/assets/css/custom_admin_views.css | 4 +- admin/assets/css/custom_code.css | 2 +- admin/assets/css/custom_codes.css | 2 +- admin/assets/css/dashboard.css | 4 +- admin/assets/css/dynamic_get.css | 8 +- admin/assets/css/dynamic_gets.css | 4 +- admin/assets/css/joomla_component.css | 4 +- admin/assets/css/joomla_components.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 +- admin/assets/js/admin.js | 25 + admin/compiler/joomla_3/admin.js | 4 + admin/compiler/joomla_3/site.js | 4 + admin/componentbuilder.php | 4 +- admin/controller.php | 4 +- admin/controllers/ajax.json.php | 207 +- admin/controllers/componentbuilder.php | 4 +- admin/controllers/custom_admin_view.php | 4 +- admin/controllers/custom_admin_views.php | 4 +- admin/controllers/custom_code.php | 2 +- admin/controllers/custom_codes.php | 2 +- admin/controllers/dynamic_get.php | 4 +- admin/controllers/dynamic_gets.php | 4 +- admin/controllers/help.php | 4 +- admin/controllers/import.php | 4 +- .../controllers/import_joomla_components.php | 4 +- admin/controllers/joomla_component.php | 4 +- admin/controllers/joomla_components.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/a_Get.php | 302 ++- admin/helpers/compiler/e_Interpretation.php | 4 +- admin/helpers/compiler/f_Infusion.php | 5 + admin/helpers/componentbuilder.php | 4 +- admin/helpers/componentbuilderemail.php | 4 +- admin/helpers/headercheck.php | 4 +- 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 | 31 +- .../en-GB/en-GB.com_componentbuilder.sys.ini | 4 + 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 +- .../linked_components_fullwidth.php | 6 +- 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 +- .../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 +- .../linked_components_fullwidth.php | 6 +- .../layouts/custom_admin_view/publishing.php | 4 +- .../layouts/custom_admin_view/publlshing.php | 4 +- admin/layouts/custom_code/details_above.php | 4 +- .../layouts/custom_code/details_fullwidth.php | 4 +- admin/layouts/custom_code/details_left.php | 4 +- admin/layouts/custom_code/details_right.php | 4 +- admin/layouts/custom_code/details_under.php | 4 +- admin/layouts/custom_code/publishing.php | 4 +- admin/layouts/custom_code/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/joint_fullwidth.php | 49 + .../{gettable_above.php => main_above.php} | 6 +- ...table_fullwidth.php => main_fullwidth.php} | 6 +- .../{gettable_left.php => main_left.php} | 6 +- .../{gettable_right.php => main_right.php} | 8 +- .../{gettable_under.php => main_under.php} | 6 +- 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 +- .../field/linked_admin_views_fullwidth.php | 6 +- 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_fullwidth.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/ftp/details_above.php | 4 +- admin/layouts/ftp/details_fullwidth.php | 4 +- .../ftp/linked_components_fullwidth.php | 6 +- admin/layouts/ftp/publishing.php | 4 +- admin/layouts/ftp/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 +- .../admin_views_fullwidth.php | 6 +- .../custom_admin_views_fullwidth.php | 6 +- .../joomla_component/details_above.php | 4 +- .../layouts/joomla_component/details_left.php | 4 +- .../joomla_component/details_right.php | 4 +- .../joomla_component/details_under.php | 4 +- .../dynamic_build_beta_fullwidth.php | 6 +- .../dynamic_integration_fullwidth.php | 4 +- .../libs_helpers_fullwidth.php | 12 +- .../joomla_component/mysql_fullwidth.php | 4 +- .../joomla_component/php_fullwidth.php | 4 +- admin/layouts/joomla_component/publishing.php | 4 +- admin/layouts/joomla_component/publlshing.php | 4 +- .../layouts/joomla_component/readme_left.php | 4 +- .../layouts/joomla_component/readme_right.php | 4 +- .../joomla_component/settings_left.php | 4 +- .../joomla_component/settings_right.php | 4 +- .../joomla_component/site_views_fullwidth.php | 6 +- .../translation_fullwidth.php | 6 +- admin/layouts/language/details_left.php | 4 +- admin/layouts/language/details_right.php | 4 +- admin/layouts/language/publishing.php | 4 +- admin/layouts/language/publlshing.php | 4 +- .../language_translation/details_above.php | 4 +- .../details_fullwidth.php | 4 +- .../language_translation/publishing.php | 4 +- .../language_translation/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 +- .../layouts/site_view/custom_buttons_left.php | 4 +- .../site_view/custom_buttons_right.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 +- .../site_view/linked_components_fullwidth.php | 6 +- 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 | 14 +- admin/models/ajax.php | 672 +++--- admin/models/componentbuilder.php | 4 +- admin/models/custom_admin_view.php | 198 +- admin/models/custom_admin_views.php | 40 +- admin/models/custom_code.php | 2 +- admin/models/custom_codes.php | 2 +- admin/models/dynamic_get.php | 142 +- admin/models/dynamic_gets.php | 8 +- admin/models/field.php | 2 +- admin/models/fields/adminviewfolderlist.php | 4 +- admin/models/fields/adminviews.php | 4 +- admin/models/fields/articles.php | 4 +- admin/models/fields/component.php | 4 +- admin/models/fields/components.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/dynamicget.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/ftps.php | 171 ++ admin/models/fields/lang.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 | 12 +- admin/models/forms/admin_view.js | 870 +++---- admin/models/forms/custom_admin_view.js | 297 ++- admin/models/forms/custom_admin_view.xml | 488 ++-- admin/models/forms/custom_code.js | 78 +- admin/models/forms/dynamic_get.js | 1098 ++++----- admin/models/forms/dynamic_get.xml | 2050 ++++++++--------- admin/models/forms/field.js | 430 ++-- admin/models/forms/fieldtype.xml | 51 +- admin/models/forms/help_document.js | 238 +- admin/models/forms/joomla_component.js | 565 ++--- admin/models/forms/joomla_component.xml | 663 +++--- admin/models/forms/layout.js | 65 +- admin/models/forms/site_view.js | 325 ++- admin/models/forms/snippet.js | 4 +- admin/models/forms/template.js | 84 +- admin/models/forms/template.xml | 78 +- admin/models/ftp.php | 2 +- admin/models/import.php | 4 +- admin/models/import_joomla_components.php | 78 +- admin/models/joomla_component.php | 853 +++---- admin/models/joomla_components.php | 38 +- admin/models/layout.php | 4 +- admin/models/layouts.php | 4 +- admin/models/site_view.php | 6 +- 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 | 55 +- admin/sql/updates/mysql/2.5.5.sql | 3 + admin/tables/custom_admin_view.php | 4 +- admin/tables/custom_code.php | 2 +- admin/tables/dynamic_get.php | 4 +- admin/tables/joomla_component.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/tmpl/edit.php | 344 +-- admin/views/admin_view/view.html.php | 4 +- admin/views/componentbuilder/tmpl/default.php | 35 +- ...lt_issues_the_closed_issues_on_github.php} | 6 +- ...ault_issues_the_open_issues_on_github.php} | 6 +- .../componentbuilder/tmpl/default_main.php | 4 +- .../tmpl/default_readme_information.php | 4 +- .../tmpl/default_releases_information.php | 4 +- ...t_vast_development_method_notice_board.php | 4 +- .../componentbuilder/tmpl/default_vdm.php | 4 +- .../tmpl/default_wiki_tutorials.php | 30 + admin/views/componentbuilder/view.html.php | 4 +- admin/views/custom_admin_view/submitbutton.js | 4 +- admin/views/custom_admin_view/tmpl/edit.php | 90 +- admin/views/custom_admin_view/view.html.php | 6 +- .../views/custom_admin_views/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../custom_admin_views/tmpl/default_body.php | 4 +- .../custom_admin_views/tmpl/default_foot.php | 4 +- .../custom_admin_views/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/custom_admin_views/view.html.php | 4 +- admin/views/custom_code/submitbutton.js | 2 +- admin/views/custom_code/tmpl/edit.php | 116 +- admin/views/custom_code/view.html.php | 2 +- admin/views/custom_codes/tmpl/default.php | 2 +- .../custom_codes/tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../views/custom_codes/tmpl/default_body.php | 2 +- .../views/custom_codes/tmpl/default_foot.php | 2 +- .../views/custom_codes/tmpl/default_head.php | 2 +- .../custom_codes/tmpl/default_toolbar.php | 2 +- admin/views/custom_codes/view.html.php | 2 +- admin/views/dynamic_get/submitbutton.js | 4 +- admin/views/dynamic_get/tmpl/edit.php | 382 ++- admin/views/dynamic_get/view.html.php | 4 +- admin/views/dynamic_gets/tmpl/default.php | 4 +- .../dynamic_gets/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/dynamic_gets/tmpl/default_body.php | 4 +- .../views/dynamic_gets/tmpl/default_foot.php | 4 +- .../views/dynamic_gets/tmpl/default_head.php | 4 +- .../dynamic_gets/tmpl/default_toolbar.php | 4 +- admin/views/dynamic_gets/view.html.php | 4 +- admin/views/field/tmpl/edit.php | 132 +- admin/views/field/view.html.php | 2 +- admin/views/fieldtype/view.html.php | 2 +- admin/views/ftp/view.html.php | 2 +- admin/views/help_document/tmpl/edit.php | 54 +- admin/views/import/tmpl/default.php | 4 +- admin/views/import/view.html.php | 4 +- .../import_joomla_components/tmpl/default.php | 4 +- .../import_joomla_components/view.html.php | 4 +- admin/views/joomla_component/submitbutton.js | 4 +- admin/views/joomla_component/tmpl/edit.php | 353 +-- admin/views/joomla_component/view.html.php | 12 +- .../views/joomla_components/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../joomla_components/tmpl/default_body.php | 4 +- .../joomla_components/tmpl/default_foot.php | 4 +- .../joomla_components/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/joomla_components/view.html.php | 4 +- admin/views/layout/submitbutton.js | 4 +- admin/views/layout/tmpl/edit.php | 19 +- 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 | 100 +- admin/views/site_view/view.html.php | 6 +- admin/views/site_views/tmpl/default.php | 4 +- .../site_views/tmpl/default_batch_body.php | 4 +- .../site_views/tmpl/default_batch_footer.php | 4 +- admin/views/site_views/tmpl/default_body.php | 4 +- admin/views/site_views/tmpl/default_foot.php | 4 +- admin/views/site_views/tmpl/default_head.php | 4 +- .../views/site_views/tmpl/default_toolbar.php | 4 +- admin/views/site_views/view.html.php | 4 +- admin/views/snippet/submitbutton.js | 4 +- admin/views/snippet/tmpl/edit.php | 4 +- admin/views/snippet/view.html.php | 8 +- 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 | 19 +- 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 | 10 +- componentbuilder_update_server.xml | 17 + script.php | 193 +- site/assets/css/site.css | 4 +- site/assets/js/site.js | 25 + site/componentbuilder.php | 4 +- site/controller.php | 4 +- site/controllers/api.php | 4 +- site/controllers/help.php | 4 +- site/helpers/category.php | 4 +- site/helpers/categoryfields.php | 4 +- site/helpers/categoryfieldtypes.php | 4 +- site/helpers/componentbuilder.php | 4 +- site/helpers/headercheck.php | 4 +- site/helpers/route.php | 4 +- site/router.php | 4 +- site/views/api/submitbutton.js | 4 +- 392 files changed, 7069 insertions(+), 6609 deletions(-) create mode 100644 admin/layouts/dynamic_get/joint_fullwidth.php rename admin/layouts/dynamic_get/{gettable_above.php => main_above.php} (94%) rename admin/layouts/dynamic_get/{gettable_fullwidth.php => main_fullwidth.php} (94%) rename admin/layouts/dynamic_get/{gettable_left.php => main_left.php} (94%) rename admin/layouts/dynamic_get/{gettable_right.php => main_right.php} (92%) rename admin/layouts/dynamic_get/{gettable_under.php => main_under.php} (94%) create mode 100644 admin/models/fields/ftps.php create mode 100644 admin/sql/updates/mysql/2.5.5.sql rename admin/views/componentbuilder/tmpl/{default_closed_issues_the_closed_issues_on_github.php => default_issues_the_closed_issues_on_github.php} (92%) rename admin/views/componentbuilder/tmpl/{default_open_issues_the_open_issues_on_github.php => default_issues_the_open_issues_on_github.php} (92%) create mode 100644 admin/views/componentbuilder/tmpl/default_wiki_tutorials.php diff --git a/README.md b/README.md index 619502b33..eebc011f2 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ # Joomla Component Builder (JCB) [![GitHub release](https://img.shields.io/github/release/vdm-io/Joomla-Component-Builder.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases) [![Total Downloads](https://img.shields.io/github/downloads/vdm-io/Joomla-Component-Builder/total.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases) -This is a [Joomla 3.x](http://www.joomla.org/) component. [__See In Action__](https://youtu.be/1KBBtQUxMTc) +This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder/) component. [__See In Action__](https://youtu.be/1KBBtQUxMTc) ![Component Builder image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/vdm-component.jpg "The Component Builder") -The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanced, truly able to build extremely complex components in a fraction of the time. +The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) that is highly advanced, truly able to build extremely complex components in a fraction of the time. -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! +Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -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.5.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.5.6) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://youtu.be/1KBBtQUxMTc) @@ -110,12 +110,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 20th September, 2017 -+ *Version*: 2.5.5 ++ *Last Build*: 6th October, 2017 ++ *Version*: 2.5.6 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **120417** -+ *File count*: **698** ++ *Line count*: **120884** ++ *File count*: **702** + *Folder count*: **121** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/README.txt b/admin/README.txt index 619502b33..eebc011f2 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,15 +1,15 @@ # Joomla Component Builder (JCB) [![GitHub release](https://img.shields.io/github/release/vdm-io/Joomla-Component-Builder.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases) [![Total Downloads](https://img.shields.io/github/downloads/vdm-io/Joomla-Component-Builder/total.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases) -This is a [Joomla 3.x](http://www.joomla.org/) component. [__See In Action__](https://youtu.be/1KBBtQUxMTc) +This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder/) component. [__See In Action__](https://youtu.be/1KBBtQUxMTc) ![Component Builder image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/vdm-component.jpg "The Component Builder") -The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanced, truly able to build extremely complex components in a fraction of the time. +The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) that is highly advanced, truly able to build extremely complex components in a fraction of the time. -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! +Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -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.5.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.5.6) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://youtu.be/1KBBtQUxMTc) @@ -110,12 +110,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 20th September, 2017 -+ *Version*: 2.5.5 ++ *Last Build*: 6th October, 2017 ++ *Version*: 2.5.6 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **120417** -+ *File count*: **698** ++ *Line count*: **120884** ++ *File count*: **702** + *Folder count*: **121** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/access.xml b/admin/access.xml index db355cb1b..cc6bd0863 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -208,6 +208,7 @@ + @@ -251,6 +252,7 @@ + @@ -349,76 +351,78 @@ - - + + - + - + - - - + + + - - + + - + - - + + - + - + - + - + - - + - + + + - + - - + - + + + - - + - + + - + - - + + diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 2b5513108..f2fba667c 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index 9e93f7e0c..28bf6fdb1 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 17th July, 2017 + @version @update number 27 of this MVC + @build 27th September, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.css diff --git a/admin/assets/css/custom_admin_views.css b/admin/assets/css/custom_admin_views.css index 632a91216..c1fcdbc4d 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 17th July, 2017 + @version @update number 27 of this MVC + @build 27th September, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.css diff --git a/admin/assets/css/custom_code.css b/admin/assets/css/custom_code.css index 99894a6e6..9412cd741 100644 --- a/admin/assets/css/custom_code.css +++ b/admin/assets/css/custom_code.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 82 of this MVC - @build 26th April, 2017 + @build 4th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.css diff --git a/admin/assets/css/custom_codes.css b/admin/assets/css/custom_codes.css index f6ada00b7..9b6860038 100644 --- a/admin/assets/css/custom_codes.css +++ b/admin/assets/css/custom_codes.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 82 of this MVC - @build 26th April, 2017 + @build 4th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 2acb850bc..3017e9999 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/dynamic_get.css b/admin/assets/css/dynamic_get.css index bfa2f10ff..f7eba633c 100644 --- a/admin/assets/css/dynamic_get.css +++ b/admin/assets/css/dynamic_get.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 84 of this MVC - @build 4th May, 2017 + @version @update number 94 of this MVC + @build 27th September, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.css @@ -24,4 +24,6 @@ /* CSS Document */ - +.fieldMedium { + width: 80px !important; +} diff --git a/admin/assets/css/dynamic_gets.css b/admin/assets/css/dynamic_gets.css index 965549306..2be1ec746 100644 --- a/admin/assets/css/dynamic_gets.css +++ b/admin/assets/css/dynamic_gets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 84 of this MVC - @build 4th May, 2017 + @version @update number 94 of this MVC + @build 27th September, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.css diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index a5b620f02..71c18b527 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 378 of this MVC - @build 18th September, 2017 + @version @update number 385 of this MVC + @build 6th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.css diff --git a/admin/assets/css/joomla_components.css b/admin/assets/css/joomla_components.css index 4af73a334..df288513e 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 378 of this MVC - @build 18th September, 2017 + @version @update number 385 of this MVC + @build 6th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.css diff --git a/admin/assets/css/layout.css b/admin/assets/css/layout.css index b6b268eef..832fc56af 100644 --- a/admin/assets/css/layout.css +++ b/admin/assets/css/layout.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 30th May, 2017 + @version @update number 81 of this MVC + @build 27th September, 2017 @created 18th May, 2015 @package Component Builder @subpackage layout.css diff --git a/admin/assets/css/layouts.css b/admin/assets/css/layouts.css index 50c457c61..a9f11151f 100644 --- a/admin/assets/css/layouts.css +++ b/admin/assets/css/layouts.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 30th May, 2017 + @version @update number 81 of this MVC + @build 27th September, 2017 @created 18th May, 2015 @package Component Builder @subpackage layouts.css diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index 2bff70315..181e85452 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 51 of this MVC - @build 17th July, 2017 + @version @update number 54 of this MVC + @build 27th September, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.css diff --git a/admin/assets/css/site_views.css b/admin/assets/css/site_views.css index 8e88db20e..4ec2c50c7 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 51 of this MVC - @build 17th July, 2017 + @version @update number 54 of this MVC + @build 27th September, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.css diff --git a/admin/assets/css/snippet.css b/admin/assets/css/snippet.css index e01c30d14..706486413 100644 --- a/admin/assets/css/snippet.css +++ b/admin/assets/css/snippet.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 20th October, 2016 + @version @update number 17 of this MVC + @build 27th September, 2017 @created 19th May, 2015 @package Component Builder @subpackage snippet.css diff --git a/admin/assets/css/snippets.css b/admin/assets/css/snippets.css index 799e5ba2d..2b1011ccf 100644 --- a/admin/assets/css/snippets.css +++ b/admin/assets/css/snippets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 20th October, 2016 + @version @update number 17 of this MVC + @build 27th September, 2017 @created 19th May, 2015 @package Component Builder @subpackage snippets.css diff --git a/admin/assets/css/template.css b/admin/assets/css/template.css index 13a94e5c7..048377ab5 100644 --- a/admin/assets/css/template.css +++ b/admin/assets/css/template.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 40 of this MVC - @build 1st April, 2017 + @version @update number 45 of this MVC + @build 27th September, 2017 @created 26th May, 2015 @package Component Builder @subpackage template.css diff --git a/admin/assets/css/templates.css b/admin/assets/css/templates.css index d1b6d9bb2..d3425725b 100644 --- a/admin/assets/css/templates.css +++ b/admin/assets/css/templates.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 40 of this MVC - @build 1st April, 2017 + @version @update number 45 of this MVC + @build 27th September, 2017 @created 26th May, 2015 @package Component Builder @subpackage templates.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index e69de29bb..5c409af9b 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -0,0 +1,25 @@ +/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/ + __ __ _ _____ _ _ __ __ _ _ _ + \ \ / / | | | __ \ | | | | | \/ | | | | | | | + \ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| | + \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | + \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | + \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| + | | + |_| +/-------------------------------------------------------------------------------------------------------------------------------/ + + @version 2.5.6 + @build 6th October, 2017 + @created 30th April, 2015 + @package Component Builder + @subpackage admin.js + @author Llewellyn van der 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 + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +/* JS Document */ diff --git a/admin/compiler/joomla_3/admin.js b/admin/compiler/joomla_3/admin.js index e69de29bb..9c701e5be 100644 --- a/admin/compiler/joomla_3/admin.js +++ b/admin/compiler/joomla_3/admin.js @@ -0,0 +1,4 @@ +###BOM### + +/* JS Document */ +###ADMINJS### \ No newline at end of file diff --git a/admin/compiler/joomla_3/site.js b/admin/compiler/joomla_3/site.js index e69de29bb..813632b9a 100644 --- a/admin/compiler/joomla_3/site.js +++ b/admin/compiler/joomla_3/site.js @@ -0,0 +1,4 @@ +###BOM### + +/* JS Document */ +###SITEJS### \ No newline at end of file diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index da736ecb3..3e9373f28 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index ec21dda72..d15dd6dbd 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 1c008602c..d9650fdcc 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php @@ -49,15 +49,14 @@ class ComponentbuilderControllerAjax extends JControllerLegacy $this->registerTask('tableColumns', 'ajax'); $this->registerTask('fieldSelectOptions', 'ajax'); $this->registerTask('getImportScripts', 'ajax'); - $this->registerTask('layoutDetails', 'ajax'); $this->registerTask('templateDetails', 'ajax'); - $this->registerTask('snippetDetails', 'ajax'); - $this->registerTask('dynamicValues', 'ajax'); - $this->registerTask('dynamicFormDetails', 'ajax'); + $this->registerTask('getLayoutDetails', 'ajax'); $this->registerTask('dbTableColumns', 'ajax'); $this->registerTask('viewTableColumns', 'ajax'); + $this->registerTask('getDynamicValues', 'ajax'); $this->registerTask('checkFunctionName', 'ajax'); $this->registerTask('usedin', 'ajax'); + $this->registerTask('snippetDetails', 'ajax'); $this->registerTask('fieldOptions', 'ajax'); $this->registerTask('getButton', 'ajax'); } @@ -340,44 +339,6 @@ class ComponentbuilderControllerAjax extends JControllerLegacy } } break; - case 'layoutDetails': - try - { - $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); - $idValue = $jinput->get('id', null, 'INT'); - if($idValue && $user->id != 0) - { - $result = $this->getModel('ajax')->getLayoutDetails($idValue); - } - else - { - $result = false; - } - if($callback = $jinput->get('callback', null, 'CMD')) - { - echo $callback . "(".json_encode($result).");"; - } - elseif($returnRaw) - { - echo json_encode($result); - } - else - { - echo "(".json_encode($result).");"; - } - } - catch(Exception $e) - { - if($callback = $jinput->get('callback', null, 'CMD')) - { - echo $callback."(".json_encode($e).");"; - } - else - { - echo "(".json_encode($e).");"; - } - } - break; case 'templateDetails': try { @@ -416,91 +377,14 @@ class ComponentbuilderControllerAjax extends JControllerLegacy } } break; - case 'snippetDetails': + case 'getLayoutDetails': try { $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); $idValue = $jinput->get('id', NULL, 'INT'); if($idValue && $user->id != 0) { - $result = $this->getModel('ajax')->getSnippetDetails($idValue); - } - else - { - $result = false; - } - if($callback = $jinput->get('callback', null, 'CMD')) - { - echo $callback . "(".json_encode($result).");"; - } - elseif($returnRaw) - { - echo json_encode($result); - } - else - { - echo "(".json_encode($result).");"; - } - } - catch(Exception $e) - { - if($callback = $jinput->get('callback', null, 'CMD')) - { - echo $callback."(".json_encode($e).");"; - } - else - { - echo "(".json_encode($e).");"; - } - } - break; - case 'dynamicValues': - try - { - $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); - $idValue = $jinput->get('id', NULL, 'INT'); - $viewValue = $jinput->get('view', NULL, 'WORD'); - if($idValue && $viewValue && $user->id != 0) - { - $result = $this->getModel('ajax')->getDynamicValues($idValue, $viewValue); - } - else - { - $result = false; - } - if($callback = $jinput->get('callback', null, 'CMD')) - { - echo $callback . "(".json_encode($result).");"; - } - elseif($returnRaw) - { - echo json_encode($result); - } - else - { - echo "(".json_encode($result).");"; - } - } - catch(Exception $e) - { - if($callback = $jinput->get('callback', null, 'CMD')) - { - echo $callback."(".json_encode($e).");"; - } - else - { - echo "(".json_encode($e).");"; - } - } - break; - case 'dynamicFormDetails': - try - { - $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); - $idValue = $jinput->get('id', NULL, 'INT'); - if($idValue && $user->id != 0) - { - $result = $this->getModel('ajax')->getDynamicFormDetails($idValue); + $result = $this->getModel('ajax')->getLayoutDetails($idValue); } else { @@ -611,6 +495,45 @@ class ComponentbuilderControllerAjax extends JControllerLegacy } } break; + case 'getDynamicValues': + try + { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); + $idValue = $jinput->get('id', NULL, 'INT'); + $viewValue = $jinput->get('view', NULL, 'WORD'); + if($idValue && $viewValue && $user->id != 0) + { + $result = $this->getModel('ajax')->getDynamicValues($idValue, $viewValue); + } + else + { + $result = false; + } + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback . "(".json_encode($result).");"; + } + elseif($returnRaw) + { + echo json_encode($result); + } + else + { + echo "(".json_encode($result).");"; + } + } + catch(Exception $e) + { + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback."(".json_encode($e).");"; + } + else + { + echo "(".json_encode($e).");"; + } + } + break; case 'checkFunctionName': try { @@ -690,6 +613,44 @@ class ComponentbuilderControllerAjax extends JControllerLegacy } } break; + case 'snippetDetails': + try + { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); + $idValue = $jinput->get('id', NULL, 'INT'); + if($idValue && $user->id != 0) + { + $result = $this->getModel('ajax')->getSnippetDetails($idValue); + } + else + { + $result = false; + } + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback . "(".json_encode($result).");"; + } + elseif($returnRaw) + { + echo json_encode($result); + } + else + { + echo "(".json_encode($result).");"; + } + } + catch(Exception $e) + { + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback."(".json_encode($e).");"; + } + else + { + echo "(".json_encode($e).");"; + } + } + break; case 'fieldOptions': try { diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 04f375cb1..7c8da43c1 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index 60d3e9609..69febd3ea 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 17th July, 2017 + @version @update number 27 of this MVC + @build 27th September, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index a3d8b2d3f..df2120fde 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 17th July, 2017 + @version @update number 27 of this MVC + @build 27th September, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/controllers/custom_code.php b/admin/controllers/custom_code.php index c27d39429..72811145f 100644 --- a/admin/controllers/custom_code.php +++ b/admin/controllers/custom_code.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 82 of this MVC - @build 26th April, 2017 + @build 4th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.php diff --git a/admin/controllers/custom_codes.php b/admin/controllers/custom_codes.php index 01118f612..3f6aae561 100644 --- a/admin/controllers/custom_codes.php +++ b/admin/controllers/custom_codes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 82 of this MVC - @build 26th April, 2017 + @build 4th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.php diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index c341d5d6e..b38450731 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 84 of this MVC - @build 4th May, 2017 + @version @update number 94 of this MVC + @build 27th September, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index bf97acb65..7a396212e 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 84 of this MVC - @build 4th May, 2017 + @version @update number 94 of this MVC + @build 27th September, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 8c1e3019d..271856a08 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 0b34267d7..ea2dff640 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index 10ec1be76..71c3df898 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index fe56da039..f95a37f18 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 378 of this MVC - @build 18th September, 2017 + @version @update number 385 of this MVC + @build 6th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index 1a38865ba..04e3792ba 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 378 of this MVC - @build 18th September, 2017 + @version @update number 385 of this MVC + @build 6th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php index f9c4e9840..f6f23da26 100644 --- a/admin/controllers/layout.php +++ b/admin/controllers/layout.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 30th May, 2017 + @version @update number 81 of this MVC + @build 27th September, 2017 @created 18th May, 2015 @package Component Builder @subpackage layout.php diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php index 252029d17..663c05330 100644 --- a/admin/controllers/layouts.php +++ b/admin/controllers/layouts.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 30th May, 2017 + @version @update number 81 of this MVC + @build 27th September, 2017 @created 18th May, 2015 @package Component Builder @subpackage layouts.php diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index bf45d79c4..d85d70d0c 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 51 of this MVC - @build 17th July, 2017 + @version @update number 54 of this MVC + @build 27th September, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index 07d32b32e..2677a9cb4 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 51 of this MVC - @build 17th July, 2017 + @version @update number 54 of this MVC + @build 27th September, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php index efd49dfbc..92e15f203 100644 --- a/admin/controllers/snippet.php +++ b/admin/controllers/snippet.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 20th October, 2016 + @version @update number 17 of this MVC + @build 27th September, 2017 @created 19th May, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php index d909d9f74..fdc3b30d1 100644 --- a/admin/controllers/snippets.php +++ b/admin/controllers/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 20th October, 2016 + @version @update number 17 of this MVC + @build 27th September, 2017 @created 19th May, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/controllers/template.php b/admin/controllers/template.php index 204dd34be..9084095b1 100644 --- a/admin/controllers/template.php +++ b/admin/controllers/template.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 40 of this MVC - @build 1st April, 2017 + @version @update number 45 of this MVC + @build 27th September, 2017 @created 26th May, 2015 @package Component Builder @subpackage template.php diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php index ba88fd9cc..323f17a45 100644 --- a/admin/controllers/templates.php +++ b/admin/controllers/templates.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 40 of this MVC - @build 1st April, 2017 + @version @update number 45 of this MVC + @build 27th September, 2017 @created 26th May, 2015 @package Component Builder @subpackage templates.php diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 2b38b62fb..d74c9c519 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -887,6 +887,17 @@ class Get unset($old_component); } + // add_javascript + if ($component->add_javascript == 1) + { + $this->customScriptBuilder['component_js'] = base64_decode($component->javascript); + } + else + { + $this->customScriptBuilder['component_js'] = ''; + } + unset($component->javascript); + // add_css if ($component->add_css == 1) { @@ -897,6 +908,7 @@ class Get $this->customScriptBuilder['component_css'] = ''; } unset($component->css); + // set the lang target $this->lang = 'admin'; // add PHP in ADMIN @@ -1184,6 +1196,19 @@ class Get } $this->customScriptBuilder['token'][$name_single] = false; $this->customScriptBuilder['token'][$name_list] = false; + // set some placeholders + $this->placeholders['###view###'] = ComponentbuilderHelper::safeString($name_single); + $this->placeholders['###views###'] = ComponentbuilderHelper::safeString($name_list); + $this->placeholders['###View###'] = ComponentbuilderHelper::safeString($name_single, 'F'); + $this->placeholders['###Views###'] = ComponentbuilderHelper::safeString($name_list, 'F'); + $this->placeholders['###VIEW###'] = ComponentbuilderHelper::safeString($name_single, 'U'); + $this->placeholders['###VIEWS###'] = ComponentbuilderHelper::safeString($name_list, 'U'); + $this->placeholders['[[[view]]]'] = $this->placeholders['###view###']; + $this->placeholders['[[[views]]]'] = $this->placeholders['###views###']; + $this->placeholders['[[[View]]]'] = $this->placeholders['###View###']; + $this->placeholders['[[[Views]]]'] = $this->placeholders['###Views###']; + $this->placeholders['[[[VIEW]]]'] = $this->placeholders['###VIEW###']; + $this->placeholders['[[[VIEWS]]]'] = $this->placeholders['###VIEWS###']; // load the values form params $permissions = json_decode($view->addpermissions,true); unset($view->addpermissions); @@ -1537,6 +1562,19 @@ class Get unset($view->sql); } } + // clear placeholders + unset($this->placeholders['###view###']); + unset($this->placeholders['###views###']); + unset($this->placeholders['###View###']); + unset($this->placeholders['###Views###']); + unset($this->placeholders['###VIEW###']); + unset($this->placeholders['###VIEWS###']); + unset($this->placeholders['[[[view]]]']); + unset($this->placeholders['[[[views]]]']); + unset($this->placeholders['[[[View]]]']); + unset($this->placeholders['[[[Views]]]']); + unset($this->placeholders['[[[VIEW]]]']); + unset($this->placeholders['[[[VIEWS]]]']); // store this view to class object $this->_adminViewData[$id] = $view; } @@ -1617,7 +1655,7 @@ class Get $main_get = $this->setGetData(array($view->main_get),$view->code); $view->main_get = $main_get[0]; // set the custom_get data - $view->custom_get = $this->setGetData(json_decode($view->custom_get,true),$view->code); + $view->custom_get = $this->setGetData(json_decode($view->custom_get, true),$view->code); // set array adding array of scripts $addArray = array('php_view','php_jview','php_jview_display','php_document','js_document','css_document','css'); foreach ($addArray as $scripter) @@ -1932,7 +1970,7 @@ class Get * @return oject the get dynamicGet data * */ - public function setGetData($ids,$view_code) + public function setGetData($ids, $view_code) { if (ComponentbuilderHelper::checkArray($ids)) { @@ -2023,14 +2061,14 @@ class Get { case 1: // set the view data - $result->main_get[0]['selection'] = $this->setDataSelection($result->key,$view_code,$result->view_selection,$result->view_table_main,'a','','view'); + $result->main_get[0]['selection'] = $this->setDataSelection($result->key, $view_code, $result->view_selection, $result->view_table_main, 'a', '', 'view'); $result->main_get[0]['as'] = 'a'; $result->main_get[0]['key'] = $result->key; unset($result->view_selection); break; case 2: // set the database data - $result->main_get[0]['selection'] = $this->setDataSelection($result->key,$view_code,$result->db_selection,$result->db_table_main,'a','','db'); + $result->main_get[0]['selection'] = $this->setDataSelection($result->key, $view_code, $result->db_selection, $result->db_table_main, 'a', '', 'db'); $result->main_get[0]['as'] = 'a'; $result->main_get[0]['key'] = $result->key; unset($result->db_selection); @@ -2043,206 +2081,148 @@ class Get break; } // set join_view_table details - $join_view_table = json_decode($result->join_view_table,true); - unset($result->join_view_table); - $result->join_view_table = array(); - if (ComponentbuilderHelper::checkArray($join_view_table)) + $result->join_view_table = json_decode($result->join_view_table, true); + if (ComponentbuilderHelper::checkArray($result->join_view_table)) { - foreach ($join_view_table as $option => $values) + foreach ($result->join_view_table as $nr => &$option) { - foreach ($values as $nr => $value) + if (ComponentbuilderHelper::checkString($option['selection'])) { - if (ComponentbuilderHelper::checkString($value)) + // convert the type + $option['type'] = $typeArray[$option['type']]; + // convert the operator + $option['operator'] = $operatorArray[$option['operator']]; + // get the on field values + $on_field = array(); // array(on_field_as, on_field) + $on_field = array_map('trim', explode('.',$option['on_field'])); + // get the join field values + $join_field = array(); // array(join_field_as, join_field) + $join_field = array_map('trim', explode('.',$option['join_field'])); + $option['selection'] = + $this->setDataSelection($result->key, $view_code, $option['selection'], $option['view_table'], $option['as'], $option['row_type'], 'view'); + $option['key'] = $result->key; + // load to the getters + if ($option['row_type'] == 1) { - if ($option === 'selection') + $result->main_get[] = $option; + if ($on_field[0] === 'a') { - $on_field_as = ''; - $on_field = ''; - list($on_field_as,$on_field) = array_map('trim', explode('.',$result->join_view_table[$nr]['on_field'])); - $join_field_as = ''; - $join_field = ''; - list($join_field_as,$join_field) = array_map('trim', explode('.',$result->join_view_table[$nr]['join_field'])); - $result->join_view_table[$nr][$option] = - $this->setDataSelection($result->key,$view_code,$value,$result->join_view_table[$nr]['view_table'],$result->join_view_table[$nr]['as'],$result->join_view_table[$nr]['row_type'],'view'); - $result->join_view_table[$nr]['key'] = $result->key; - if ($result->join_view_table[$nr]['row_type'] == 1) - { - $result->main_get[] = $result->join_view_table[$nr]; - if ($on_field_as === 'a') - { - $this->siteMainGet[$this->target][$view_code][$result->join_view_table[$nr]['as']] = $result->join_view_table[$nr]['as']; - } - else - { - $this->siteDynamicGet[$this->target][$view_code][$result->join_view_table[$nr]['as']][$join_field] = $on_field_as; - } - } - elseif ($result->join_view_table[$nr]['row_type'] == 2) - { - $result->custom_get[] = $result->join_view_table[$nr]; - if ($on_field_as != 'a') - { - $this->siteDynamicGet[$this->target][$view_code][$result->join_view_table[$nr]['as']][$join_field] = $on_field_as; - } - } - unset($result->join_view_table[$nr]); + $this->siteMainGet[$this->target][$view_code][$option['as']] = $option['as']; } else { - if ($option === 'type') - { - $value = $typeArray[$value]; - } - if ($option === 'operator') - { - $value = $operatorArray[$value]; - } - $result->join_view_table[$nr][$option] = $value; + $this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0]; + } + } + elseif ($option['row_type'] == 2) + { + $result->custom_get[] = $option; + if ($on_field[0] != 'a') + { + $this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0]; } } } + unset($result->join_view_table[$nr]); } } unset($result->join_view_table); // set join_db_table details - $join_db_table = json_decode($result->join_db_table,true); - unset($result->join_db_table); - $result->join_db_table = array(); - if (ComponentbuilderHelper::checkArray($join_db_table)) + $result->join_db_table = json_decode($result->join_db_table, true); + if (ComponentbuilderHelper::checkArray($result->join_db_table)) { - foreach ($join_db_table as $option => $values) + foreach ($result->join_db_table as $nr => &$option1) { - foreach ($values as $nr => $value) + if (ComponentbuilderHelper::checkString($option1['selection'])) { - if (ComponentbuilderHelper::checkString($value)) + // convert the type + $option1['type'] = $typeArray[$option1['type']]; + // convert the operator + $option1['operator'] = $operatorArray[$option1['operator']]; + // get the on field values + $on_field = array(); // array(on_field_as, on_field) + $on_field = array_map('trim', explode('.',$option1['on_field'])); + // get the join field values + $join_field = array(); // array(join_field_as, join_field) + $join_field = array_map('trim', explode('.',$option1['join_field'])); + $option1['selection'] = + $this->setDataSelection($result->key, $view_code, $value, $option1['db_table'], $option1['as'], $option1['row_type'], 'db'); + $option1['key'] = $result->key; + // load to the getters + if ($option1['row_type'] == 1) { - if ($option === 'selection') + $result->main_get[] = $option1; + if ($on_field[0] === 'a') { - $on_field_as = ''; - $on_field = ''; - list($on_field_as,$on_field) = array_map('trim', explode('.',$result->join_db_table[$nr]['on_field'])); - $join_field_as = ''; - $join_field = ''; - list($join_field_as,$join_field) = array_map('trim', explode('.',$result->join_db_table[$nr]['join_field'])); - $result->join_db_table[$nr][$option] = - $this->setDataSelection($result->key,$view_code,$value,$result->join_db_table[$nr]['db_table'],$result->join_db_table[$nr]['as'],$result->join_db_table[$nr]['row_type'],'db'); - $result->join_db_table[$nr]['key'] = $result->key; - if ($result->join_db_table[$nr]['row_type'] == 1) - { - $result->main_get[] = $result->join_db_table[$nr]; - if ($on_field_as === 'a') - { - $this->siteMainGet[$this->target][$view_code][$result->join_db_table[$nr]['as']] = $result->join_db_table[$nr]['as']; - } - else - { - $this->siteDynamicGet[$this->target][$view_code][$result->join_db_table[$nr]['as']][$join_field] = $on_field_as; - } - } - elseif ($result->join_db_table[$nr]['row_type'] == 2) - { - $result->custom_get[] = $result->join_db_table[$nr]; - if ($on_field_as != 'a') - { - $this->siteDynamicGet[$this->target][$view_code][$result->join_db_table[$nr]['as']][$join_field] = $on_field_as; - } - } - unset($result->join_db_table[$nr]); + $this->siteMainGet[$this->target][$view_code][$option1['as']] = $option1['as']; } else { - if ($option === 'type') - { - $value = $typeArray[$value]; - } - if ($option === 'operator') - { - $value = $operatorArray[$value]; - } - $result->join_db_table[$nr][$option] = $value; + $this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0]; + } + } + elseif ($option1['row_type'] == 2) + { + $result->custom_get[] = $option1; + if ($on_field[0] != 'a') + { + $this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0]; } } } + unset($result->join_db_table[$nr]); } } unset($result->join_db_table); // set filter details - $filter = json_decode($result->filter,true); - unset($result->filter); - $result->filter = array(); - if (ComponentbuilderHelper::checkArray($filter)) + $result->filter = json_decode($result->filter, true); + if (ComponentbuilderHelper::checkArray($result->filter)) { - foreach ($filter as $option => $values) + foreach ($result->filter as $nr => &$option2) { - foreach ($values as $nr => $value) + if (isset($option2['operator'])) { - if (ComponentbuilderHelper::checkString($value)) - { - if ($option === 'operator') - { - $value = $operatorArray[$value]; - $result->filter[$nr]['key'] = $result->key; - } - $result->filter[$nr][$option] = $value; - } + $option2['operator'] = $operatorArray[$option2['operator']]; + $option2['key'] = $result->key; } - } - } - // set global details - $global = json_decode($result->global,true); - unset($result->global); - $result->global = array(); - if (ComponentbuilderHelper::checkArray($global)) - { - foreach ($global as $option => $values) - { - foreach ($values as $nr => $value) + else { - if (ComponentbuilderHelper::checkString($value)) - { - $result->global[$nr][$option] = $value; - } - } - } - } - // set order details - $order = json_decode($result->order,true); - unset($result->order); - $result->order = array(); - if (ComponentbuilderHelper::checkArray($order)) - { - foreach ($order as $option => $values) - { - foreach ($values as $nr => $value) - { - if (ComponentbuilderHelper::checkString($value)) - { - $result->order[$nr][$option] = $value; - } + unset($result->filter[$nr]); } } } // set where details - $where = json_decode($result->where,true); - unset($result->where); - $result->where = array(); - if (ComponentbuilderHelper::checkArray($where)) + $result->where = json_decode($result->where, true); + if (ComponentbuilderHelper::checkArray($result->where)) { - foreach ($where as $option => $values) + foreach ($result->where as $nr => &$option3) { - foreach ($values as $nr => $value) + if (isset($option3['operator'])) { - if (ComponentbuilderHelper::checkString($value)) - { - if ($option === 'operator') - { - $value = $operatorArray[$value]; - } - $result->where[$nr][$option] = $value; - } + $option3['operator'] = $operatorArray[$option3['operator']]; + } + else + { + unset($result->where[$nr]); } } } + else + { + unset($result->where); + } + // set order details + $result->order = json_decode($result->order, true); + if (!ComponentbuilderHelper::checkArray($result->order)) + { + unset($result->order); + } + // set global details + $result->global = json_decode($result->global, true); + if (!ComponentbuilderHelper::checkArray($result->global)) + { + unset($result->global); + } } return $results; } @@ -2688,7 +2668,7 @@ class Get * @return array the select query * */ - public function setDataSelection($method_key,$view_code,$string,$asset,$as,$row_type,$type) + public function setDataSelection($method_key, $view_code, $string, $asset, $as, $row_type, $type) { if (ComponentbuilderHelper::checkString($string)) { @@ -3257,7 +3237,7 @@ class Get } // check what type of place holders we should load here $placeholderType = (int) $item['comment_type'].'2'; - if (stripos($item['code'], '[[[view') !== false || stripos($item['code'], '[[[sview') !== false) + if (stripos($item['code'], '[[[view') !== false || stripos($item['code'], '[[[sview') !== false || stripos($item['code'], '[[[arg') !== false) { // if view is being set dynamicly then we can't update this code via IDE (TODO) $placeholderType = 3; diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 43c87d5b3..d53df8225 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -11772,14 +11772,14 @@ class Interpretation extends Fields $display[] = PHP_EOL."\t\t"; $display[] = "\t\t".'
'; $display[] = $tab.'
'; - $display[] = $tab."\t 'one')); ?>"; + $display[] = $tab."\t '".$alias."_one')); ?>"; $slidecounter = 1; foreach($accordians as $accordianname => $html) { $ac_alias = ComponentbuilderHelper::safeString($accordianname); $counterName = ComponentbuilderHelper::safeString($slidecounter); $tempName = $alias.'_'.$ac_alias; - $display[] = $tab."\t\t"; + $display[] = $tab."\t\t"; $display[] = $tab."\t\t\tloadTemplate('".$tempName."');?>"; $display[] = $tab."\t\t"; $slidecounter++; diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index 749bb4e92..4929fded8 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -143,6 +143,11 @@ class Infusion extends Interpretation $this->setConfigFieldsets(1); $this->lang = $keepLang; + // ###ADMINJS### + $this->fileContentStatic['###ADMINJS###'] = $this->setPlaceholders($this->customScriptBuilder['component_js'], $this->placeholders); + // ###SITEJS### + $this->fileContentStatic['###SITEJS###'] = $this->setPlaceholders($this->customScriptBuilder['component_js'], $this->placeholders); + // ###ADMINCSS### $this->fileContentStatic['###ADMINCSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders); // ###SITECSS### diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 332b79af9..3df4416fc 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index a36af238e..fb2ca8812 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilderemail.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 5288bddf5..83b71315d 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 413c5c68a..963fffada 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index dbcc69bf0..2daeb7bcf 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index 373ac97f7..567335eab 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 95cf9f961..86798ec99 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 90c34225e..6da4d2a2d 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -885,7 +885,7 @@ COM_COMPONENTBUILDER_BFIELD_TYPEB_IDS_MISMATCH_IN_BSB="Field type id:%s m COM_COMPONENTBUILDER_BFIELD_TYPEB_NOT_SET_FOR_BSB="Field type not set for %s." COM_COMPONENTBUILDER_BGET_THE_KEY_FROMB_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA="Get the key from %s" COM_COMPONENTBUILDER_BIMAGESB_NOT_MOVE_TO_CORRECT_LOCATION="Images not move to correct location!" -COM_COMPONENTBUILDER_BJOIN_VIEW_TABLE_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BVIEW_TABLEB_SO_THE_IDS_WAS_REMOVED="Join view table in %s has id mismatch of selected view table. So the id:%s was removed!" +COM_COMPONENTBUILDER_BJOIN_VIEW_TABLE_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BJOIN_VIEW_TABLEB_SO_THE_IDS_WAS_REMOVED="Join view table in %s has id mismatch of selected join view table. So the id:%s was removed!" COM_COMPONENTBUILDER_BLINKED_VIEWB_IDS_MISMATCH_IN_BADMIN_VIEWSB_AND_WAS_EMREMOVEDEM_FROM_THE_LINKED_VIEWS="Linked view id:%s mismatch in admin view:%s, and was removed from the linked views." COM_COMPONENTBUILDER_BMAIN_GETB_IDS_MISMATCH_IN_BSB="Main get id:%s mismatch in %s." COM_COMPONENTBUILDER_BMAIN_GETB_NOT_SET_FOR_BSB="Main get not set for %s." @@ -1667,7 +1667,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_LABEL="Modified By" COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_DESC="The date this Custom Code was modified." COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_LABEL="Modified Date" COM_COMPONENTBUILDER_CUSTOM_CODE_NEW="A New Custom Code" -COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION="[save to see placeholder]
You can also pass values to this code like this: [save to see placeholder trick]
Those values will be replace placeholders called args. These placeholders are zero based and should look like this: [[[arg0]]], [[[arge1]]] ... as many as you like. If you use 5 args in your code, you must always pass 5 values, since they are zero based your fifth arg will look like this [[[arg4]]]
Please note that you can not use this placeholder in other custom code views, but in all other custom code areas in JCB found in other views like the admin, site and custom admin views.
Another important note, all code with args will not be reversed updated from the changes in the editor out side of JCB at this time, since that will remove all the arg placeholders this means you will only be able to update the code here in the JCB UI.
This note will change once we have resolved these limitations." +COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION="[save to see placeholder]
You can also pass values to this code like this: [save to see placeholder trick]
Those values will be replace placeholders called args. These placeholders are zero based and should look like this: [[[arg0]]], [[[arg1]]] ... as many as you like. If you use 5 args in your code, you must always pass 5 values, since they are zero based your fifth arg will look like this [[[arg4]]]
Please note that you can not use this placeholder in other custom code views, but in all other custom code areas in JCB found in other views like the admin, site and custom admin views.
Another important note, all code with args will not be reversed updated from the changes in the editor out side of JCB at this time, since that will remove all the arg placeholders this means you will only be able to update the code here in the JCB UI.
This note will change once we have resolved these limitations." COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL="You can use this code in any JCB code area, simply add this PlaceHolder." COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION="

Understand how the placeholders work in (IDE)

@@ -1940,7 +1940,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_FF="ff" COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER="Filter" COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_DESCRIPTION="Here you can add filters to the query." COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_LABEL="Filter" -COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_SELECT="Add" COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_TYPE_DESCRIPTION="The type of filter you want to setup." COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_TYPE_LABEL="Filter Type" COM_COMPONENTBUILDER_DYNAMIC_GET_FUNCTIONVAR="FunctionVar" @@ -1952,7 +1951,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM_HINT="getMethodName" COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM_LABEL="Custom Name" COM_COMPONENTBUILDER_DYNAMIC_GET_GETITEM="getItem" COM_COMPONENTBUILDER_DYNAMIC_GET_GETLISTQUERY="getListQuery" -COM_COMPONENTBUILDER_DYNAMIC_GET_GETTABLE="getTable" COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE="Gettype" COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_DESCRIPTION="Set the type of get method." COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_LABEL="getType" @@ -1960,7 +1958,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_GG="gg" COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL="Global" COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_DESCRIPTION="Here you can add global variables." COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_LABEL="Set Global" -COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_SELECT="Add" COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN="greater than" COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN_OR_EQUAL="greater than or equal" COM_COMPONENTBUILDER_DYNAMIC_GET_H="h" @@ -1971,10 +1968,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_II="ii" COM_COMPONENTBUILDER_DYNAMIC_GET_IN="IN" COM_COMPONENTBUILDER_DYNAMIC_GET_J="j" COM_COMPONENTBUILDER_DYNAMIC_GET_JJ="jj" +COM_COMPONENTBUILDER_DYNAMIC_GET_JOINT="Joint" COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE="Join Db Table" COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_DESCRIPTION="Here you can add more table data to the query from other databases." COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_LABEL="Join DB Tables" -COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_SELECT="Add" COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_DESCRIPTION="Name of the field" COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_HINT="b.field" COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_LABEL="Join Field" @@ -1986,7 +1983,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT_OUTER="Join RIGHT OUTER" COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE="Join View Table" COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_DESCRIPTION="Here you can add more tables to the query from the views of this component." COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_LABEL="Join View Tables" -COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_SELECT="Add" COM_COMPONENTBUILDER_DYNAMIC_GET_JOOMLA_DATABASE="Joomla Database" COM_COMPONENTBUILDER_DYNAMIC_GET_K="k" COM_COMPONENTBUILDER_DYNAMIC_GET_KEY_DESCRIPTION="The table as name." @@ -1998,6 +1994,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN="less than" COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN_OR_EQUAL_TO="less than or equal to" COM_COMPONENTBUILDER_DYNAMIC_GET_LL="ll" COM_COMPONENTBUILDER_DYNAMIC_GET_M="m" +COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN="Main" COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE="Main Source" COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_DESCRIPTION="Select the main source of this dynamic get method." COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_LABEL="Main Source" @@ -2033,7 +2030,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER="Order" COM_COMPONENTBUILDER_DYNAMIC_GET_ORDERING_LABEL="Ordering" COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER_DESCRIPTION="Here you can set the ordering per data set." COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER_LABEL="Ordering" -COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER_SELECT="Add" COM_COMPONENTBUILDER_DYNAMIC_GET_OTHER="Other" COM_COMPONENTBUILDER_DYNAMIC_GET_P="p" COM_COMPONENTBUILDER_DYNAMIC_GET_PAGINATION="Pagination" @@ -2097,7 +2093,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_LABEL="Table Key" COM_COMPONENTBUILDER_DYNAMIC_GET_TAGS="Tags" COM_COMPONENTBUILDER_DYNAMIC_GET_THIS="This" COM_COMPONENTBUILDER_DYNAMIC_GET_TT="tt" -COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Set Type" +COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Type" COM_COMPONENTBUILDER_DYNAMIC_GET_U="u" COM_COMPONENTBUILDER_DYNAMIC_GET_USER="User" COM_COMPONENTBUILDER_DYNAMIC_GET_USER_GROUPS="User Groups" @@ -2123,7 +2119,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_W="w" COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE="Where" COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE_DESCRIPTION="Here you can add where to the query." COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE_LABEL="Where" -COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE_SELECT="Add" COM_COMPONENTBUILDER_DYNAMIC_GET_WW="ww" COM_COMPONENTBUILDER_DYNAMIC_GET_X="x" COM_COMPONENTBUILDER_DYNAMIC_GET_XX="xx" @@ -2290,7 +2285,6 @@ COM_COMPONENTBUILDER_FIELDTYPE_NAME_DESCRIPTION="Enter Name Here" COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT="Name Here" COM_COMPONENTBUILDER_FIELDTYPE_NAME_LABEL="Name" COM_COMPONENTBUILDER_FIELDTYPE_NEW="A New Fieldtype" -COM_COMPONENTBUILDER_FIELDTYPE_NO="No" COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_DESCRIPTION="To get more form field settings go to https://docs.joomla.org/Form_field" COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_LABEL="More Standard form field types" COM_COMPONENTBUILDER_FIELDTYPE_ORDERING_LABEL="Ordering" @@ -2309,7 +2303,6 @@ COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_DESCRIPTION="Select if the property COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_LABEL="Translatable" COM_COMPONENTBUILDER_FIELDTYPE_VERSION_DESC="A count of the number of times this Fieldtype has been revised." COM_COMPONENTBUILDER_FIELDTYPE_VERSION_LABEL="Revision" -COM_COMPONENTBUILDER_FIELDTYPE_YES="Yes" COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW="Add Css View" COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS="Add Css Views" COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL="Add CSS (views)" @@ -2750,6 +2743,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS="Joomla Components Edit Add COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS_DESC="Allows the users in this group to update the edit add css of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER="Joomla Components Edit Add Email Helper" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER_DESC="Allows the users in this group to update the edit add email helper of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT="Joomla Components Edit Add Javascript" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT_DESC="Allows the users in this group to update the edit add javascript of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE="Joomla Components Edit Add License" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE_DESC="Allows the users in this group to update the edit add license of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS="Joomla Components Edit Add Php Dashboard Methods" @@ -2814,6 +2809,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK="Joomla Componen COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK_DESC="Allows the users in this group to update the edit export package link of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE="Joomla Components Edit Image" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE_DESC="Allows the users in this group to update the edit image of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT="Joomla Components Edit Javascript" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT_DESC="Allows the users in this group to update the edit javascript of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE="Joomla Components Edit License" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_DESC="Allows the users in this group to update the edit license of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE="Joomla Components Edit License Type" @@ -2947,6 +2944,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_LABEL="Add CSS" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER="Add Email Helper" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_DESCRIPTION="Adding the email helper class, that can be used to send emails." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_LABEL="Add Email Helper" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JAVASCRIPT="Add Javascript" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JAVASCRIPT_LABEL="Add Javascript" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE="Add License" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_DESCRIPTION="Add the option to use a license in the component." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_LABEL="Add License (whmcs)" @@ -3224,6 +3223,10 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_COMPONENTS_BUTTON_ACCESS="Joomla Co COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_COMPONENTS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the import components button." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_INFO="Info" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_INFO_CIRCLE="Info Circle" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT="Javascript" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_HINT="// JavaScript for the entire back-end" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL="Javascript" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_DESCRIPTION="The settings below are used when you export this component as a JCB Package, for more info on how this works please review the following tutorial (https://youtu.be/lkE0ZiSWufg)." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_LABEL="JCB Package Export Settings" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA="Joomla" @@ -3295,8 +3298,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_FILES_DESCRIPTION="You can add cu COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_FILES_LABEL="Adding Custom Files" COM_COMPONENTBUILDER_JOOMLA_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_JOOMLA_COMPONENT_NOTE_ADD_FOLDERS_LABEL="Adding Custom Folders" -COM_COMPONENTBUILDER_JOOMLA_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_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_LABEL="Dynamic Builder Option" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_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." +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_LABEL="Dynamic Builder (mySql) Option" COM_COMPONENTBUILDER_JOOMLA_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_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_LABEL=" MySql Tweak Options" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CONTRIBUTORS_DESCRIPTION="Only add contributors if you would like them listed on the component dashboard." diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini index 28338dc3f..3c5d69bbd 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini @@ -432,6 +432,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS="Joomla Components Edit Add COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS_DESC="Allows the users in this group to update the edit add css of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER="Joomla Components Edit Add Email Helper" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER_DESC="Allows the users in this group to update the edit add email helper of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT="Joomla Components Edit Add Javascript" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT_DESC="Allows the users in this group to update the edit add javascript of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE="Joomla Components Edit Add License" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE_DESC="Allows the users in this group to update the edit add license of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS="Joomla Components Edit Add Php Dashboard Methods" @@ -496,6 +498,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK="Joomla Componen COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK_DESC="Allows the users in this group to update the edit export package link of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE="Joomla Components Edit Image" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE_DESC="Allows the users in this group to update the edit image of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT="Joomla Components Edit Javascript" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT_DESC="Allows the users in this group to update the edit javascript of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE="Joomla Components Edit License" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_DESC="Allows the users in this group to update the edit license of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE="Joomla Components Edit License Type" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index decc16a9d..5e40869ec 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php index dea88bdb5..497679e1e 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index 0277e2567..030c3ccae 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index b75ddcbbb..72d6e31e9 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php index 412bcfcd9..5f08d8b92 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vxyfields; +$items = $displayData->vxzfields; $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 86987dc92..19a05def4 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php index 3d28f0048..3ca2bed3e 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vxzlinked_components; +$items = $displayData->vyalinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index d8ed118d3..9d5038c29 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index 4b677c8d2..cd0fd94f5 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index c24ff17da..efee3617e 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php index c14af3edd..a77274f10 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_above.php diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php index 98a2a017f..0ee6ee432 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php index b00656f98..527a5549d 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index d34abc8aa..45261b871 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_under.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index f9458e790..60b1eeb6a 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index b82972e7a..3d898d998 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index 0277e2567..030c3ccae 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index 8f7a3d0a9..950added5 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index e35d5809f..b5e3e769a 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index f24bf3a2b..37cb6f57b 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index 91bb30145..1bffb5ef9 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index ab9151192..e0f1c8b92 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index d3df0bd24..b017076ff 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index fa7e77fed..b39d6a504 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index 036df533e..6e4982fa5 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vyjlinked_components; +$items = $displayData->vyklinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index d6d047f75..c6531c421 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index 35a41634a..1f975d3f3 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index cbcd4ca5e..1d55d54b6 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index 5e905a381..61d0db080 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php index fa7e77fed..b39d6a504 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index 2d65a1fca..f4608fe8e 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index f4d70f1fc..89dcffdca 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index cb8b5a0ac..3892d6e23 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/joint_fullwidth.php b/admin/layouts/dynamic_get/joint_fullwidth.php new file mode 100644 index 000000000..76272ff92 --- /dev/null +++ b/admin/layouts/dynamic_get/joint_fullwidth.php @@ -0,0 +1,49 @@ + + @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( + 'join_view_table', + 'join_db_table' +); + +?> +
+ +
+
+ getLabel($field); ?> +
+
+ getInput($field); ?> +
+
+ +
diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/main_above.php similarity index 94% rename from admin/layouts/dynamic_get/gettable_above.php rename to admin/layouts/dynamic_get/main_above.php index cb2d9dcd7..69296c816 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/main_above.php @@ -10,11 +10,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage gettable_above.php + @subpackage main_above.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php similarity index 94% rename from admin/layouts/dynamic_get/gettable_fullwidth.php rename to admin/layouts/dynamic_get/main_fullwidth.php index e3c6bc5d3..0c3ae6065 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/main_fullwidth.php @@ -10,11 +10,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage gettable_fullwidth.php + @subpackage main_fullwidth.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/main_left.php similarity index 94% rename from admin/layouts/dynamic_get/gettable_left.php rename to admin/layouts/dynamic_get/main_left.php index b67698674..459821207 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/main_left.php @@ -10,11 +10,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage gettable_left.php + @subpackage main_left.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/main_right.php similarity index 92% rename from admin/layouts/dynamic_get/gettable_right.php rename to admin/layouts/dynamic_get/main_right.php index 7e6f1230b..30ef8b441 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/main_right.php @@ -10,11 +10,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage gettable_right.php + @subpackage main_right.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -30,8 +30,6 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'join_view_table', - 'join_db_table', 'filter', 'where', 'order', diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/main_under.php similarity index 94% rename from admin/layouts/dynamic_get/gettable_under.php rename to admin/layouts/dynamic_get/main_under.php index 5f5f76944..48d1fa24d 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/main_under.php @@ -10,11 +10,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage gettable_under.php + @subpackage main_under.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index c7664e6a5..3b93f8fc4 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index 65834d547..545727954 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index 7dd20cc1b..bbc95c9f1 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index fa7e77fed..b39d6a504 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php index 874c1c490..cba04af0d 100644 --- a/admin/layouts/field/linked_admin_views_fullwidth.php +++ b/admin/layouts/field/linked_admin_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_admin_views_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wablinked_admin_views; +$items = $displayData->waclinked_admin_views; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit"; diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index c2100c750..5d0f26605 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index faafa5112..dec429da8 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_fullwidth.php b/admin/layouts/fieldtype/details_fullwidth.php index a4bc972ff..40a6895d2 100644 --- a/admin/layouts/fieldtype/details_fullwidth.php +++ b/admin/layouts/fieldtype/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index e0e49b314..915d06347 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index c297bcc9c..150fdbf90 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index fb0b4b743..2c5bbbdcf 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wacfields; +$items = $displayData->wadfields; $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 20d306010..8d79c177f 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/ftp/details_above.php b/admin/layouts/ftp/details_above.php index 577accb89..ed41a9114 100644 --- a/admin/layouts/ftp/details_above.php +++ b/admin/layouts/ftp/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/ftp/details_fullwidth.php b/admin/layouts/ftp/details_fullwidth.php index bb2e0d51d..b57ecaa12 100644 --- a/admin/layouts/ftp/details_fullwidth.php +++ b/admin/layouts/ftp/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index 121922267..dc29386f7 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wadlinked_components; +$items = $displayData->waelinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/ftp/publishing.php b/admin/layouts/ftp/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/ftp/publishing.php +++ b/admin/layouts/ftp/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/ftp/publlshing.php b/admin/layouts/ftp/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/ftp/publlshing.php +++ b/admin/layouts/ftp/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 7f6d02884..d11370c22 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 07e050f8e..4322467c2 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 7e3972df5..af8402247 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index b63106475..fad9e09d2 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index fa7e77fed..b39d6a504 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index a670836b7..57e4ad263 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php index e0b4c8e81..d0e13dcb6 100644 --- a/admin/layouts/joomla_component/admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/admin_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @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->vwmadmin_views; +$items = $displayData->vwnadmin_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/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index 8a12c1b5d..e2eaf5b20 100644 --- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vwncustom_admin_views; +$items = $displayData->vwocustom_admin_views; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=custom_admin_view.edit"; diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index e35d5809f..b5e3e769a 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index b3ac4c084..c1cdee5fc 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index 733ecffd9..4af263aa9 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php index fa7e77fed..b39d6a504 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php index 5d1c582ee..2a84a11da 100644 --- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'note_buildcomp_dynamic', + 'note_buildcomp_dynamic_mysql', 'buildcomp', 'buildcompsql' ); diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index 7127988c7..ee095540b 100644 --- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php index 8112da07a..187d068a4 100644 --- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php +++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php @@ -33,8 +33,6 @@ $fields = $displayData->get('fields') ?: array( 'creatuserhelper', 'adduikit', 'addfootable', - 'add_css', - 'css', 'add_email_helper', 'add_php_helper_both', 'php_helper_both', @@ -45,7 +43,11 @@ $fields = $displayData->get('fields') ?: array( 'add_php_helper_site', 'php_helper_site', 'add_site_event', - 'php_site_event' + 'php_site_event', + 'add_javascript', + 'javascript', + 'add_css', + 'css' ); ?> diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index f8c3089e0..85546c38f 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php index ab48b34d0..428da7b9f 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/publlshing.php b/admin/layouts/joomla_component/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/joomla_component/publlshing.php +++ b/admin/layouts/joomla_component/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index 1abccb91a..7c98bd0ef 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php index 57abfc982..50998a4d0 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php index 3652452a7..848344f10 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index 85fd51fc8..7abd9e2ae 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index f7c1d5c72..3e2f233e6 100644 --- a/admin/layouts/joomla_component/site_views_fullwidth.php +++ b/admin/layouts/joomla_component/site_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @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->vwosite_views; +$items = $displayData->vwpsite_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/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php index 78dd54511..e3cc90284 100644 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ b/admin/layouts/joomla_component/translation_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage translation_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vwptranslation; +$items = $displayData->vwqtranslation; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=language_translations&task=language_translation.edit"; diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index d8a219677..6e7540050 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php index 9078922e4..382ba6ec0 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/language_translation/details_above.php b/admin/layouts/language_translation/details_above.php index 5540b9d4a..655d19659 100644 --- a/admin/layouts/language_translation/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php index f955fc259..297aeb817 100644 --- a/admin/layouts/language_translation/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/language_translation/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/language_translation/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index f943991e5..28d4abef9 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index b0959c016..cbdfe7274 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index 2839066d7..3b25306df 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index ccfc4f2ff..ea28fc350 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index 4a2115516..aaee21bbb 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index fa7e77fed..b39d6a504 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index b82972e7a..3d898d998 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php index bae8f8f80..1c0dd2997 100644 --- a/admin/layouts/site_view/custom_buttons_left.php +++ b/admin/layouts/site_view/custom_buttons_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php index d02784349..ec75d90cd 100644 --- a/admin/layouts/site_view/custom_buttons_right.php +++ b/admin/layouts/site_view/custom_buttons_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_right.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index e35d5809f..b5e3e769a 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index f24bf3a2b..37cb6f57b 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index 91bb30145..1bffb5ef9 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index ccfc4f2ff..ea28fc350 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index d3df0bd24..b017076ff 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index fa7e77fed..b39d6a504 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index 632a95682..c18f7b503 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.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index 0fc12c2fe..7ace291f0 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vyulinked_components; +$items = $displayData->vyvlinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index ba39b9570..7548721a3 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index e6f6b54c6..9b9b1dacd 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index 2749091a5..5b0d2e42e 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index 896c458da..b3998a70c 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index f943991e5..28d4abef9 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index 9ffa34240..462d02d3c 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index 2839066d7..3b25306df 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index ccfc4f2ff..ea28fc350 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index 4a2115516..aaee21bbb 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index fa7e77fed..b39d6a504 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index 20d306010..8d79c177f 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index 95ad3f016..3dae5e08a 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 270964c5d..ccf3a27fe 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -310,7 +310,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxyfields() + public function getVxzfields() { // Get the user object. $user = JFactory::getUser(); @@ -379,13 +379,13 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVxyfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVxzfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVxyfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVxzfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVxyfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVxzfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVxyfields($item->store, 'store'); + $item->store = $this->selectionTranslationVxzfields($item->store, 'store'); } } @@ -425,7 +425,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVxyfields($value,$name) + public function selectionTranslationVxzfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') @@ -503,7 +503,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxzlinked_components() + public function getVyalinked_components() { // Get the user object. $user = JFactory::getUser(); diff --git a/admin/models/ajax.php b/admin/models/ajax.php index eb1065b05..6e558c1c1 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -319,248 +319,6 @@ class ComponentbuilderModelAjax extends JModelList } // Used in layout - public function getSnippetDetails($id) - { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - $query->select($db->quoteName(array('name', 'heading', 'usage', 'description', 'type', 'snippet', 'url'))); - $query->from($db->quoteName('#__componentbuilder_snippet')); - $query->where($db->quoteName('published') . ' = 1'); - $query->where($db->quoteName('id') . ' = '. (int) $id); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - $model = ComponentbuilderHelper::getModel('snippets'); - $snippet = $db->loadObject(); - $snippet->type = JText::_($model->selectionTranslation($snippet->type,'type')); - $snippet->snippet = base64_decode($snippet->snippet); - // return found snippet settings - return $snippet; - } - return false; - } - - public function getDynamicValues($id,$view) - { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - $query->select($db->quoteName(array('getcustom', 'gettype', 'main_source', 'view_selection', 'db_selection', 'join_view_table', 'join_db_table', 'addcalculation', 'php_calculation'))); - $query->from($db->quoteName('#__componentbuilder_dynamic_get')); - $query->where($db->quoteName('published') . ' = 1'); - $query->where($db->quoteName('id') . ' = '. (int) $id); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - $result = $db->loadObject(); - // reset buket - $selections = array(); - $selectionsList = array(); - // get the main values (name) - if ($result->main_source == 1) - { - $selections[] = explode("\n",$result->view_selection); - } - elseif ($result->main_source == 2) - { - $selections[] = explode("\n",$result->db_selection); - } - elseif ($result->main_source == 3) - { - return '

Custom get source! You will need to transpose the variables manually.

'; - } - // get the joined values (name) - $join_view_table = json_decode($result->join_view_table,true); - unset($result->join_view_table); - if (ComponentbuilderHelper::checkArray($join_view_table)) - { - foreach ($join_view_table as $option => $values) - { - foreach ($values as $nr => $value) - { - $result->join_view_table[$nr][$option] = $value; - } - } - } - unset($join_view_table); - $join_db_table = json_decode($result->join_db_table,true); - unset($result->join_db_table); - if (ComponentbuilderHelper::checkArray($join_db_table)) - { - foreach ($join_db_table as $option => $values) - { - foreach ($values as $nr => $value) - { - $result->join_db_table[$nr][$option] = $value; - } - } - } - unset($join_db_table); - // now load the joined values to the selection set - if (isset($result->join_view_table) && ComponentbuilderHelper::checkArray($result->join_view_table)) - { - foreach ($result->join_view_table as $join_view_table) - { - if ($join_view_table['row_type'] == '1') - { - $selections[] = explode("\n",$join_view_table['selection']); - } - elseif ($join_view_table['row_type'] == '2') - { - $names = $this->setListMethodName(array($join_view_table['on_field'],$join_view_table['join_field']),$join_view_table['view_table'],$join_view_table['as'],1); - $selectionsList[implode('',$names)] = explode("\n",$join_view_table['selection']); - } - } - unset($result->join_view_table); - } - if (isset($result->join_db_table) && ComponentbuilderHelper::checkArray($result->join_db_table)) - { - foreach ($result->join_db_table as $join_db_table) - { - if ($join_db_table['row_type'] == '1') - { - $selections[] = explode("\n",$join_db_table['selection']); - } - elseif ($join_db_table['row_type'] == '2') - { - $names = $this->setListMethodName(array($join_db_table['on_field'],$join_db_table['join_field']),$join_db_table['db_table'],$join_db_table['as'],2); - $selectionsList[implode('',$names)] = explode("\n",$join_db_table['selection']); - } - } - unset($result->join_db_table); - } - // get the calculation reult values (name) - if ($result->addcalculation == 1) - { - $php_calculation = base64_decode($result->php_calculation); - $phpSelections = ComponentbuilderHelper::getAllBetween($php_calculation,'cal__',' '); - $selections[] = array_unique($phpSelections); - unset($php_calculation); - unset($phpSelections); - unset($result->php_calculation); - } - // name the main var based on view - if ($view == 'template') - { - switch ($result->gettype) - { - case 1: - // single - $buketName = 'this->item'; - break; - case 2: - // list - $buketName = 'this->items'; - break; - case 3: - case 4: - // custom - $result->getcustom = ComponentbuilderHelper::safeString($result->getcustom); - if (substr($result->getcustom, 0, strlen('get')) == 'get') - { - $varName = substr($result->getcustom, strlen('get')); - } - else - { - $varName = $result->getcustom; - } - $buketName = 'this->'.$varName; - break; - } - } - elseif ($view == 'layout') - { - $buketName = 'displayData'; - } - // now build the return values - if (ComponentbuilderHelper::checkArray($selections)) - { - $buket = array(); - switch ($result->gettype) - { - case 1: - case 3: - // single - $ur = '<?php echo $'.$buketName; - $cf = '; ?>'; - break; - case 2: - case 4: - // list - $ur = '<?php echo $item'; - $cf = '; ?>'; - $buket[] = '<?php foreach ($'.$buketName.' as $item): ?>
'; - break; - } - foreach ($selections as $selection) - { - if (ComponentbuilderHelper::checkArray($selection)) - { - foreach ($selection as $value) - { - if (strpos($value,'AS') !== false) - { - list($table,$key) = explode('AS',$value); - $buket[] = ''.$ur.'->'.trim($key).$cf.''; - } - else - { - $buket[] = ''.$ur.'->'.trim($value).$cf.''; - } - } - } - } - if (ComponentbuilderHelper::checkArray($selectionsList)) - { - $buket[] = '
'; - foreach ($selectionsList as $name => $selectionList) - { - if (ComponentbuilderHelper::checkArray($selectionList)) - { - $ur = '<?php echo $'.$name; - $cf = '; ?>'; - $buket[] = '<?php foreach ($item->'.$name.' as $'.$name.'): ?>
'; - foreach ($selectionList as $value) - { - if (strpos($value,'AS') !== false) - { - list($table,$key) = explode('AS',$value); - $buket[] = ''.$ur.'->'.trim($key).$cf.''; - } - else - { - $buket[] = ''.$ur.'->'.trim($value).$cf.''; - } - } - $buket[] = '
<?php endforeach; ?>
'; - } - } - } - switch ($result->gettype) - { - case 2: - case 4: - // list - $buket[] = '
<?php endforeach; ?>'; - break; - } - return implode(' ',$buket); - } - } - return false; - } - public function getLayoutDetails($id) { // Get a db connection. @@ -613,129 +371,17 @@ class ComponentbuilderModelAjax extends JModelList return implode("\n",$layoutString); } return false; - } - - public function getDynamicFormDetails($id) - { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - $query->select($db->quoteName(array('a.name','a.name_code','a.filterbuilder_map'))); - $query->from($db->quoteName('#__componentbuilder_dynamic_form', 'a')); - $query->where($db->quoteName('a.id') . ' != '.(int) $id); - $query->where($db->quoteName('a.published') . ' = 1'); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - $results = $db->loadObjectList(); - $string = array('

Dynamic Form Links

'); - foreach ($results as $result) - { - $dynamicIds = array(); - $result->filterbuilder_map = base64_decode($result->filterbuilder_map); - if (ComponentbuilderHelper::checkString($result->filterbuilder_map) && strpos($result->filterbuilder_map, PHP_EOL) !== false) - { - $filters = explode(PHP_EOL, $result->filterbuilder_map); - if (ComponentbuilderHelper::checkArray($filters)) - { - foreach ($filters as $filter) - { - if (strpos($filter, 'Id') !== false || strpos($filter, 'id') !== false) - { - list($idkey, $dump) = explode('=>', $filter); - $dynamicIds[] = "&".trim($idkey)."=<?php echo \$displayData->".trim($idkey)."; ?>"; - } - } - } - } - $string[] = "
dynamicForm: ".$result->name."
<a href=\"index.php?option=com_[[[component]]]&task=form." . $result->name_code . implode('',$dynamicIds) ."&ref=compiler\">" . $result->name . "</a>
"; - } - $string[] = "
"; - return implode("\n",$string); - } - return false; - } - - protected function setListMethodName($names,$table,$as,$type) - { - $methodNames = array(); - if (ComponentbuilderHelper::checkArray($names)) - { - foreach ($names as $nr => $name) - { - if (ComponentbuilderHelper::checkString($name)) - { - if (strpos($name,'.') !== false) - { - list($dump,$var) = explode('.',$name); - } - else - { - $var = $name; - } - if ($nr > 0) - { - $methodNames[] = ComponentbuilderHelper::safeString($var,'F'); - } - else - { - $methodNames[] = ComponentbuilderHelper::safeString($var); - } - } - } - } - switch ($type) - { - // set view name - case 1: - $methodNames[] = ComponentbuilderHelper::safeString($this->getViewName($table),'F'); - break; - // set db name - case 2: - $methodNames[] = ComponentbuilderHelper::safeString($table,'F'); - break; - - } - // make sure there is uniqe method names - $methodNames[] = ComponentbuilderHelper::safeString($as,'U'); - return $methodNames; - } - - protected function getViewName($id) - { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - $query->select($db->quoteName(array('name_single'))); - $query->from($db->quoteName('#__componentbuilder_admin_view')); - $query->where($db->quoteName('id') . ' = '. (int) $id); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - return $db->loadResult(); - } - return ''; } // Used in dynamic_get - public function getViewTableColumns($id,$as,$type) + public function getViewTableColumns($id, $as, $type) { // Get a db connection. $db = JFactory::getDbo(); // Create a new query object. $query = $db->getQuery(true); - $query->select($db->quoteName(array('addfields','name_single'))); + $query->select($db->quoteName(array('addfields', 'name_single'))); $query->from($db->quoteName('#__componentbuilder_admin_view')); $query->where($db->quoteName('published') . ' = 1'); $query->where($db->quoteName('id') . ' = '. $id); @@ -747,14 +393,11 @@ class ComponentbuilderModelAjax extends JModelList { $result = $db->loadObject(); $description = ''; + $tableName = ''; if (1 == $type) { $tableName = ComponentbuilderHelper::safeString($result->name_single).'_'; } - else - { - $tableName = ''; - } $addfields = json_decode($result->addfields,true); if (ComponentbuilderHelper::checkArray($addfields)) { @@ -878,23 +521,294 @@ class ComponentbuilderModelAjax extends JModelList return false; } - public function getDbTableColumns($tableName,$as,$type) + public function getDbTableColumns($tableName, $as, $type) { // Get a db connection. $db = JFactory::getDbo(); // get the columns $columns = $db->getTableColumns("#__".$tableName); + // set the type (multi or single) + $unique = ''; + if (1 == $type) + { + $unique = ComponentbuilderHelper::safeString($tableName).'_'; + } if (ComponentbuilderHelper::checkArray($columns)) { // build the return string $tableColumns = array(); - foreach ($columns as $column => $type) + foreach ($columns as $column => $typeCast) { - $tableColumns[] = $as.".".$column . ' AS ' . $column; + $tableColumns[] = $as.".".$column . ' AS ' . $unique . $column; } return implode("\n",$tableColumns); } return false; + } + + public function getDynamicValues($id, $view) + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + $query->select($db->quoteName(array('getcustom', 'gettype', 'main_source', 'view_selection', 'db_selection', 'join_view_table', 'join_db_table', 'addcalculation', 'php_calculation'))); + $query->from($db->quoteName('#__componentbuilder_dynamic_get')); + $query->where($db->quoteName('published') . ' = 1'); + $query->where($db->quoteName('id') . ' = '. (int) $id); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $result = $db->loadObject(); + // reset buket + $selections = array(); + $selectionsList = array(); + // get the main values (name) + if ($result->main_source == 1) + { + $selections[] = explode("\n",$result->view_selection); + } + elseif ($result->main_source == 2) + { + $selections[] = explode("\n",$result->db_selection); + } + elseif ($result->main_source == 3) + { + return '

Custom get source! You will need to transpose the variables manually.

'; + } + // get the joined values (name) + $result->join_view_table = json_decode($result->join_view_table, true); + if (!ComponentbuilderHelper::checkArray($result->join_view_table)) + { + unset($result->join_view_table); + } + $result->join_db_table = json_decode($result->join_db_table, true); + if (!ComponentbuilderHelper::checkArray($result->join_db_table)) + { + unset($result->join_db_table); + } + // now load the joined values to the selection set + if (isset($result->join_view_table) && ComponentbuilderHelper::checkArray($result->join_view_table)) + { + foreach ($result->join_view_table as $join_view_table) + { + if ($join_view_table['row_type'] == '1') + { + $selections[] = explode("\n",$join_view_table['selection']); + } + elseif ($join_view_table['row_type'] == '2') + { + $names = $this->setListMethodName(array($join_view_table['on_field'],$join_view_table['join_field']),$join_view_table['view_table'],$join_view_table['as'],1); + $selectionsList[implode('',$names)] = explode("\n",$join_view_table['selection']); + } + } + unset($result->join_view_table); + } + if (isset($result->join_db_table) && ComponentbuilderHelper::checkArray($result->join_db_table)) + { + foreach ($result->join_db_table as $join_db_table) + { + if ($join_db_table['row_type'] == '1') + { + $selections[] = explode("\n",$join_db_table['selection']); + } + elseif ($join_db_table['row_type'] == '2') + { + $names = $this->setListMethodName(array($join_db_table['on_field'],$join_db_table['join_field']),$join_db_table['db_table'],$join_db_table['as'],2); + $selectionsList[implode('',$names)] = explode("\n",$join_db_table['selection']); + } + } + unset($result->join_db_table); + } + // get the calculation result values (name) + if ($result->addcalculation == 1) + { + $php_calculation = base64_decode($result->php_calculation); + $phpSelections = ComponentbuilderHelper::getAllBetween($php_calculation,'cal__',' '); + $selections[] = array_unique($phpSelections); + unset($php_calculation); + unset($phpSelections); + unset($result->php_calculation); + } + // name the main var based on view + if ($view == 'template') + { + switch ($result->gettype) + { + case 1: + // single + $buketName = 'this->item'; + break; + case 2: + // list + $buketName = 'this->items'; + break; + case 3: + case 4: + // custom + $result->getcustom = ComponentbuilderHelper::safeString($result->getcustom); + if (substr($result->getcustom, 0, strlen('get')) == 'get') + { + $varName = substr($result->getcustom, strlen('get')); + } + else + { + $varName = $result->getcustom; + } + $buketName = 'this->'.$varName; + break; + } + } + elseif ($view == 'layout') + { + $buketName = 'displayData'; + } + // now build the return values + if (ComponentbuilderHelper::checkArray($selections)) + { + $buket = array(); + switch ($result->gettype) + { + case 1: + case 3: + // single + $ur = '<?php echo $'.$buketName; + $cf = '; ?>'; + break; + case 2: + case 4: + // list + $ur = '<?php echo $item'; + $cf = '; ?>'; + $buket[] = '<?php foreach ($'.$buketName.' as $item): ?>
'; + break; + } + foreach ($selections as $selection) + { + if (ComponentbuilderHelper::checkArray($selection)) + { + foreach ($selection as $value) + { + if (strpos($value,'AS') !== false) + { + list($table,$key) = explode('AS',$value); + $buket[] = ''.$ur.'->'.trim($key).$cf.''; + } + else + { + $buket[] = ''.$ur.'->'.trim($value).$cf.''; + } + } + } + } + if (ComponentbuilderHelper::checkArray($selectionsList)) + { + $buket[] = '
'; + foreach ($selectionsList as $name => $selectionList) + { + if (ComponentbuilderHelper::checkArray($selectionList)) + { + $ur = '<?php echo $'.$name; + $cf = '; ?>'; + $buket[] = '<?php foreach ($item->'.$name.' as $'.$name.'): ?>
'; + foreach ($selectionList as $value) + { + if (strpos($value,'AS') !== false) + { + list($table,$key) = explode('AS',$value); + $buket[] = ''.$ur.'->'.trim($key).$cf.''; + } + else + { + $buket[] = ''.$ur.'->'.trim($value).$cf.''; + } + } + $buket[] = '
<?php endforeach; ?>
'; + } + } + } + switch ($result->gettype) + { + case 2: + case 4: + // list + $buket[] = '
<?php endforeach; ?>'; + break; + } + return implode(' ',$buket); + } + } + return false; + } + + protected function setListMethodName($names,$table,$as,$type) + { + $methodNames = array(); + if (ComponentbuilderHelper::checkArray($names)) + { + foreach ($names as $nr => $name) + { + if (ComponentbuilderHelper::checkString($name)) + { + if (strpos($name,'.') !== false) + { + list($dump,$var) = explode('.',$name); + } + else + { + $var = $name; + } + if ($nr > 0) + { + $methodNames[] = ComponentbuilderHelper::safeString($var,'F'); + } + else + { + $methodNames[] = ComponentbuilderHelper::safeString($var); + } + } + } + } + switch ($type) + { + // set view name + case 1: + $methodNames[] = ComponentbuilderHelper::safeString($this->getViewName($table),'F'); + break; + // set db name + case 2: + $methodNames[] = ComponentbuilderHelper::safeString($table,'F'); + break; + + } + // make sure there is uniqe method names + $methodNames[] = ComponentbuilderHelper::safeString($as,'U'); + return $methodNames; + } + + protected function getViewName($id) + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + $query->select($db->quoteName(array('name_single'))); + $query->from($db->quoteName('#__componentbuilder_admin_view')); + $query->where($db->quoteName('id') . ' = '. (int) $id); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + return $db->loadResult(); + } + return ''; } // Used in custom_code @@ -1073,6 +987,34 @@ class ComponentbuilderModelAjax extends JModelList return false; } + // Used in snippet + public function getSnippetDetails($id) + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + $query->select($db->quoteName(array('name', 'heading', 'usage', 'description', 'type', 'snippet', 'url'))); + $query->from($db->quoteName('#__componentbuilder_snippet')); + $query->where($db->quoteName('published') . ' = 1'); + $query->where($db->quoteName('id') . ' = '. (int) $id); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $model = ComponentbuilderHelper::getModel('snippets'); + $snippet = $db->loadObject(); + $snippet->type = JText::_($model->selectionTranslation($snippet->type,'type')); + $snippet->snippet = base64_decode($snippet->snippet); + // return found snippet settings + return $snippet; + } + return false; + } + // Used in field public function getFieldOptions($id) { diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 1809c5ae9..a479053d4 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 55d7b5bb1..83baf65c1 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 17th July, 2017 + @version @update number 27 of this MVC + @build 27th September, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.php @@ -103,52 +103,10 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $item->custom_get = $custom_get->toArray(); } - if (!empty($item->php_model)) + if (!empty($item->php_controller)) { - // base64 Decode php_model. - $item->php_model = base64_decode($item->php_model); - } - - if (!empty($item->css_document)) - { - // base64 Decode css_document. - $item->css_document = base64_decode($item->css_document); - } - - if (!empty($item->php_jview)) - { - // base64 Decode php_jview. - $item->php_jview = base64_decode($item->php_jview); - } - - if (!empty($item->php_view)) - { - // base64 Decode php_view. - $item->php_view = base64_decode($item->php_view); - } - - if (!empty($item->php_document)) - { - // base64 Decode php_document. - $item->php_document = base64_decode($item->php_document); - } - - if (!empty($item->php_jview_display)) - { - // base64 Decode php_jview_display. - $item->php_jview_display = base64_decode($item->php_jview_display); - } - - if (!empty($item->js_document)) - { - // base64 Decode js_document. - $item->js_document = base64_decode($item->js_document); - } - - if (!empty($item->css)) - { - // base64 Decode css. - $item->css = base64_decode($item->css); + // base64 Decode php_controller. + $item->php_controller = base64_decode($item->php_controller); } if (!empty($item->default)) @@ -157,10 +115,52 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $item->default = base64_decode($item->default); } - if (!empty($item->php_controller)) + if (!empty($item->php_model)) { - // base64 Decode php_controller. - $item->php_controller = base64_decode($item->php_controller); + // base64 Decode php_model. + $item->php_model = base64_decode($item->php_model); + } + + if (!empty($item->php_document)) + { + // base64 Decode php_document. + $item->php_document = base64_decode($item->php_document); + } + + if (!empty($item->php_view)) + { + // base64 Decode php_view. + $item->php_view = base64_decode($item->php_view); + } + + if (!empty($item->php_jview_display)) + { + // base64 Decode php_jview_display. + $item->php_jview_display = base64_decode($item->php_jview_display); + } + + if (!empty($item->php_jview)) + { + // base64 Decode php_jview. + $item->php_jview = base64_decode($item->php_jview); + } + + if (!empty($item->js_document)) + { + // base64 Decode js_document. + $item->js_document = base64_decode($item->js_document); + } + + if (!empty($item->css_document)) + { + // base64 Decode css_document. + $item->css_document = base64_decode($item->css_document); + } + + if (!empty($item->css)) + { + // base64 Decode css. + $item->css = base64_decode($item->css); } if (!empty($item->id)) @@ -179,7 +179,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVyjlinked_components() + public function getVyklinked_components() { // Get the user object. $user = JFactory::getUser(); @@ -975,52 +975,10 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $data['custom_get'] = ''; } - // Set the php_model string to base64 string. - if (isset($data['php_model'])) + // Set the php_controller string to base64 string. + if (isset($data['php_controller'])) { - $data['php_model'] = base64_encode($data['php_model']); - } - - // Set the css_document string to base64 string. - if (isset($data['css_document'])) - { - $data['css_document'] = base64_encode($data['css_document']); - } - - // Set the php_jview string to base64 string. - if (isset($data['php_jview'])) - { - $data['php_jview'] = base64_encode($data['php_jview']); - } - - // Set the php_view string to base64 string. - if (isset($data['php_view'])) - { - $data['php_view'] = base64_encode($data['php_view']); - } - - // Set the php_document string to base64 string. - if (isset($data['php_document'])) - { - $data['php_document'] = base64_encode($data['php_document']); - } - - // Set the php_jview_display string to base64 string. - if (isset($data['php_jview_display'])) - { - $data['php_jview_display'] = base64_encode($data['php_jview_display']); - } - - // Set the js_document string to base64 string. - if (isset($data['js_document'])) - { - $data['js_document'] = base64_encode($data['js_document']); - } - - // Set the css string to base64 string. - if (isset($data['css'])) - { - $data['css'] = base64_encode($data['css']); + $data['php_controller'] = base64_encode($data['php_controller']); } // Set the default string to base64 string. @@ -1029,10 +987,52 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $data['default'] = base64_encode($data['default']); } - // Set the php_controller string to base64 string. - if (isset($data['php_controller'])) + // Set the php_model string to base64 string. + if (isset($data['php_model'])) { - $data['php_controller'] = base64_encode($data['php_controller']); + $data['php_model'] = base64_encode($data['php_model']); + } + + // Set the php_document string to base64 string. + if (isset($data['php_document'])) + { + $data['php_document'] = base64_encode($data['php_document']); + } + + // Set the php_view string to base64 string. + if (isset($data['php_view'])) + { + $data['php_view'] = base64_encode($data['php_view']); + } + + // Set the php_jview_display string to base64 string. + if (isset($data['php_jview_display'])) + { + $data['php_jview_display'] = base64_encode($data['php_jview_display']); + } + + // Set the php_jview string to base64 string. + if (isset($data['php_jview'])) + { + $data['php_jview'] = base64_encode($data['php_jview']); + } + + // Set the js_document string to base64 string. + if (isset($data['js_document'])) + { + $data['js_document'] = base64_encode($data['js_document']); + } + + // Set the css_document string to base64 string. + if (isset($data['css_document'])) + { + $data['css_document'] = base64_encode($data['css_document']); + } + + // Set the css string to base64 string. + if (isset($data['css'])) + { + $data['css'] = base64_encode($data['css']); } // Set the Params Items to data diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index 10798cc3d..cd0c73eb1 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 17th July, 2017 + @version @update number 27 of this MVC + @build 27th September, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_views.php @@ -266,26 +266,26 @@ class ComponentbuilderModelCustom_admin_views extends JModelList continue; } - // decode php_model - $item->php_model = base64_decode($item->php_model); - // decode css_document - $item->css_document = base64_decode($item->css_document); - // decode php_jview - $item->php_jview = base64_decode($item->php_jview); - // decode php_view - $item->php_view = base64_decode($item->php_view); - // decode php_document - $item->php_document = base64_decode($item->php_document); - // decode php_jview_display - $item->php_jview_display = base64_decode($item->php_jview_display); - // decode js_document - $item->js_document = base64_decode($item->js_document); - // decode css - $item->css = base64_decode($item->css); - // decode default - $item->default = base64_decode($item->default); // decode php_controller $item->php_controller = base64_decode($item->php_controller); + // decode default + $item->default = base64_decode($item->default); + // decode php_model + $item->php_model = base64_decode($item->php_model); + // decode php_document + $item->php_document = base64_decode($item->php_document); + // decode php_view + $item->php_view = base64_decode($item->php_view); + // decode php_jview_display + $item->php_jview_display = base64_decode($item->php_jview_display); + // decode php_jview + $item->php_jview = base64_decode($item->php_jview); + // decode js_document + $item->js_document = base64_decode($item->js_document); + // decode css_document + $item->css_document = base64_decode($item->css_document); + // decode css + $item->css = base64_decode($item->css); // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php index ad0ce1b51..854277316 100644 --- a/admin/models/custom_code.php +++ b/admin/models/custom_code.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 82 of this MVC - @build 26th April, 2017 + @build 4th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.php diff --git a/admin/models/custom_codes.php b/admin/models/custom_codes.php index 68348eb61..a2bb144a4 100644 --- a/admin/models/custom_codes.php +++ b/admin/models/custom_codes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 82 of this MVC - @build 26th April, 2017 + @build 4th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.php diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 0b2b9f26a..548deab14 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 84 of this MVC - @build 4th May, 2017 + @version @update number 94 of this MVC + @build 27th September, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.php @@ -95,10 +95,52 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->php_before_getitem)) + if (!empty($item->filter)) { - // base64 Decode php_before_getitem. - $item->php_before_getitem = base64_decode($item->php_before_getitem); + // Convert the filter field to an array. + $filter = new Registry; + $filter->loadString($item->filter); + $item->filter = $filter->toArray(); + } + + if (!empty($item->where)) + { + // Convert the where field to an array. + $where = new Registry; + $where->loadString($item->where); + $item->where = $where->toArray(); + } + + if (!empty($item->order)) + { + // Convert the order field to an array. + $order = new Registry; + $order->loadString($item->order); + $item->order = $order->toArray(); + } + + if (!empty($item->global)) + { + // Convert the global field to an array. + $global = new Registry; + $global->loadString($item->global); + $item->global = $global->toArray(); + } + + if (!empty($item->join_db_table)) + { + // Convert the join_db_table field to an array. + $join_db_table = new Registry; + $join_db_table->loadString($item->join_db_table); + $item->join_db_table = $join_db_table->toArray(); + } + + if (!empty($item->join_view_table)) + { + // Convert the join_view_table field to an array. + $join_view_table = new Registry; + $join_view_table->loadString($item->join_view_table); + $item->join_view_table = $join_view_table->toArray(); } if (!empty($item->php_custom_get)) @@ -107,6 +149,12 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin $item->php_custom_get = base64_decode($item->php_custom_get); } + if (!empty($item->php_before_getitem)) + { + // base64 Decode php_before_getitem. + $item->php_before_getitem = base64_decode($item->php_before_getitem); + } + if (!empty($item->php_after_getitem)) { // base64 Decode php_after_getitem. @@ -860,10 +908,82 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin $data['metadata'] = (string) $metadata; } - // Set the php_before_getitem string to base64 string. - if (isset($data['php_before_getitem'])) + // Set the filter items to data. + if (isset($data['filter']) && is_array($data['filter'])) { - $data['php_before_getitem'] = base64_encode($data['php_before_getitem']); + $filter = new JRegistry; + $filter->loadArray($data['filter']); + $data['filter'] = (string) $filter; + } + elseif (!isset($data['filter'])) + { + // Set the empty filter to data + $data['filter'] = ''; + } + + // Set the where items to data. + if (isset($data['where']) && is_array($data['where'])) + { + $where = new JRegistry; + $where->loadArray($data['where']); + $data['where'] = (string) $where; + } + elseif (!isset($data['where'])) + { + // Set the empty where to data + $data['where'] = ''; + } + + // Set the order items to data. + if (isset($data['order']) && is_array($data['order'])) + { + $order = new JRegistry; + $order->loadArray($data['order']); + $data['order'] = (string) $order; + } + elseif (!isset($data['order'])) + { + // Set the empty order to data + $data['order'] = ''; + } + + // Set the global items to data. + if (isset($data['global']) && is_array($data['global'])) + { + $global = new JRegistry; + $global->loadArray($data['global']); + $data['global'] = (string) $global; + } + elseif (!isset($data['global'])) + { + // Set the empty global to data + $data['global'] = ''; + } + + // Set the join_db_table items to data. + if (isset($data['join_db_table']) && is_array($data['join_db_table'])) + { + $join_db_table = new JRegistry; + $join_db_table->loadArray($data['join_db_table']); + $data['join_db_table'] = (string) $join_db_table; + } + elseif (!isset($data['join_db_table'])) + { + // Set the empty join_db_table to data + $data['join_db_table'] = ''; + } + + // Set the join_view_table items to data. + if (isset($data['join_view_table']) && is_array($data['join_view_table'])) + { + $join_view_table = new JRegistry; + $join_view_table->loadArray($data['join_view_table']); + $data['join_view_table'] = (string) $join_view_table; + } + elseif (!isset($data['join_view_table'])) + { + // Set the empty join_view_table to data + $data['join_view_table'] = ''; } // Set the php_custom_get string to base64 string. @@ -872,6 +992,12 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin $data['php_custom_get'] = base64_encode($data['php_custom_get']); } + // Set the php_before_getitem string to base64 string. + if (isset($data['php_before_getitem'])) + { + $data['php_before_getitem'] = base64_encode($data['php_before_getitem']); + } + // Set the php_after_getitem string to base64 string. if (isset($data['php_after_getitem'])) { diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php index d51282a14..86c3fbdc7 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 84 of this MVC - @build 4th May, 2017 + @version @update number 94 of this MVC + @build 27th September, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.php @@ -321,10 +321,10 @@ class ComponentbuilderModelDynamic_gets extends JModelList continue; } - // decode php_before_getitem - $item->php_before_getitem = base64_decode($item->php_before_getitem); // decode php_custom_get $item->php_custom_get = base64_decode($item->php_custom_get); + // decode php_before_getitem + $item->php_before_getitem = base64_decode($item->php_before_getitem); // decode php_after_getitem $item->php_after_getitem = base64_decode($item->php_after_getitem); // decode php_getlistquery diff --git a/admin/models/field.php b/admin/models/field.php index 8fa0dbc10..b9ae4aaa2 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -141,7 +141,7 @@ class ComponentbuilderModelField extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWablinked_admin_views() + public function getWaclinked_admin_views() { // Get the user object. $user = JFactory::getUser(); diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 0735c245f..d7a0b7779 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 2122443b9..9ef2e0894 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index f584effa9..8c237a1f6 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index acae63716..ae516c9c3 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php index 15e2166eb..7e1ad247e 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 5f2af924b..f269d5bfe 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index 120eb8ba8..25a4fab00 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index c06f835c4..0e3685ed4 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index 6c5f8353d..d9d89c0ed 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index 3547cf964..3ad08c46d 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php index dc6afc285..f3de392d3 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicget.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 0ea5fb6bc..a3fbbef60 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index ca7f68108..5d00a70e0 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index 1e391ecfa..436810fc9 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 5324925fe..cd3b2629c 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/ftps.php b/admin/models/fields/ftps.php new file mode 100644 index 000000000..2e2a83614 --- /dev/null +++ b/admin/models/fields/ftps.php @@ -0,0 +1,171 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import the list field type +jimport('joomla.form.helper'); +JFormHelper::loadFieldClass('list'); + +/** + * Ftps Form Field class for the Componentbuilder component + */ +class JFormFieldFtps extends JFormFieldList +{ + /** + * The ftps field type. + * + * @var string + */ + public $type = 'ftps'; + /** + * Override to add new button + * + * @return string The field input markup. + * + * @since 3.2 + */ + protected function getInput() + { + // see if we should add buttons + $setButton = $this->getAttribute('button'); + // get html + $html = parent::getInput(); + // if true set button + if ($setButton === 'true') + { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $app = JFactory::getApplication(); + $jinput = $app->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } + $user = JFactory::getUser(); + // only add if user allowed to create ftp + if ($user->authorise('ftp.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build Create button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' + '; + } + // only add if user allowed to edit ftp + if (($buttonName === 'ftp' || $buttonName === 'ftps') && $user->authorise('ftp.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_componentbuilder&view=ftps&task=ftp.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for ftp field. + if (is_array($button) && count($button) > 0) + { + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return '
' .$html . implode('',$button).'
'; + } + } + return $html; + } + + /** + * Method to get a list of options for a list input. + * + * @return array An array of JHtml options. + */ + public function getOptions() + { + $db = JFactory::getDBO(); + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.id','a.name'),array('id','sales_server_ftp_name'))); + $query->from($db->quoteName('#__componentbuilder_ftp', 'a')); + $query->where($db->quoteName('a.published') . ' >= 1'); + $query->order('a.name ASC'); + $db->setQuery((string)$query); + $items = $db->loadObjectList(); + $options = array(); + if ($items) + { + $options[] = JHtml::_('select.option', '', 'Select an option'); + foreach($items as $item) + { + $options[] = JHtml::_('select.option', $item->id, $item->sales_server_ftp_name); + } + } + return $options; + } +} diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php index 56aa2387e..6095d037d 100644 --- a/admin/models/fields/lang.php +++ b/admin/models/fields/lang.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage lang.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 3fe9df091..18bc93dc4 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index d83b0d53b..b043e9dd4 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index 77e071597..b72f11fd6 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index d20533da9..119083765 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.5 - @build 20th September, 2017 + @version 2.5.6 + @build 6th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 28f205a38..ebcb29d20 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -119,7 +119,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWacfields() + public function getWadfields() { // Get the user object. $user = JFactory::getUser(); @@ -203,13 +203,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationWacfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationWadfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationWacfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationWadfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationWacfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationWadfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationWacfields($item->store, 'store'); + $item->store = $this->selectionTranslationWadfields($item->store, 'store'); } } @@ -223,7 +223,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationWacfields($value,$name) + public function selectionTranslationWadfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index cc2d7223d..5ee0ff272 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -23,7 +23,6 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvwwvwq_required = false; jform_vvvvvwxvwr_required = false; jform_vvvvvwyvws_required = false; jform_vvvvvwzvwt_required = false; @@ -47,308 +46,309 @@ jform_vvvvvxqvxk_required = false; jform_vvvvvxrvxl_required = false; jform_vvvvvxsvxm_required = false; jform_vvvvvxtvxn_required = false; -jform_vvvvvxxvxo_required = false; -jform_vvvvvxxvxp_required = false; -jform_vvvvvxxvxq_required = false; -jform_vvvvvxxvxr_required = false; -jform_vvvvvxxvxs_required = false; -jform_vvvvvxxvxt_required = false; -jform_vvvvvxzvxu_required = false; -jform_vvvvvxzvxv_required = false; -jform_vvvvvxzvxw_required = false; -jform_vvvvvxzvxx_required = false; +jform_vvvvvxuvxo_required = false; +jform_vvvvvxyvxp_required = false; +jform_vvvvvxyvxq_required = false; +jform_vvvvvxyvxr_required = false; +jform_vvvvvxyvxs_required = false; +jform_vvvvvxyvxt_required = false; +jform_vvvvvxyvxu_required = false; +jform_vvvvvyavxv_required = false; +jform_vvvvvyavxw_required = false; +jform_vvvvvyavxx_required = false; +jform_vvvvvyavxy_required = false; // Initial Script jQuery(document).ready(function() { - var add_css_view_vvvvvww = jQuery("#jform_add_css_view input[type='radio']:checked").val(); - vvvvvww(add_css_view_vvvvvww); + var add_css_view_vvvvvwx = jQuery("#jform_add_css_view input[type='radio']:checked").val(); + vvvvvwx(add_css_view_vvvvvwx); - var add_css_views_vvvvvwx = jQuery("#jform_add_css_views input[type='radio']:checked").val(); - vvvvvwx(add_css_views_vvvvvwx); + var add_css_views_vvvvvwy = jQuery("#jform_add_css_views input[type='radio']:checked").val(); + vvvvvwy(add_css_views_vvvvvwy); - 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_view_file_vvvvvwz = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val(); + vvvvvwz(add_javascript_view_file_vvvvvwz); - 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_views_file_vvvvvxa = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val(); + vvvvvxa(add_javascript_views_file_vvvvvxa); - 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_view_footer_vvvvvxb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); + vvvvvxb(add_javascript_view_footer_vvvvvxb); - 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_javascript_views_footer_vvvvvxc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); + vvvvvxc(add_javascript_views_footer_vvvvvxc); - var add_php_ajax_vvvvvxc = jQuery("#jform_add_php_ajax input[type='radio']:checked").val(); - vvvvvxc(add_php_ajax_vvvvvxc); + var add_php_ajax_vvvvvxd = jQuery("#jform_add_php_ajax input[type='radio']:checked").val(); + vvvvvxd(add_php_ajax_vvvvvxd); - var add_php_getitem_vvvvvxd = jQuery("#jform_add_php_getitem input[type='radio']:checked").val(); - vvvvvxd(add_php_getitem_vvvvvxd); + var add_php_getitem_vvvvvxe = jQuery("#jform_add_php_getitem input[type='radio']:checked").val(); + vvvvvxe(add_php_getitem_vvvvvxe); - var add_php_getitems_vvvvvxe = jQuery("#jform_add_php_getitems input[type='radio']:checked").val(); - vvvvvxe(add_php_getitems_vvvvvxe); + var add_php_getitems_vvvvvxf = jQuery("#jform_add_php_getitems input[type='radio']:checked").val(); + vvvvvxf(add_php_getitems_vvvvvxf); - 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_getitems_after_all_vvvvvxg = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val(); + vvvvvxg(add_php_getitems_after_all_vvvvvxg); - var add_php_getlistquery_vvvvvxg = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); - vvvvvxg(add_php_getlistquery_vvvvvxg); + var add_php_getlistquery_vvvvvxh = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); + vvvvvxh(add_php_getlistquery_vvvvvxh); - var add_php_before_save_vvvvvxh = jQuery("#jform_add_php_before_save input[type='radio']:checked").val(); - vvvvvxh(add_php_before_save_vvvvvxh); + var add_php_before_save_vvvvvxi = jQuery("#jform_add_php_before_save input[type='radio']:checked").val(); + vvvvvxi(add_php_before_save_vvvvvxi); - var add_php_save_vvvvvxi = jQuery("#jform_add_php_save input[type='radio']:checked").val(); - vvvvvxi(add_php_save_vvvvvxi); + var add_php_save_vvvvvxj = jQuery("#jform_add_php_save input[type='radio']:checked").val(); + vvvvvxj(add_php_save_vvvvvxj); - var add_php_postsavehook_vvvvvxj = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); - vvvvvxj(add_php_postsavehook_vvvvvxj); + var add_php_postsavehook_vvvvvxk = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); + vvvvvxk(add_php_postsavehook_vvvvvxk); - var add_php_allowedit_vvvvvxk = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); - vvvvvxk(add_php_allowedit_vvvvvxk); + var add_php_allowedit_vvvvvxl = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); + vvvvvxl(add_php_allowedit_vvvvvxl); - var add_php_batchcopy_vvvvvxl = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); - vvvvvxl(add_php_batchcopy_vvvvvxl); + var add_php_batchcopy_vvvvvxm = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); + vvvvvxm(add_php_batchcopy_vvvvvxm); - var add_php_batchmove_vvvvvxm = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); - vvvvvxm(add_php_batchmove_vvvvvxm); + var add_php_batchmove_vvvvvxn = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); + vvvvvxn(add_php_batchmove_vvvvvxn); - var add_php_before_publish_vvvvvxn = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); - vvvvvxn(add_php_before_publish_vvvvvxn); + var add_php_before_publish_vvvvvxo = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); + vvvvvxo(add_php_before_publish_vvvvvxo); - var add_php_after_publish_vvvvvxo = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); - vvvvvxo(add_php_after_publish_vvvvvxo); + var add_php_after_publish_vvvvvxp = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); + vvvvvxp(add_php_after_publish_vvvvvxp); - var add_php_before_delete_vvvvvxp = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); - vvvvvxp(add_php_before_delete_vvvvvxp); + var add_php_before_delete_vvvvvxq = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); + vvvvvxq(add_php_before_delete_vvvvvxq); - var add_php_after_delete_vvvvvxq = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); - vvvvvxq(add_php_after_delete_vvvvvxq); + var add_php_after_delete_vvvvvxr = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); + vvvvvxr(add_php_after_delete_vvvvvxr); - var add_php_document_vvvvvxr = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvxr(add_php_document_vvvvvxr); + var add_php_document_vvvvvxs = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvxs(add_php_document_vvvvvxs); - var add_sql_vvvvvxs = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxs(add_sql_vvvvvxs); - - 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); + vvvvvxt(add_sql_vvvvvxt); - var source_vvvvvxv = jQuery("#jform_source input[type='radio']:checked").val(); - var add_sql_vvvvvxv = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxv(source_vvvvvxv,add_sql_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_vvvvvxx = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); - vvvvvxx(add_custom_import_vvvvvxx); + var source_vvvvvxw = jQuery("#jform_source input[type='radio']:checked").val(); + var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val(); + vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw); var add_custom_import_vvvvvxy = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); vvvvvxy(add_custom_import_vvvvvxy); - var add_custom_button_vvvvvxz = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvxz(add_custom_button_vvvvvxz); + var add_custom_import_vvvvvxz = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvxz(add_custom_import_vvvvvxz); + + var add_custom_button_vvvvvya = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvya(add_custom_button_vvvvvya); }); -// the vvvvvww function -function vvvvvww(add_css_view_vvvvvww) +// the vvvvvwx function +function vvvvvwx(add_css_view_vvvvvwx) { // set the function logic - if (add_css_view_vvvvvww == 1) + if (add_css_view_vvvvvwx == 1) { jQuery('#jform_css_view').closest('.control-group').show(); - if (jform_vvvvvwwvwq_required) + if (jform_vvvvvwxvwr_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_vvvvvwwvwq_required = false; - } - - } - else - { - jQuery('#jform_css_view').closest('.control-group').hide(); - if (!jform_vvvvvwwvwq_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_vvvvvwwvwq_required = true; - } - } -} - -// the vvvvvwx function -function vvvvvwx(add_css_views_vvvvvwx) -{ - // set the function logic - if (add_css_views_vvvvvwx == 1) - { - jQuery('#jform_css_views').closest('.control-group').show(); - if (jform_vvvvvwxvwr_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_vvvvvwxvwr_required = false; } } else { - jQuery('#jform_css_views').closest('.control-group').hide(); + jQuery('#jform_css_view').closest('.control-group').hide(); if (!jform_vvvvvwxvwr_required) { - updateFieldRequired('css_views',1); - jQuery('#jform_css_views').removeAttr('required'); - jQuery('#jform_css_views').removeAttr('aria-required'); - jQuery('#jform_css_views').removeClass('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_vvvvvwxvwr_required = true; } } } // the vvvvvwy function -function vvvvvwy(add_javascript_view_file_vvvvvwy) +function vvvvvwy(add_css_views_vvvvvwy) { // set the function logic - if (add_javascript_view_file_vvvvvwy == 1) + if (add_css_views_vvvvvwy == 1) { - jQuery('#jform_javascript_view_file').closest('.control-group').show(); + jQuery('#jform_css_views').closest('.control-group').show(); if (jform_vvvvvwyvws_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'); + 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_vvvvvwyvws_required = false; } } else { - jQuery('#jform_javascript_view_file').closest('.control-group').hide(); + jQuery('#jform_css_views').closest('.control-group').hide(); if (!jform_vvvvvwyvws_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'); + updateFieldRequired('css_views',1); + jQuery('#jform_css_views').removeAttr('required'); + jQuery('#jform_css_views').removeAttr('aria-required'); + jQuery('#jform_css_views').removeClass('required'); jform_vvvvvwyvws_required = true; } } } // the vvvvvwz function -function vvvvvwz(add_javascript_views_file_vvvvvwz) +function vvvvvwz(add_javascript_view_file_vvvvvwz) { // set the function logic - if (add_javascript_views_file_vvvvvwz == 1) + if (add_javascript_view_file_vvvvvwz == 1) { - jQuery('#jform_javascript_views_file').closest('.control-group').show(); + jQuery('#jform_javascript_view_file').closest('.control-group').show(); if (jform_vvvvvwzvwt_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'); + 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_vvvvvwzvwt_required = false; } } else { - jQuery('#jform_javascript_views_file').closest('.control-group').hide(); + jQuery('#jform_javascript_view_file').closest('.control-group').hide(); if (!jform_vvvvvwzvwt_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'); + 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_vvvvvwzvwt_required = true; } } } // the vvvvvxa function -function vvvvvxa(add_javascript_view_footer_vvvvvxa) +function vvvvvxa(add_javascript_views_file_vvvvvxa) { // set the function logic - if (add_javascript_view_footer_vvvvvxa == 1) + if (add_javascript_views_file_vvvvvxa == 1) { - jQuery('#jform_javascript_view_footer').closest('.control-group').show(); + jQuery('#jform_javascript_views_file').closest('.control-group').show(); if (jform_vvvvvxavwu_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'); + 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_vvvvvxavwu_required = false; } } else { - jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); + jQuery('#jform_javascript_views_file').closest('.control-group').hide(); if (!jform_vvvvvxavwu_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'); + 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_vvvvvxavwu_required = true; } } } // the vvvvvxb function -function vvvvvxb(add_javascript_views_footer_vvvvvxb) +function vvvvvxb(add_javascript_view_footer_vvvvvxb) { // set the function logic - if (add_javascript_views_footer_vvvvvxb == 1) + if (add_javascript_view_footer_vvvvvxb == 1) { - jQuery('#jform_javascript_views_footer').closest('.control-group').show(); + jQuery('#jform_javascript_view_footer').closest('.control-group').show(); if (jform_vvvvvxbvwv_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'); + 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_vvvvvxbvwv_required = false; } } else { - jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); + jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); if (!jform_vvvvvxbvwv_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'); + 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_vvvvvxbvwv_required = true; } } } // the vvvvvxc function -function vvvvvxc(add_php_ajax_vvvvvxc) +function vvvvvxc(add_javascript_views_footer_vvvvvxc) { // set the function logic - if (add_php_ajax_vvvvvxc == 1) + if (add_javascript_views_footer_vvvvvxc == 1) + { + jQuery('#jform_javascript_views_footer').closest('.control-group').show(); + if (jform_vvvvvxcvww_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_vvvvvxcvww_required = false; + } + + } + else + { + jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); + if (!jform_vvvvvxcvww_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_vvvvvxcvww_required = true; + } + } +} + +// the vvvvvxd function +function vvvvvxd(add_php_ajax_vvvvvxd) +{ + // set the function logic + if (add_php_ajax_vvvvvxd == 1) { jQuery('#jform_ajax_input').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod').closest('.control-group').show(); - if (jform_vvvvvxcvww_required) + if (jform_vvvvvxdvwx_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_vvvvvxcvww_required = false; + jform_vvvvvxdvwx_required = false; } } @@ -356,549 +356,549 @@ function vvvvvxc(add_php_ajax_vvvvvxc) { jQuery('#jform_ajax_input').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod').closest('.control-group').hide(); - if (!jform_vvvvvxcvww_required) + if (!jform_vvvvvxdvwx_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_vvvvvxcvww_required = true; - } - } -} - -// the vvvvvxd function -function vvvvvxd(add_php_getitem_vvvvvxd) -{ - // set the function logic - if (add_php_getitem_vvvvvxd == 1) - { - jQuery('#jform_php_getitem').closest('.control-group').show(); - if (jform_vvvvvxdvwx_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_vvvvvxdvwx_required = false; - } - - } - else - { - jQuery('#jform_php_getitem').closest('.control-group').hide(); - if (!jform_vvvvvxdvwx_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_vvvvvxdvwx_required = true; } } } // the vvvvvxe function -function vvvvvxe(add_php_getitems_vvvvvxe) +function vvvvvxe(add_php_getitem_vvvvvxe) { // set the function logic - if (add_php_getitems_vvvvvxe == 1) + if (add_php_getitem_vvvvvxe == 1) { - jQuery('#jform_php_getitems').closest('.control-group').show(); + jQuery('#jform_php_getitem').closest('.control-group').show(); if (jform_vvvvvxevwy_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'); + 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_vvvvvxevwy_required = false; } } else { - jQuery('#jform_php_getitems').closest('.control-group').hide(); + jQuery('#jform_php_getitem').closest('.control-group').hide(); if (!jform_vvvvvxevwy_required) { - updateFieldRequired('php_getitems',1); - jQuery('#jform_php_getitems').removeAttr('required'); - jQuery('#jform_php_getitems').removeAttr('aria-required'); - jQuery('#jform_php_getitems').removeClass('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_vvvvvxevwy_required = true; } } } // the vvvvvxf function -function vvvvvxf(add_php_getitems_after_all_vvvvvxf) +function vvvvvxf(add_php_getitems_vvvvvxf) { // set the function logic - if (add_php_getitems_after_all_vvvvvxf == 1) + if (add_php_getitems_vvvvvxf == 1) { - jQuery('#jform_php_getitems_after_all').closest('.control-group').show(); + jQuery('#jform_php_getitems').closest('.control-group').show(); if (jform_vvvvvxfvwz_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'); + 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_vvvvvxfvwz_required = false; } } else { - jQuery('#jform_php_getitems_after_all').closest('.control-group').hide(); + jQuery('#jform_php_getitems').closest('.control-group').hide(); if (!jform_vvvvvxfvwz_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'); + updateFieldRequired('php_getitems',1); + jQuery('#jform_php_getitems').removeAttr('required'); + jQuery('#jform_php_getitems').removeAttr('aria-required'); + jQuery('#jform_php_getitems').removeClass('required'); jform_vvvvvxfvwz_required = true; } } } // the vvvvvxg function -function vvvvvxg(add_php_getlistquery_vvvvvxg) +function vvvvvxg(add_php_getitems_after_all_vvvvvxg) { // set the function logic - if (add_php_getlistquery_vvvvvxg == 1) + if (add_php_getitems_after_all_vvvvvxg == 1) { - jQuery('#jform_php_getlistquery').closest('.control-group').show(); + jQuery('#jform_php_getitems_after_all').closest('.control-group').show(); if (jform_vvvvvxgvxa_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('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_vvvvvxgvxa_required = false; } } else { - jQuery('#jform_php_getlistquery').closest('.control-group').hide(); + jQuery('#jform_php_getitems_after_all').closest('.control-group').hide(); if (!jform_vvvvvxgvxa_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('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_vvvvvxgvxa_required = true; } } } // the vvvvvxh function -function vvvvvxh(add_php_before_save_vvvvvxh) +function vvvvvxh(add_php_getlistquery_vvvvvxh) { // set the function logic - if (add_php_before_save_vvvvvxh == 1) + if (add_php_getlistquery_vvvvvxh == 1) { - jQuery('#jform_php_before_save').closest('.control-group').show(); + jQuery('#jform_php_getlistquery').closest('.control-group').show(); if (jform_vvvvvxhvxb_required) { - updateFieldRequired('php_before_save',0); - jQuery('#jform_php_before_save').prop('required','required'); - jQuery('#jform_php_before_save').attr('aria-required',true); - jQuery('#jform_php_before_save').addClass('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_vvvvvxhvxb_required = false; } } else { - jQuery('#jform_php_before_save').closest('.control-group').hide(); + jQuery('#jform_php_getlistquery').closest('.control-group').hide(); if (!jform_vvvvvxhvxb_required) { - updateFieldRequired('php_before_save',1); - jQuery('#jform_php_before_save').removeAttr('required'); - jQuery('#jform_php_before_save').removeAttr('aria-required'); - jQuery('#jform_php_before_save').removeClass('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_vvvvvxhvxb_required = true; } } } // the vvvvvxi function -function vvvvvxi(add_php_save_vvvvvxi) +function vvvvvxi(add_php_before_save_vvvvvxi) { // set the function logic - if (add_php_save_vvvvvxi == 1) + if (add_php_before_save_vvvvvxi == 1) { - jQuery('#jform_php_save').closest('.control-group').show(); + jQuery('#jform_php_before_save').closest('.control-group').show(); if (jform_vvvvvxivxc_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'); + updateFieldRequired('php_before_save',0); + jQuery('#jform_php_before_save').prop('required','required'); + jQuery('#jform_php_before_save').attr('aria-required',true); + jQuery('#jform_php_before_save').addClass('required'); jform_vvvvvxivxc_required = false; } } else { - jQuery('#jform_php_save').closest('.control-group').hide(); + jQuery('#jform_php_before_save').closest('.control-group').hide(); if (!jform_vvvvvxivxc_required) { - updateFieldRequired('php_save',1); - jQuery('#jform_php_save').removeAttr('required'); - jQuery('#jform_php_save').removeAttr('aria-required'); - jQuery('#jform_php_save').removeClass('required'); + updateFieldRequired('php_before_save',1); + jQuery('#jform_php_before_save').removeAttr('required'); + jQuery('#jform_php_before_save').removeAttr('aria-required'); + jQuery('#jform_php_before_save').removeClass('required'); jform_vvvvvxivxc_required = true; } } } // the vvvvvxj function -function vvvvvxj(add_php_postsavehook_vvvvvxj) +function vvvvvxj(add_php_save_vvvvvxj) { // set the function logic - if (add_php_postsavehook_vvvvvxj == 1) + if (add_php_save_vvvvvxj == 1) { - jQuery('#jform_php_postsavehook').closest('.control-group').show(); + jQuery('#jform_php_save').closest('.control-group').show(); if (jform_vvvvvxjvxd_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'); + 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_vvvvvxjvxd_required = false; } } else { - jQuery('#jform_php_postsavehook').closest('.control-group').hide(); + jQuery('#jform_php_save').closest('.control-group').hide(); if (!jform_vvvvvxjvxd_required) { - updateFieldRequired('php_postsavehook',1); - jQuery('#jform_php_postsavehook').removeAttr('required'); - jQuery('#jform_php_postsavehook').removeAttr('aria-required'); - jQuery('#jform_php_postsavehook').removeClass('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_vvvvvxjvxd_required = true; } } } // the vvvvvxk function -function vvvvvxk(add_php_allowedit_vvvvvxk) +function vvvvvxk(add_php_postsavehook_vvvvvxk) { // set the function logic - if (add_php_allowedit_vvvvvxk == 1) + if (add_php_postsavehook_vvvvvxk == 1) { - jQuery('#jform_php_allowedit').closest('.control-group').show(); + jQuery('#jform_php_postsavehook').closest('.control-group').show(); if (jform_vvvvvxkvxe_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'); + 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_vvvvvxkvxe_required = false; } } else { - jQuery('#jform_php_allowedit').closest('.control-group').hide(); + jQuery('#jform_php_postsavehook').closest('.control-group').hide(); if (!jform_vvvvvxkvxe_required) { - updateFieldRequired('php_allowedit',1); - jQuery('#jform_php_allowedit').removeAttr('required'); - jQuery('#jform_php_allowedit').removeAttr('aria-required'); - jQuery('#jform_php_allowedit').removeClass('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_vvvvvxkvxe_required = true; } } } // the vvvvvxl function -function vvvvvxl(add_php_batchcopy_vvvvvxl) +function vvvvvxl(add_php_allowedit_vvvvvxl) { // set the function logic - if (add_php_batchcopy_vvvvvxl == 1) + if (add_php_allowedit_vvvvvxl == 1) { - jQuery('#jform_php_batchcopy').closest('.control-group').show(); + jQuery('#jform_php_allowedit').closest('.control-group').show(); if (jform_vvvvvxlvxf_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'); + 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_vvvvvxlvxf_required = false; } } else { - jQuery('#jform_php_batchcopy').closest('.control-group').hide(); + jQuery('#jform_php_allowedit').closest('.control-group').hide(); if (!jform_vvvvvxlvxf_required) { - updateFieldRequired('php_batchcopy',1); - jQuery('#jform_php_batchcopy').removeAttr('required'); - jQuery('#jform_php_batchcopy').removeAttr('aria-required'); - jQuery('#jform_php_batchcopy').removeClass('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_vvvvvxlvxf_required = true; } } } // the vvvvvxm function -function vvvvvxm(add_php_batchmove_vvvvvxm) +function vvvvvxm(add_php_batchcopy_vvvvvxm) { // set the function logic - if (add_php_batchmove_vvvvvxm == 1) + if (add_php_batchcopy_vvvvvxm == 1) { - jQuery('#jform_php_batchmove').closest('.control-group').show(); + jQuery('#jform_php_batchcopy').closest('.control-group').show(); if (jform_vvvvvxmvxg_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'); + 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_vvvvvxmvxg_required = false; } } else { - jQuery('#jform_php_batchmove').closest('.control-group').hide(); + jQuery('#jform_php_batchcopy').closest('.control-group').hide(); if (!jform_vvvvvxmvxg_required) { - updateFieldRequired('php_batchmove',1); - jQuery('#jform_php_batchmove').removeAttr('required'); - jQuery('#jform_php_batchmove').removeAttr('aria-required'); - jQuery('#jform_php_batchmove').removeClass('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_vvvvvxmvxg_required = true; } } } // the vvvvvxn function -function vvvvvxn(add_php_before_publish_vvvvvxn) +function vvvvvxn(add_php_batchmove_vvvvvxn) { // set the function logic - if (add_php_before_publish_vvvvvxn == 1) + if (add_php_batchmove_vvvvvxn == 1) { - jQuery('#jform_php_before_publish').closest('.control-group').show(); + jQuery('#jform_php_batchmove').closest('.control-group').show(); if (jform_vvvvvxnvxh_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'); + 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_vvvvvxnvxh_required = false; } } else { - jQuery('#jform_php_before_publish').closest('.control-group').hide(); + jQuery('#jform_php_batchmove').closest('.control-group').hide(); if (!jform_vvvvvxnvxh_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'); + updateFieldRequired('php_batchmove',1); + jQuery('#jform_php_batchmove').removeAttr('required'); + jQuery('#jform_php_batchmove').removeAttr('aria-required'); + jQuery('#jform_php_batchmove').removeClass('required'); jform_vvvvvxnvxh_required = true; } } } // the vvvvvxo function -function vvvvvxo(add_php_after_publish_vvvvvxo) +function vvvvvxo(add_php_before_publish_vvvvvxo) { // set the function logic - if (add_php_after_publish_vvvvvxo == 1) + if (add_php_before_publish_vvvvvxo == 1) { - jQuery('#jform_php_after_publish').closest('.control-group').show(); + jQuery('#jform_php_before_publish').closest('.control-group').show(); if (jform_vvvvvxovxi_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'); + 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_vvvvvxovxi_required = false; } } else { - jQuery('#jform_php_after_publish').closest('.control-group').hide(); + jQuery('#jform_php_before_publish').closest('.control-group').hide(); if (!jform_vvvvvxovxi_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'); + 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_vvvvvxovxi_required = true; } } } // the vvvvvxp function -function vvvvvxp(add_php_before_delete_vvvvvxp) +function vvvvvxp(add_php_after_publish_vvvvvxp) { // set the function logic - if (add_php_before_delete_vvvvvxp == 1) + if (add_php_after_publish_vvvvvxp == 1) { - jQuery('#jform_php_before_delete').closest('.control-group').show(); + jQuery('#jform_php_after_publish').closest('.control-group').show(); if (jform_vvvvvxpvxj_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'); + 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_vvvvvxpvxj_required = false; } } else { - jQuery('#jform_php_before_delete').closest('.control-group').hide(); + jQuery('#jform_php_after_publish').closest('.control-group').hide(); if (!jform_vvvvvxpvxj_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'); + 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_vvvvvxpvxj_required = true; } } } // the vvvvvxq function -function vvvvvxq(add_php_after_delete_vvvvvxq) +function vvvvvxq(add_php_before_delete_vvvvvxq) { // set the function logic - if (add_php_after_delete_vvvvvxq == 1) + if (add_php_before_delete_vvvvvxq == 1) { - jQuery('#jform_php_after_delete').closest('.control-group').show(); + jQuery('#jform_php_before_delete').closest('.control-group').show(); if (jform_vvvvvxqvxk_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'); + 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_vvvvvxqvxk_required = false; } } else { - jQuery('#jform_php_after_delete').closest('.control-group').hide(); + jQuery('#jform_php_before_delete').closest('.control-group').hide(); if (!jform_vvvvvxqvxk_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'); + 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_vvvvvxqvxk_required = true; } } } // the vvvvvxr function -function vvvvvxr(add_php_document_vvvvvxr) +function vvvvvxr(add_php_after_delete_vvvvvxr) { // set the function logic - if (add_php_document_vvvvvxr == 1) + if (add_php_after_delete_vvvvvxr == 1) { - jQuery('#jform_php_document').closest('.control-group').show(); + jQuery('#jform_php_after_delete').closest('.control-group').show(); if (jform_vvvvvxrvxl_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'); + 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_vvvvvxrvxl_required = false; } } else { - jQuery('#jform_php_document').closest('.control-group').hide(); + jQuery('#jform_php_after_delete').closest('.control-group').hide(); if (!jform_vvvvvxrvxl_required) { - updateFieldRequired('php_document',1); - jQuery('#jform_php_document').removeAttr('required'); - jQuery('#jform_php_document').removeAttr('aria-required'); - jQuery('#jform_php_document').removeClass('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_vvvvvxrvxl_required = true; } } } // the vvvvvxs function -function vvvvvxs(add_sql_vvvvvxs) +function vvvvvxs(add_php_document_vvvvvxs) { // set the function logic - if (add_sql_vvvvvxs == 1) + if (add_php_document_vvvvvxs == 1) { - jQuery('#jform_source').closest('.control-group').show(); + jQuery('#jform_php_document').closest('.control-group').show(); if (jform_vvvvvxsvxm_required) { - updateFieldRequired('source',0); - jQuery('#jform_source').prop('required','required'); - jQuery('#jform_source').attr('aria-required',true); - jQuery('#jform_source').addClass('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_vvvvvxsvxm_required = false; } } else { - jQuery('#jform_source').closest('.control-group').hide(); + jQuery('#jform_php_document').closest('.control-group').hide(); if (!jform_vvvvvxsvxm_required) { - updateFieldRequired('source',1); - jQuery('#jform_source').removeAttr('required'); - jQuery('#jform_source').removeAttr('aria-required'); - jQuery('#jform_source').removeClass('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_vvvvvxsvxm_required = true; } } } // the vvvvvxt function -function vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt) +function vvvvvxt(add_sql_vvvvvxt) { // set the function logic - if (source_vvvvvxt == 2 && add_sql_vvvvvxt == 1) + if (add_sql_vvvvvxt == 1) { - jQuery('#jform_sql').closest('.control-group').show(); + jQuery('#jform_source').closest('.control-group').show(); if (jform_vvvvvxtvxn_required) { - updateFieldRequired('sql',0); - jQuery('#jform_sql').prop('required','required'); - jQuery('#jform_sql').attr('aria-required',true); - jQuery('#jform_sql').addClass('required'); + updateFieldRequired('source',0); + jQuery('#jform_source').prop('required','required'); + jQuery('#jform_source').attr('aria-required',true); + jQuery('#jform_source').addClass('required'); jform_vvvvvxtvxn_required = false; } } else { - jQuery('#jform_sql').closest('.control-group').hide(); + jQuery('#jform_source').closest('.control-group').hide(); if (!jform_vvvvvxtvxn_required) { - updateFieldRequired('sql',1); - jQuery('#jform_sql').removeAttr('required'); - jQuery('#jform_sql').removeAttr('aria-required'); - jQuery('#jform_sql').removeClass('required'); + updateFieldRequired('source',1); + jQuery('#jform_source').removeAttr('required'); + jQuery('#jform_source').removeAttr('aria-required'); + jQuery('#jform_source').removeClass('required'); jform_vvvvvxtvxn_required = true; } } } -// the vvvvvxv function -function vvvvvxv(source_vvvvvxv,add_sql_vvvvvxv) +// the vvvvvxu function +function vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu) { // set the function logic - if (source_vvvvvxv == 1 && add_sql_vvvvvxv == 1) + if (source_vvvvvxu == 2 && add_sql_vvvvvxu == 1) + { + jQuery('#jform_sql').closest('.control-group').show(); + if (jform_vvvvvxuvxo_required) + { + updateFieldRequired('sql',0); + jQuery('#jform_sql').prop('required','required'); + jQuery('#jform_sql').attr('aria-required',true); + jQuery('#jform_sql').addClass('required'); + jform_vvvvvxuvxo_required = false; + } + + } + else + { + jQuery('#jform_sql').closest('.control-group').hide(); + if (!jform_vvvvvxuvxo_required) + { + updateFieldRequired('sql',1); + jQuery('#jform_sql').removeAttr('required'); + jQuery('#jform_sql').removeAttr('aria-required'); + jQuery('#jform_sql').removeClass('required'); + jform_vvvvvxuvxo_required = true; + } + } +} + +// the vvvvvxw function +function vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw) +{ + // set the function logic + if (source_vvvvvxw == 1 && add_sql_vvvvvxw == 1) { jQuery('#jform_addtables').closest('.control-group').show(); } @@ -908,139 +908,139 @@ function vvvvvxv(source_vvvvvxv,add_sql_vvvvvxv) } } -// the vvvvvxx function -function vvvvvxx(add_custom_import_vvvvvxx) +// the vvvvvxy function +function vvvvvxy(add_custom_import_vvvvvxy) { // set the function logic - if (add_custom_import_vvvvvxx == 1) + if (add_custom_import_vvvvvxy == 1) { jQuery('#jform_html_import_view').closest('.control-group').show(); - if (jform_vvvvvxxvxo_required) + if (jform_vvvvvxyvxp_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_vvvvvxxvxo_required = false; + jform_vvvvvxyvxp_required = false; } jQuery('.note_advanced_import').closest('.control-group').show(); jQuery('#jform_php_import_display').closest('.control-group').show(); - if (jform_vvvvvxxvxp_required) + if (jform_vvvvvxyvxq_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_vvvvvxxvxp_required = false; + jform_vvvvvxyvxq_required = false; } jQuery('#jform_php_import_ext').closest('.control-group').show(); - if (jform_vvvvvxxvxq_required) + if (jform_vvvvvxyvxr_required) { updateFieldRequired('php_import_ext',0); jQuery('#jform_php_import_ext').prop('required','required'); jQuery('#jform_php_import_ext').attr('aria-required',true); jQuery('#jform_php_import_ext').addClass('required'); - jform_vvvvvxxvxq_required = false; + jform_vvvvvxyvxr_required = false; } jQuery('#jform_php_import').closest('.control-group').show(); - if (jform_vvvvvxxvxr_required) + if (jform_vvvvvxyvxs_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_vvvvvxxvxr_required = false; + jform_vvvvvxyvxs_required = false; } jQuery('#jform_php_import_save').closest('.control-group').show(); - if (jform_vvvvvxxvxs_required) + if (jform_vvvvvxyvxt_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_vvvvvxxvxs_required = false; + jform_vvvvvxyvxt_required = false; } jQuery('#jform_php_import_setdata').closest('.control-group').show(); - if (jform_vvvvvxxvxt_required) + if (jform_vvvvvxyvxu_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_vvvvvxxvxt_required = false; + jform_vvvvvxyvxu_required = false; } } else { jQuery('#jform_html_import_view').closest('.control-group').hide(); - if (!jform_vvvvvxxvxo_required) + if (!jform_vvvvvxyvxp_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_vvvvvxxvxo_required = true; + jform_vvvvvxyvxp_required = true; } jQuery('.note_advanced_import').closest('.control-group').hide(); jQuery('#jform_php_import_display').closest('.control-group').hide(); - if (!jform_vvvvvxxvxp_required) + if (!jform_vvvvvxyvxq_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_vvvvvxxvxp_required = true; + jform_vvvvvxyvxq_required = true; } jQuery('#jform_php_import_ext').closest('.control-group').hide(); - if (!jform_vvvvvxxvxq_required) + if (!jform_vvvvvxyvxr_required) { updateFieldRequired('php_import_ext',1); jQuery('#jform_php_import_ext').removeAttr('required'); jQuery('#jform_php_import_ext').removeAttr('aria-required'); jQuery('#jform_php_import_ext').removeClass('required'); - jform_vvvvvxxvxq_required = true; + jform_vvvvvxyvxr_required = true; } jQuery('#jform_php_import').closest('.control-group').hide(); - if (!jform_vvvvvxxvxr_required) + if (!jform_vvvvvxyvxs_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_vvvvvxxvxr_required = true; + jform_vvvvvxyvxs_required = true; } jQuery('#jform_php_import_save').closest('.control-group').hide(); - if (!jform_vvvvvxxvxs_required) + if (!jform_vvvvvxyvxt_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_vvvvvxxvxs_required = true; + jform_vvvvvxyvxt_required = true; } jQuery('#jform_php_import_setdata').closest('.control-group').hide(); - if (!jform_vvvvvxxvxt_required) + if (!jform_vvvvvxyvxu_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_vvvvvxxvxt_required = true; + jform_vvvvvxyvxu_required = true; } } } -// the vvvvvxy function -function vvvvvxy(add_custom_import_vvvvvxy) +// the vvvvvxz function +function vvvvvxz(add_custom_import_vvvvvxz) { // set the function logic - if (add_custom_import_vvvvvxy == 0) + if (add_custom_import_vvvvvxz == 0) { jQuery('.note_beginner_import').closest('.control-group').show(); } @@ -1050,51 +1050,51 @@ function vvvvvxy(add_custom_import_vvvvvxy) } } -// the vvvvvxz function -function vvvvvxz(add_custom_button_vvvvvxz) +// the vvvvvya function +function vvvvvya(add_custom_button_vvvvvya) { // set the function logic - if (add_custom_button_vvvvvxz == 1) + if (add_custom_button_vvvvvya == 1) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvxzvxu_required) + if (jform_vvvvvyavxv_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_vvvvvxzvxu_required = false; + jform_vvvvvyavxv_required = false; } jQuery('#jform_php_controller_list').closest('.control-group').show(); - if (jform_vvvvvxzvxv_required) + if (jform_vvvvvyavxw_required) { updateFieldRequired('php_controller_list',0); jQuery('#jform_php_controller_list').prop('required','required'); jQuery('#jform_php_controller_list').attr('aria-required',true); jQuery('#jform_php_controller_list').addClass('required'); - jform_vvvvvxzvxv_required = false; + jform_vvvvvyavxw_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvxzvxw_required) + if (jform_vvvvvyavxx_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_vvvvvxzvxw_required = false; + jform_vvvvvyavxx_required = false; } jQuery('#jform_php_model_list').closest('.control-group').show(); - if (jform_vvvvvxzvxx_required) + if (jform_vvvvvyavxy_required) { updateFieldRequired('php_model_list',0); jQuery('#jform_php_model_list').prop('required','required'); jQuery('#jform_php_model_list').attr('aria-required',true); jQuery('#jform_php_model_list').addClass('required'); - jform_vvvvvxzvxx_required = false; + jform_vvvvvyavxy_required = false; } } @@ -1102,40 +1102,40 @@ function vvvvvxz(add_custom_button_vvvvvxz) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvxzvxu_required) + if (!jform_vvvvvyavxv_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_vvvvvxzvxu_required = true; + jform_vvvvvyavxv_required = true; } jQuery('#jform_php_controller_list').closest('.control-group').hide(); - if (!jform_vvvvvxzvxv_required) + if (!jform_vvvvvyavxw_required) { updateFieldRequired('php_controller_list',1); jQuery('#jform_php_controller_list').removeAttr('required'); jQuery('#jform_php_controller_list').removeAttr('aria-required'); jQuery('#jform_php_controller_list').removeClass('required'); - jform_vvvvvxzvxv_required = true; + jform_vvvvvyavxw_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvxzvxw_required) + if (!jform_vvvvvyavxx_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_vvvvvxzvxw_required = true; + jform_vvvvvyavxx_required = true; } jQuery('#jform_php_model_list').closest('.control-group').hide(); - if (!jform_vvvvvxzvxx_required) + if (!jform_vvvvvyavxy_required) { updateFieldRequired('php_model_list',1); jQuery('#jform_php_model_list').removeAttr('required'); jQuery('#jform_php_model_list').removeAttr('aria-required'); jQuery('#jform_php_model_list').removeClass('required'); - jform_vvvvvxzvxx_required = true; + jform_vvvvvyavxy_required = true; } } } diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js index 466d2f9f4..c9d6046b7 100644 --- a/admin/models/forms/custom_admin_view.js +++ b/admin/models/forms/custom_admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 22 of this MVC - @build 17th July, 2017 + @version @update number 27 of this MVC + @build 27th September, 2017 @created 13th August, 2015 @package Component Builder @subpackage custom_admin_view.js @@ -23,255 +23,255 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvyavya_required = false; jform_vvvvvybvyb_required = false; jform_vvvvvycvyc_required = false; jform_vvvvvydvyd_required = false; jform_vvvvvyevye_required = false; jform_vvvvvyfvyf_required = false; jform_vvvvvygvyg_required = false; -jform_vvvvvygvyh_required = false; +jform_vvvvvyhvyh_required = false; jform_vvvvvyhvyi_required = false; +jform_vvvvvyivyj_required = false; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvya = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvya(add_php_view_vvvvvya); + var add_php_view_vvvvvyb = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvyb(add_php_view_vvvvvyb); - var add_php_jview_display_vvvvvyb = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); - vvvvvyb(add_php_jview_display_vvvvvyb); + var add_php_jview_display_vvvvvyc = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); + vvvvvyc(add_php_jview_display_vvvvvyc); - var add_php_jview_vvvvvyc = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); - vvvvvyc(add_php_jview_vvvvvyc); + var add_php_jview_vvvvvyd = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); + vvvvvyd(add_php_jview_vvvvvyd); - var add_php_document_vvvvvyd = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvyd(add_php_document_vvvvvyd); + var add_php_document_vvvvvye = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvye(add_php_document_vvvvvye); - var add_css_document_vvvvvye = jQuery("#jform_add_css_document input[type='radio']:checked").val(); - vvvvvye(add_css_document_vvvvvye); + var add_css_document_vvvvvyf = jQuery("#jform_add_css_document input[type='radio']:checked").val(); + vvvvvyf(add_css_document_vvvvvyf); - var add_js_document_vvvvvyf = jQuery("#jform_add_js_document input[type='radio']:checked").val(); - vvvvvyf(add_js_document_vvvvvyf); + var add_js_document_vvvvvyg = jQuery("#jform_add_js_document input[type='radio']:checked").val(); + vvvvvyg(add_js_document_vvvvvyg); - var add_custom_button_vvvvvyg = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvyg(add_custom_button_vvvvvyg); + var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvyh(add_custom_button_vvvvvyh); - var add_css_vvvvvyh = jQuery("#jform_add_css input[type='radio']:checked").val(); - vvvvvyh(add_css_vvvvvyh); + var add_css_vvvvvyi = jQuery("#jform_add_css input[type='radio']:checked").val(); + vvvvvyi(add_css_vvvvvyi); }); -// the vvvvvya function -function vvvvvya(add_php_view_vvvvvya) +// the vvvvvyb function +function vvvvvyb(add_php_view_vvvvvyb) { // set the function logic - if (add_php_view_vvvvvya == 1) + if (add_php_view_vvvvvyb == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvyavya_required) + if (jform_vvvvvybvyb_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_vvvvvyavya_required = false; - } - - } - else - { - jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvyavya_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_vvvvvyavya_required = true; - } - } -} - -// the vvvvvyb function -function vvvvvyb(add_php_jview_display_vvvvvyb) -{ - // set the function logic - if (add_php_jview_display_vvvvvyb == 1) - { - jQuery('#jform_php_jview_display').closest('.control-group').show(); - if (jform_vvvvvybvyb_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_vvvvvybvyb_required = false; } } else { - jQuery('#jform_php_jview_display').closest('.control-group').hide(); + jQuery('#jform_php_view').closest('.control-group').hide(); if (!jform_vvvvvybvyb_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'); + updateFieldRequired('php_view',1); + jQuery('#jform_php_view').removeAttr('required'); + jQuery('#jform_php_view').removeAttr('aria-required'); + jQuery('#jform_php_view').removeClass('required'); jform_vvvvvybvyb_required = true; } } } // the vvvvvyc function -function vvvvvyc(add_php_jview_vvvvvyc) +function vvvvvyc(add_php_jview_display_vvvvvyc) { // set the function logic - if (add_php_jview_vvvvvyc == 1) + if (add_php_jview_display_vvvvvyc == 1) { - jQuery('#jform_php_jview').closest('.control-group').show(); + jQuery('#jform_php_jview_display').closest('.control-group').show(); if (jform_vvvvvycvyc_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'); + 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_vvvvvycvyc_required = false; } } else { - jQuery('#jform_php_jview').closest('.control-group').hide(); + jQuery('#jform_php_jview_display').closest('.control-group').hide(); if (!jform_vvvvvycvyc_required) { - updateFieldRequired('php_jview',1); - jQuery('#jform_php_jview').removeAttr('required'); - jQuery('#jform_php_jview').removeAttr('aria-required'); - jQuery('#jform_php_jview').removeClass('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_vvvvvycvyc_required = true; } } } // the vvvvvyd function -function vvvvvyd(add_php_document_vvvvvyd) +function vvvvvyd(add_php_jview_vvvvvyd) { // set the function logic - if (add_php_document_vvvvvyd == 1) + if (add_php_jview_vvvvvyd == 1) { - jQuery('#jform_php_document').closest('.control-group').show(); + jQuery('#jform_php_jview').closest('.control-group').show(); if (jform_vvvvvydvyd_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'); + 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_vvvvvydvyd_required = false; } } else { - jQuery('#jform_php_document').closest('.control-group').hide(); + jQuery('#jform_php_jview').closest('.control-group').hide(); if (!jform_vvvvvydvyd_required) { - updateFieldRequired('php_document',1); - jQuery('#jform_php_document').removeAttr('required'); - jQuery('#jform_php_document').removeAttr('aria-required'); - jQuery('#jform_php_document').removeClass('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_vvvvvydvyd_required = true; } } } // the vvvvvye function -function vvvvvye(add_css_document_vvvvvye) +function vvvvvye(add_php_document_vvvvvye) { // set the function logic - if (add_css_document_vvvvvye == 1) + if (add_php_document_vvvvvye == 1) { - jQuery('#jform_css_document').closest('.control-group').show(); + jQuery('#jform_php_document').closest('.control-group').show(); if (jform_vvvvvyevye_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'); + 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_vvvvvyevye_required = false; } } else { - jQuery('#jform_css_document').closest('.control-group').hide(); + jQuery('#jform_php_document').closest('.control-group').hide(); if (!jform_vvvvvyevye_required) { - updateFieldRequired('css_document',1); - jQuery('#jform_css_document').removeAttr('required'); - jQuery('#jform_css_document').removeAttr('aria-required'); - jQuery('#jform_css_document').removeClass('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_vvvvvyevye_required = true; } } } // the vvvvvyf function -function vvvvvyf(add_js_document_vvvvvyf) +function vvvvvyf(add_css_document_vvvvvyf) { // set the function logic - if (add_js_document_vvvvvyf == 1) + if (add_css_document_vvvvvyf == 1) { - jQuery('#jform_js_document').closest('.control-group').show(); + jQuery('#jform_css_document').closest('.control-group').show(); if (jform_vvvvvyfvyf_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'); + 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_vvvvvyfvyf_required = false; } } else { - jQuery('#jform_js_document').closest('.control-group').hide(); + jQuery('#jform_css_document').closest('.control-group').hide(); if (!jform_vvvvvyfvyf_required) { - updateFieldRequired('js_document',1); - jQuery('#jform_js_document').removeAttr('required'); - jQuery('#jform_js_document').removeAttr('aria-required'); - jQuery('#jform_js_document').removeClass('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_vvvvvyfvyf_required = true; } } } // the vvvvvyg function -function vvvvvyg(add_custom_button_vvvvvyg) +function vvvvvyg(add_js_document_vvvvvyg) { // set the function logic - if (add_custom_button_vvvvvyg == 1) + if (add_js_document_vvvvvyg == 1) + { + jQuery('#jform_js_document').closest('.control-group').show(); + if (jform_vvvvvygvyg_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_vvvvvygvyg_required = false; + } + + } + else + { + jQuery('#jform_js_document').closest('.control-group').hide(); + if (!jform_vvvvvygvyg_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_vvvvvygvyg_required = true; + } + } +} + +// the vvvvvyh function +function vvvvvyh(add_custom_button_vvvvvyh) +{ + // set the function logic + if (add_custom_button_vvvvvyh == 1) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvygvyg_required) + if (jform_vvvvvyhvyh_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_vvvvvygvyg_required = false; + jform_vvvvvyhvyh_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvygvyh_required) + if (jform_vvvvvyhvyi_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_vvvvvygvyh_required = false; + jform_vvvvvyhvyi_required = false; } } @@ -279,53 +279,53 @@ function vvvvvyg(add_custom_button_vvvvvyg) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvygvyg_required) + if (!jform_vvvvvyhvyh_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_vvvvvygvyg_required = true; + jform_vvvvvyhvyh_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvygvyh_required) + if (!jform_vvvvvyhvyi_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_vvvvvygvyh_required = true; + jform_vvvvvyhvyi_required = true; } } } -// the vvvvvyh function -function vvvvvyh(add_css_vvvvvyh) +// the vvvvvyi function +function vvvvvyi(add_css_vvvvvyi) { // set the function logic - if (add_css_vvvvvyh == 1) + if (add_css_vvvvvyi == 1) { jQuery('#jform_css').closest('.control-group').show(); - if (jform_vvvvvyhvyi_required) + if (jform_vvvvvyivyj_required) { updateFieldRequired('css',0); jQuery('#jform_css').prop('required','required'); jQuery('#jform_css').attr('aria-required',true); jQuery('#jform_css').addClass('required'); - jform_vvvvvyhvyi_required = false; + jform_vvvvvyivyj_required = false; } } else { jQuery('#jform_css').closest('.control-group').hide(); - if (!jform_vvvvvyhvyi_required) + if (!jform_vvvvvyivyj_required) { updateFieldRequired('css',1); jQuery('#jform_css').removeAttr('required'); jQuery('#jform_css').removeAttr('aria-required'); jQuery('#jform_css').removeClass('required'); - jform_vvvvvyhvyi_required = true; + jform_vvvvvyivyj_required = true; } } } @@ -366,6 +366,7 @@ function isSet(val) return false; } + function getSnippetDetails_server(snippetId){ var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json"; if(token.length > 0 && snippetId > 0){ @@ -410,12 +411,12 @@ function getSnippetDetails(id){ jQuery('.snippet-usage').append(usage); } }) -} - +} + function getDynamicValues_server(dynamicId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.dynamicValues&format=json"; + var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json"; if(token.length > 0 && dynamicId > 0){ - var request = 'token='+token+'&view=template&id='+dynamicId; + var request = 'token='+token+'&view=custom_admin_view&id='+dynamicId; } return jQuery.ajax({ type: 'GET', @@ -437,10 +438,10 @@ function getDynamicValues(id){ }); } }) -} - +} + function getLayoutDetails_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.layoutDetails&format=json"; + var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json"; if(token.length > 0 && id > 0){ var request = 'token='+token+'&id='+id; } @@ -463,8 +464,8 @@ function getLayoutDetails(id){ }); } }) -} - +} + function getTemplateDetails_server(id){ var getUrl = "index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json"; if(token.length > 0 && id > 0){ @@ -489,30 +490,4 @@ function getTemplateDetails(id){ }); } }) -} - -function getDynamicFormDetails_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.dynamicFormDetails&format=json"; - if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id; - } - return jQuery.ajax({ - type: 'GET', - url: getUrl, - dataType: 'jsonp', - data: request, - jsonp: 'callback' - }); -} - -function getDynamicFormDetails(id){ - getTemplateDetails_server(id).done(function(result) { - if(result){ - jQuery('#details').append(result); - // make sure the code bocks are active - jQuery("code").click(function() { - jQuery(this).selText().addClass("selected"); - }); - } - }) -} +} diff --git a/admin/models/forms/custom_admin_view.xml b/admin/models/forms/custom_admin_view.xml index a94f3e9f2..213c93323 100644 --- a/admin/models/forms/custom_admin_view.xml +++ b/admin/models/forms/custom_admin_view.xml @@ -158,195 +158,6 @@ required="false" button="true" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO - - - + - - - - - - @@ -415,6 +200,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + - - diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js index 5ca7124ea..075c69a18 100644 --- a/admin/models/forms/custom_code.js +++ b/admin/models/forms/custom_code.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 82 of this MVC - @build 26th April, 2017 + @build 4th October, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.js @@ -23,43 +23,43 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvzpvzp_required = false; jform_vvvvvzqvzq_required = false; -jform_vvvvvzqvzr_required = false; -jform_vvvvvzqvzs_required = false; +jform_vvvvvzrvzr_required = false; +jform_vvvvvzrvzs_required = false; +jform_vvvvvzrvzt_required = false; // Initial Script jQuery(document).ready(function() { - var target_vvvvvzp = jQuery("#jform_target input[type='radio']:checked").val(); - vvvvvzp(target_vvvvvzp); - var target_vvvvvzq = jQuery("#jform_target input[type='radio']:checked").val(); vvvvvzq(target_vvvvvzq); var target_vvvvvzr = jQuery("#jform_target input[type='radio']:checked").val(); - var type_vvvvvzr = jQuery("#jform_type input[type='radio']:checked").val(); - vvvvvzr(target_vvvvvzr,type_vvvvvzr); + vvvvvzr(target_vvvvvzr); - var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val(); var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val(); - vvvvvzs(type_vvvvvzs,target_vvvvvzs); + var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val(); + vvvvvzs(target_vvvvvzs,type_vvvvvzs); + + var type_vvvvvzt = jQuery("#jform_type input[type='radio']:checked").val(); + var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val(); + vvvvvzt(type_vvvvvzt,target_vvvvvzt); }); -// the vvvvvzp function -function vvvvvzp(target_vvvvvzp) +// the vvvvvzq function +function vvvvvzq(target_vvvvvzq) { // set the function logic - if (target_vvvvvzp == 2) + if (target_vvvvvzq == 2) { jQuery('#jform_function_name').closest('.control-group').show(); - if (jform_vvvvvzpvzp_required) + if (jform_vvvvvzqvzq_required) { updateFieldRequired('function_name',0); jQuery('#jform_function_name').prop('required','required'); jQuery('#jform_function_name').attr('aria-required',true); jQuery('#jform_function_name').addClass('required'); - jform_vvvvvzpvzp_required = false; + jform_vvvvvzqvzq_required = false; } jQuery('.note_jcb_placeholder').closest('.control-group').show(); @@ -68,99 +68,99 @@ function vvvvvzp(target_vvvvvzp) else { jQuery('#jform_function_name').closest('.control-group').hide(); - if (!jform_vvvvvzpvzp_required) + if (!jform_vvvvvzqvzq_required) { updateFieldRequired('function_name',1); jQuery('#jform_function_name').removeAttr('required'); jQuery('#jform_function_name').removeAttr('aria-required'); jQuery('#jform_function_name').removeClass('required'); - jform_vvvvvzpvzp_required = true; + jform_vvvvvzqvzq_required = true; } jQuery('.note_jcb_placeholder').closest('.control-group').hide(); jQuery('#jform_system_name').closest('.control-group').hide(); } } -// the vvvvvzq function -function vvvvvzq(target_vvvvvzq) +// the vvvvvzr function +function vvvvvzr(target_vvvvvzr) { // set the function logic - if (target_vvvvvzq == 1) + if (target_vvvvvzr == 1) { jQuery('#jform_component').closest('.control-group').show(); - if (jform_vvvvvzqvzq_required) + if (jform_vvvvvzrvzr_required) { updateFieldRequired('component',0); jQuery('#jform_component').prop('required','required'); jQuery('#jform_component').attr('aria-required',true); jQuery('#jform_component').addClass('required'); - jform_vvvvvzqvzq_required = false; + jform_vvvvvzrvzr_required = false; } jQuery('#jform_path').closest('.control-group').show(); - if (jform_vvvvvzqvzr_required) + if (jform_vvvvvzrvzs_required) { updateFieldRequired('path',0); jQuery('#jform_path').prop('required','required'); jQuery('#jform_path').attr('aria-required',true); jQuery('#jform_path').addClass('required'); - jform_vvvvvzqvzr_required = false; + jform_vvvvvzrvzs_required = false; } jQuery('#jform_from_line').closest('.control-group').show(); jQuery('#jform_hashtarget').closest('.control-group').show(); jQuery('#jform_to_line').closest('.control-group').show(); jQuery('#jform_type').closest('.control-group').show(); - if (jform_vvvvvzqvzs_required) + if (jform_vvvvvzrvzt_required) { updateFieldRequired('type',0); jQuery('#jform_type').prop('required','required'); jQuery('#jform_type').attr('aria-required',true); jQuery('#jform_type').addClass('required'); - jform_vvvvvzqvzs_required = false; + jform_vvvvvzrvzt_required = false; } } else { jQuery('#jform_component').closest('.control-group').hide(); - if (!jform_vvvvvzqvzq_required) + if (!jform_vvvvvzrvzr_required) { updateFieldRequired('component',1); jQuery('#jform_component').removeAttr('required'); jQuery('#jform_component').removeAttr('aria-required'); jQuery('#jform_component').removeClass('required'); - jform_vvvvvzqvzq_required = true; + jform_vvvvvzrvzr_required = true; } jQuery('#jform_path').closest('.control-group').hide(); - if (!jform_vvvvvzqvzr_required) + if (!jform_vvvvvzrvzs_required) { updateFieldRequired('path',1); jQuery('#jform_path').removeAttr('required'); jQuery('#jform_path').removeAttr('aria-required'); jQuery('#jform_path').removeClass('required'); - jform_vvvvvzqvzr_required = true; + jform_vvvvvzrvzs_required = true; } jQuery('#jform_from_line').closest('.control-group').hide(); jQuery('#jform_hashtarget').closest('.control-group').hide(); jQuery('#jform_to_line').closest('.control-group').hide(); jQuery('#jform_type').closest('.control-group').hide(); - if (!jform_vvvvvzqvzs_required) + if (!jform_vvvvvzrvzt_required) { updateFieldRequired('type',1); jQuery('#jform_type').removeAttr('required'); jQuery('#jform_type').removeAttr('aria-required'); jQuery('#jform_type').removeClass('required'); - jform_vvvvvzqvzs_required = true; + jform_vvvvvzrvzt_required = true; } } } -// the vvvvvzr function -function vvvvvzr(target_vvvvvzr,type_vvvvvzr) +// the vvvvvzs function +function vvvvvzs(target_vvvvvzs,type_vvvvvzs) { // set the function logic - if (target_vvvvvzr == 1 && type_vvvvvzr == 1) + if (target_vvvvvzs == 1 && type_vvvvvzs == 1) { jQuery('#jform_hashendtarget').closest('.control-group').show(); jQuery('#jform_to_line').closest('.control-group').show(); @@ -172,11 +172,11 @@ function vvvvvzr(target_vvvvvzr,type_vvvvvzr) } } -// the vvvvvzs function -function vvvvvzs(type_vvvvvzs,target_vvvvvzs) +// the vvvvvzt function +function vvvvvzt(type_vvvvvzt,target_vvvvvzt) { // set the function logic - if (type_vvvvvzs == 1 && target_vvvvvzs == 1) + if (type_vvvvvzt == 1 && target_vvvvvzt == 1) { jQuery('#jform_hashendtarget').closest('.control-group').show(); jQuery('#jform_to_line').closest('.control-group').show(); diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js index 720dd84db..b85744982 100644 --- a/admin/models/forms/dynamic_get.js +++ b/admin/models/forms/dynamic_get.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 84 of this MVC - @build 4th May, 2017 + @version @update number 94 of this MVC + @build 27th September, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.js @@ -23,33 +23,30 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvytvyx_required = false; jform_vvvvvyuvyy_required = false; jform_vvvvvyvvyz_required = false; jform_vvvvvywvza_required = false; jform_vvvvvyxvzb_required = false; jform_vvvvvyyvzc_required = false; -jform_vvvvvzdvzd_required = false; -jform_vvvvvzfvze_required = false; +jform_vvvvvyzvzd_required = false; +jform_vvvvvzevze_required = false; jform_vvvvvzgvzf_required = false; -jform_vvvvvzivzg_required = false; -jform_vvvvvzivzh_required = false; +jform_vvvvvzhvzg_required = false; +jform_vvvvvzjvzh_required = false; jform_vvvvvzjvzi_required = false; jform_vvvvvzkvzj_required = false; jform_vvvvvzlvzk_required = false; -jform_vvvvvznvzl_required = false; -jform_vvvvvznvzm_required = false; -jform_vvvvvznvzn_required = false; +jform_vvvvvzmvzl_required = false; +jform_vvvvvzovzm_required = false; +jform_vvvvvzovzn_required = false; jform_vvvvvzovzo_required = false; +jform_vvvvvzpvzp_required = false; // Initial Script jQuery(document).ready(function() { - var gettype_vvvvvyt = jQuery("#jform_gettype").val(); - vvvvvyt(gettype_vvvvvyt); - - var main_source_vvvvvyu = jQuery("#jform_main_source").val(); - vvvvvyu(main_source_vvvvvyu); + var gettype_vvvvvyu = jQuery("#jform_gettype").val(); + vvvvvyu(gettype_vvvvvyu); var main_source_vvvvvyv = jQuery("#jform_main_source").val(); vvvvvyv(main_source_vvvvvyv); @@ -60,157 +57,105 @@ jQuery(document).ready(function() var main_source_vvvvvyx = jQuery("#jform_main_source").val(); vvvvvyx(main_source_vvvvvyx); - var addcalculation_vvvvvyy = jQuery("#jform_addcalculation input[type='radio']:checked").val(); - vvvvvyy(addcalculation_vvvvvyy); + var main_source_vvvvvyy = jQuery("#jform_main_source").val(); + vvvvvyy(main_source_vvvvvyy); var addcalculation_vvvvvyz = jQuery("#jform_addcalculation input[type='radio']:checked").val(); - var gettype_vvvvvyz = jQuery("#jform_gettype").val(); - vvvvvyz(addcalculation_vvvvvyz,gettype_vvvvvyz); + vvvvvyz(addcalculation_vvvvvyz); var addcalculation_vvvvvza = jQuery("#jform_addcalculation input[type='radio']:checked").val(); var gettype_vvvvvza = jQuery("#jform_gettype").val(); vvvvvza(addcalculation_vvvvvza,gettype_vvvvvza); - var main_source_vvvvvzd = jQuery("#jform_main_source").val(); - vvvvvzd(main_source_vvvvvzd); + var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val(); + var gettype_vvvvvzb = jQuery("#jform_gettype").val(); + vvvvvzb(addcalculation_vvvvvzb,gettype_vvvvvzb); var main_source_vvvvvze = jQuery("#jform_main_source").val(); vvvvvze(main_source_vvvvvze); - var add_php_before_getitem_vvvvvzf = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val(); - var gettype_vvvvvzf = jQuery("#jform_gettype").val(); - vvvvvzf(add_php_before_getitem_vvvvvzf,gettype_vvvvvzf); + var main_source_vvvvvzf = jQuery("#jform_main_source").val(); + vvvvvzf(main_source_vvvvvzf); - var add_php_after_getitem_vvvvvzg = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val(); + var add_php_before_getitem_vvvvvzg = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val(); var gettype_vvvvvzg = jQuery("#jform_gettype").val(); - vvvvvzg(add_php_after_getitem_vvvvvzg,gettype_vvvvvzg); + vvvvvzg(add_php_before_getitem_vvvvvzg,gettype_vvvvvzg); - var gettype_vvvvvzi = jQuery("#jform_gettype").val(); - vvvvvzi(gettype_vvvvvzi); + var add_php_after_getitem_vvvvvzh = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val(); + var gettype_vvvvvzh = jQuery("#jform_gettype").val(); + vvvvvzh(add_php_after_getitem_vvvvvzh,gettype_vvvvvzh); - var add_php_getlistquery_vvvvvzj = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); var gettype_vvvvvzj = jQuery("#jform_gettype").val(); - vvvvvzj(add_php_getlistquery_vvvvvzj,gettype_vvvvvzj); + vvvvvzj(gettype_vvvvvzj); - var add_php_before_getitems_vvvvvzk = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val(); + var add_php_getlistquery_vvvvvzk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); var gettype_vvvvvzk = jQuery("#jform_gettype").val(); - vvvvvzk(add_php_before_getitems_vvvvvzk,gettype_vvvvvzk); + vvvvvzk(add_php_getlistquery_vvvvvzk,gettype_vvvvvzk); - var add_php_after_getitems_vvvvvzl = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val(); + var add_php_before_getitems_vvvvvzl = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val(); var gettype_vvvvvzl = jQuery("#jform_gettype").val(); - vvvvvzl(add_php_after_getitems_vvvvvzl,gettype_vvvvvzl); + vvvvvzl(add_php_before_getitems_vvvvvzl,gettype_vvvvvzl); - var gettype_vvvvvzn = jQuery("#jform_gettype").val(); - vvvvvzn(gettype_vvvvvzn); + var add_php_after_getitems_vvvvvzm = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val(); + var gettype_vvvvvzm = jQuery("#jform_gettype").val(); + vvvvvzm(add_php_after_getitems_vvvvvzm,gettype_vvvvvzm); var gettype_vvvvvzo = jQuery("#jform_gettype").val(); vvvvvzo(gettype_vvvvvzo); + + var gettype_vvvvvzp = jQuery("#jform_gettype").val(); + vvvvvzp(gettype_vvvvvzp); }); -// the vvvvvyt function -function vvvvvyt(gettype_vvvvvyt) +// the vvvvvyu function +function vvvvvyu(gettype_vvvvvyu) { - if (isSet(gettype_vvvvvyt) && gettype_vvvvvyt.constructor !== Array) + if (isSet(gettype_vvvvvyu) && gettype_vvvvvyu.constructor !== Array) { - var temp_vvvvvyt = gettype_vvvvvyt; - var gettype_vvvvvyt = []; - gettype_vvvvvyt.push(temp_vvvvvyt); + var temp_vvvvvyu = gettype_vvvvvyu; + var gettype_vvvvvyu = []; + gettype_vvvvvyu.push(temp_vvvvvyu); } - else if (!isSet(gettype_vvvvvyt)) + else if (!isSet(gettype_vvvvvyu)) { - var gettype_vvvvvyt = []; + var gettype_vvvvvyu = []; } - var gettype = gettype_vvvvvyt.some(gettype_vvvvvyt_SomeFunc); + var gettype = gettype_vvvvvyu.some(gettype_vvvvvyu_SomeFunc); // set this function logic if (gettype) { jQuery('#jform_getcustom').closest('.control-group').show(); - if (jform_vvvvvytvyx_required) + if (jform_vvvvvyuvyy_required) { updateFieldRequired('getcustom',0); jQuery('#jform_getcustom').prop('required','required'); jQuery('#jform_getcustom').attr('aria-required',true); jQuery('#jform_getcustom').addClass('required'); - jform_vvvvvytvyx_required = false; - } - - } - else - { - jQuery('#jform_getcustom').closest('.control-group').hide(); - if (!jform_vvvvvytvyx_required) - { - updateFieldRequired('getcustom',1); - jQuery('#jform_getcustom').removeAttr('required'); - jQuery('#jform_getcustom').removeAttr('aria-required'); - jQuery('#jform_getcustom').removeClass('required'); - jform_vvvvvytvyx_required = true; - } - } -} - -// the vvvvvyt Some function -function gettype_vvvvvyt_SomeFunc(gettype_vvvvvyt) -{ - // set the function logic - if (gettype_vvvvvyt == 3 || gettype_vvvvvyt == 4) - { - return true; - } - return false; -} - -// the vvvvvyu function -function vvvvvyu(main_source_vvvvvyu) -{ - if (isSet(main_source_vvvvvyu) && main_source_vvvvvyu.constructor !== Array) - { - var temp_vvvvvyu = main_source_vvvvvyu; - var main_source_vvvvvyu = []; - main_source_vvvvvyu.push(temp_vvvvvyu); - } - else if (!isSet(main_source_vvvvvyu)) - { - var main_source_vvvvvyu = []; - } - var main_source = main_source_vvvvvyu.some(main_source_vvvvvyu_SomeFunc); - - - // set this function logic - if (main_source) - { - jQuery('#jform_view_table_main').closest('.control-group').show(); - if (jform_vvvvvyuvyy_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_vvvvvyuvyy_required = false; } } else { - jQuery('#jform_view_table_main').closest('.control-group').hide(); + jQuery('#jform_getcustom').closest('.control-group').hide(); if (!jform_vvvvvyuvyy_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'); + updateFieldRequired('getcustom',1); + jQuery('#jform_getcustom').removeAttr('required'); + jQuery('#jform_getcustom').removeAttr('aria-required'); + jQuery('#jform_getcustom').removeClass('required'); jform_vvvvvyuvyy_required = true; } } } // the vvvvvyu Some function -function main_source_vvvvvyu_SomeFunc(main_source_vvvvvyu) +function gettype_vvvvvyu_SomeFunc(gettype_vvvvvyu) { // set the function logic - if (main_source_vvvvvyu == 1) + if (gettype_vvvvvyu == 3 || gettype_vvvvvyu == 4) { return true; } @@ -236,26 +181,26 @@ function vvvvvyv(main_source_vvvvvyv) // set this function logic if (main_source) { - jQuery('#jform_view_selection').closest('.control-group').show(); + jQuery('#jform_view_table_main').closest('.control-group').show(); if (jform_vvvvvyvvyz_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'); + 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_vvvvvyvvyz_required = false; } } else { - jQuery('#jform_view_selection').closest('.control-group').hide(); + jQuery('#jform_view_table_main').closest('.control-group').hide(); if (!jform_vvvvvyvvyz_required) { - updateFieldRequired('view_selection',1); - jQuery('#jform_view_selection').removeAttr('required'); - jQuery('#jform_view_selection').removeAttr('aria-required'); - jQuery('#jform_view_selection').removeClass('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_vvvvvyvvyz_required = true; } } @@ -291,26 +236,26 @@ function vvvvvyw(main_source_vvvvvyw) // set this function logic if (main_source) { - jQuery('#jform_db_table_main').closest('.control-group').show(); + jQuery('#jform_view_selection').closest('.control-group').show(); if (jform_vvvvvywvza_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'); + 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_vvvvvywvza_required = false; } } else { - jQuery('#jform_db_table_main').closest('.control-group').hide(); + jQuery('#jform_view_selection').closest('.control-group').hide(); if (!jform_vvvvvywvza_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'); + updateFieldRequired('view_selection',1); + jQuery('#jform_view_selection').removeAttr('required'); + jQuery('#jform_view_selection').removeAttr('aria-required'); + jQuery('#jform_view_selection').removeClass('required'); jform_vvvvvywvza_required = true; } } @@ -320,7 +265,7 @@ function vvvvvyw(main_source_vvvvvyw) function main_source_vvvvvyw_SomeFunc(main_source_vvvvvyw) { // set the function logic - if (main_source_vvvvvyw == 2) + if (main_source_vvvvvyw == 1) { return true; } @@ -346,26 +291,26 @@ function vvvvvyx(main_source_vvvvvyx) // set this function logic if (main_source) { - jQuery('#jform_db_selection').closest('.control-group').show(); + jQuery('#jform_db_table_main').closest('.control-group').show(); if (jform_vvvvvyxvzb_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'); + 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_vvvvvyxvzb_required = false; } } else { - jQuery('#jform_db_selection').closest('.control-group').hide(); + jQuery('#jform_db_table_main').closest('.control-group').hide(); if (!jform_vvvvvyxvzb_required) { - updateFieldRequired('db_selection',1); - jQuery('#jform_db_selection').removeAttr('required'); - jQuery('#jform_db_selection').removeAttr('aria-required'); - jQuery('#jform_db_selection').removeClass('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_vvvvvyxvzb_required = true; } } @@ -383,95 +328,89 @@ function main_source_vvvvvyx_SomeFunc(main_source_vvvvvyx) } // the vvvvvyy function -function vvvvvyy(addcalculation_vvvvvyy) +function vvvvvyy(main_source_vvvvvyy) { - // set the function logic - if (addcalculation_vvvvvyy == 1) + if (isSet(main_source_vvvvvyy) && main_source_vvvvvyy.constructor !== Array) { - jQuery('#jform_php_calculation').closest('.control-group').show(); + var temp_vvvvvyy = main_source_vvvvvyy; + var main_source_vvvvvyy = []; + main_source_vvvvvyy.push(temp_vvvvvyy); + } + else if (!isSet(main_source_vvvvvyy)) + { + var main_source_vvvvvyy = []; + } + var main_source = main_source_vvvvvyy.some(main_source_vvvvvyy_SomeFunc); + + + // set this function logic + if (main_source) + { + jQuery('#jform_db_selection').closest('.control-group').show(); if (jform_vvvvvyyvzc_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'); + 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_vvvvvyyvzc_required = false; } } else { - jQuery('#jform_php_calculation').closest('.control-group').hide(); + jQuery('#jform_db_selection').closest('.control-group').hide(); if (!jform_vvvvvyyvzc_required) { - updateFieldRequired('php_calculation',1); - jQuery('#jform_php_calculation').removeAttr('required'); - jQuery('#jform_php_calculation').removeAttr('aria-required'); - jQuery('#jform_php_calculation').removeClass('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_vvvvvyyvzc_required = true; } } } -// the vvvvvyz function -function vvvvvyz(addcalculation_vvvvvyz,gettype_vvvvvyz) +// the vvvvvyy Some function +function main_source_vvvvvyy_SomeFunc(main_source_vvvvvyy) { - if (isSet(addcalculation_vvvvvyz) && addcalculation_vvvvvyz.constructor !== Array) + // set the function logic + if (main_source_vvvvvyy == 2) { - var temp_vvvvvyz = addcalculation_vvvvvyz; - var addcalculation_vvvvvyz = []; - addcalculation_vvvvvyz.push(temp_vvvvvyz); - } - else if (!isSet(addcalculation_vvvvvyz)) - { - var addcalculation_vvvvvyz = []; - } - 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 (addcalculation && gettype) - { - jQuery('.note_calculation_item').closest('.control-group').show(); - } - else - { - jQuery('.note_calculation_item').closest('.control-group').hide(); + return true; } + return false; } -// the vvvvvyz Some function -function addcalculation_vvvvvyz_SomeFunc(addcalculation_vvvvvyz) +// the vvvvvyz function +function vvvvvyz(addcalculation_vvvvvyz) { // set the function logic if (addcalculation_vvvvvyz == 1) { - return true; - } - return false; -} + jQuery('#jform_php_calculation').closest('.control-group').show(); + if (jform_vvvvvyzvzd_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_vvvvvyzvzd_required = false; + } -// the vvvvvyz Some function -function gettype_vvvvvyz_SomeFunc(gettype_vvvvvyz) -{ - // set the function logic - if (gettype_vvvvvyz == 1 || gettype_vvvvvyz == 3) - { - return true; } - return false; + else + { + jQuery('#jform_php_calculation').closest('.control-group').hide(); + if (!jform_vvvvvyzvzd_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_vvvvvyzvzd_required = true; + } + } } // the vvvvvza function @@ -505,11 +444,11 @@ function vvvvvza(addcalculation_vvvvvza,gettype_vvvvvza) // 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_vvvvvza_SomeFunc(addcalculation_vvvvvza) function gettype_vvvvvza_SomeFunc(gettype_vvvvvza) { // set the function logic - if (gettype_vvvvvza == 2 || gettype_vvvvvza == 4) + if (gettype_vvvvvza == 1 || gettype_vvvvvza == 3) { return true; } return false; } -// the vvvvvzd function -function vvvvvzd(main_source_vvvvvzd) +// the vvvvvzb function +function vvvvvzb(addcalculation_vvvvvzb,gettype_vvvvvzb) { - if (isSet(main_source_vvvvvzd) && main_source_vvvvvzd.constructor !== Array) + if (isSet(addcalculation_vvvvvzb) && addcalculation_vvvvvzb.constructor !== Array) { - var temp_vvvvvzd = main_source_vvvvvzd; - var main_source_vvvvvzd = []; - main_source_vvvvvzd.push(temp_vvvvvzd); + var temp_vvvvvzb = addcalculation_vvvvvzb; + var addcalculation_vvvvvzb = []; + addcalculation_vvvvvzb.push(temp_vvvvvzb); } - else if (!isSet(main_source_vvvvvzd)) + else if (!isSet(addcalculation_vvvvvzb)) { - var main_source_vvvvvzd = []; + var addcalculation_vvvvvzb = []; } - var main_source = main_source_vvvvvzd.some(main_source_vvvvvzd_SomeFunc); + var addcalculation = addcalculation_vvvvvzb.some(addcalculation_vvvvvzb_SomeFunc); + + if (isSet(gettype_vvvvvzb) && gettype_vvvvvzb.constructor !== Array) + { + var temp_vvvvvzb = gettype_vvvvvzb; + var gettype_vvvvvzb = []; + gettype_vvvvvzb.push(temp_vvvvvzb); + } + else if (!isSet(gettype_vvvvvzb)) + { + var gettype_vvvvvzb = []; + } + var gettype = gettype_vvvvvzb.some(gettype_vvvvvzb_SomeFunc); // set this function logic - if (main_source) + if (addcalculation && gettype) { - jQuery('#jform_php_custom_get').closest('.control-group').show(); - if (jform_vvvvvzdvzd_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_vvvvvzdvzd_required = false; - } - + jQuery('.note_calculation_items').closest('.control-group').show(); } else { - jQuery('#jform_php_custom_get').closest('.control-group').hide(); - if (!jform_vvvvvzdvzd_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_vvvvvzdvzd_required = true; - } + jQuery('.note_calculation_items').closest('.control-group').hide(); } } -// the vvvvvzd Some function -function main_source_vvvvvzd_SomeFunc(main_source_vvvvvzd) +// the vvvvvzb Some function +function addcalculation_vvvvvzb_SomeFunc(addcalculation_vvvvvzb) { // set the function logic - if (main_source_vvvvvzd == 3) + if (addcalculation_vvvvvzb == 1) + { + return true; + } + return false; +} + +// the vvvvvzb Some function +function gettype_vvvvvzb_SomeFunc(gettype_vvvvvzb) +{ + // set the function logic + if (gettype_vvvvvzb == 2 || gettype_vvvvvzb == 4) { return true; } @@ -609,19 +554,28 @@ function vvvvvze(main_source_vvvvvze) // set this function logic if (main_source) { - jQuery('#jform_filter').closest('.control-group').show(); - jQuery('#jform_global').closest('.control-group').show(); - jQuery('#jform_where').closest('.control-group').show(); - jQuery('#jform_join_db_table').closest('.control-group').show(); - jQuery('#jform_join_view_table').closest('.control-group').show(); + jQuery('#jform_php_custom_get').closest('.control-group').show(); + if (jform_vvvvvzevze_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_vvvvvzevze_required = false; + } + } else { - jQuery('#jform_filter').closest('.control-group').hide(); - jQuery('#jform_global').closest('.control-group').hide(); - jQuery('#jform_where').closest('.control-group').hide(); - jQuery('#jform_join_db_table').closest('.control-group').hide(); - jQuery('#jform_join_view_table').closest('.control-group').hide(); + jQuery('#jform_php_custom_get').closest('.control-group').hide(); + if (!jform_vvvvvzevze_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_vvvvvzevze_required = true; + } } } @@ -629,7 +583,7 @@ function vvvvvze(main_source_vvvvvze) function main_source_vvvvvze_SomeFunc(main_source_vvvvvze) { // set the function logic - if (main_source_vvvvvze == 1 || main_source_vvvvvze == 2) + if (main_source_vvvvvze == 3) { return true; } @@ -637,77 +591,47 @@ function main_source_vvvvvze_SomeFunc(main_source_vvvvvze) } // the vvvvvzf function -function vvvvvzf(add_php_before_getitem_vvvvvzf,gettype_vvvvvzf) +function vvvvvzf(main_source_vvvvvzf) { - if (isSet(add_php_before_getitem_vvvvvzf) && add_php_before_getitem_vvvvvzf.constructor !== Array) + if (isSet(main_source_vvvvvzf) && main_source_vvvvvzf.constructor !== Array) { - var temp_vvvvvzf = add_php_before_getitem_vvvvvzf; - var add_php_before_getitem_vvvvvzf = []; - add_php_before_getitem_vvvvvzf.push(temp_vvvvvzf); + var temp_vvvvvzf = main_source_vvvvvzf; + var main_source_vvvvvzf = []; + main_source_vvvvvzf.push(temp_vvvvvzf); } - else if (!isSet(add_php_before_getitem_vvvvvzf)) + else if (!isSet(main_source_vvvvvzf)) { - var add_php_before_getitem_vvvvvzf = []; + var main_source_vvvvvzf = []; } - var add_php_before_getitem = add_php_before_getitem_vvvvvzf.some(add_php_before_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); + var main_source = main_source_vvvvvzf.some(main_source_vvvvvzf_SomeFunc); // set this function logic - if (add_php_before_getitem && gettype) + if (main_source) { - jQuery('#jform_php_before_getitem').closest('.control-group').show(); - if (jform_vvvvvzfvze_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_vvvvvzfvze_required = false; - } - + jQuery('#jform_filter-lbl').closest('.control-group').show(); + jQuery('#jform_global-lbl').closest('.control-group').show(); + jQuery('#jform_order-lbl').closest('.control-group').show(); + jQuery('#jform_where-lbl').closest('.control-group').show(); + jQuery('#jform_join_db_table-lbl').closest('.control-group').show(); + jQuery('#jform_join_view_table-lbl').closest('.control-group').show(); } else { - jQuery('#jform_php_before_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzfvze_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_vvvvvzfvze_required = true; - } + jQuery('#jform_filter-lbl').closest('.control-group').hide(); + jQuery('#jform_global-lbl').closest('.control-group').hide(); + jQuery('#jform_order-lbl').closest('.control-group').hide(); + jQuery('#jform_where-lbl').closest('.control-group').hide(); + jQuery('#jform_join_db_table-lbl').closest('.control-group').hide(); + jQuery('#jform_join_view_table-lbl').closest('.control-group').hide(); } } // the vvvvvzf Some function -function add_php_before_getitem_vvvvvzf_SomeFunc(add_php_before_getitem_vvvvvzf) +function main_source_vvvvvzf_SomeFunc(main_source_vvvvvzf) { // set the function logic - if (add_php_before_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) + if (main_source_vvvvvzf == 1 || main_source_vvvvvzf == 2) { return true; } @@ -715,19 +639,19 @@ function gettype_vvvvvzf_SomeFunc(gettype_vvvvvzf) } // the vvvvvzg function -function vvvvvzg(add_php_after_getitem_vvvvvzg,gettype_vvvvvzg) +function vvvvvzg(add_php_before_getitem_vvvvvzg,gettype_vvvvvzg) { - if (isSet(add_php_after_getitem_vvvvvzg) && add_php_after_getitem_vvvvvzg.constructor !== Array) + if (isSet(add_php_before_getitem_vvvvvzg) && add_php_before_getitem_vvvvvzg.constructor !== Array) { - var temp_vvvvvzg = add_php_after_getitem_vvvvvzg; - var add_php_after_getitem_vvvvvzg = []; - add_php_after_getitem_vvvvvzg.push(temp_vvvvvzg); + var temp_vvvvvzg = add_php_before_getitem_vvvvvzg; + var add_php_before_getitem_vvvvvzg = []; + add_php_before_getitem_vvvvvzg.push(temp_vvvvvzg); } - else if (!isSet(add_php_after_getitem_vvvvvzg)) + else if (!isSet(add_php_before_getitem_vvvvvzg)) { - var add_php_after_getitem_vvvvvzg = []; + var add_php_before_getitem_vvvvvzg = []; } - var add_php_after_getitem = add_php_after_getitem_vvvvvzg.some(add_php_after_getitem_vvvvvzg_SomeFunc); + var add_php_before_getitem = add_php_before_getitem_vvvvvzg.some(add_php_before_getitem_vvvvvzg_SomeFunc); if (isSet(gettype_vvvvvzg) && gettype_vvvvvzg.constructor !== Array) { @@ -743,38 +667,38 @@ function vvvvvzg(add_php_after_getitem_vvvvvzg,gettype_vvvvvzg) // 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(); + jQuery('#jform_php_before_getitem').closest('.control-group').show(); if (jform_vvvvvzgvzf_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'); + 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_vvvvvzgvzf_required = false; } } else { - jQuery('#jform_php_after_getitem').closest('.control-group').hide(); + jQuery('#jform_php_before_getitem').closest('.control-group').hide(); if (!jform_vvvvvzgvzf_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'); + 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_vvvvvzgvzf_required = true; } } } // the vvvvvzg Some function -function add_php_after_getitem_vvvvvzg_SomeFunc(add_php_after_getitem_vvvvvzg) +function add_php_before_getitem_vvvvvzg_SomeFunc(add_php_before_getitem_vvvvvzg) { // set the function logic - if (add_php_after_getitem_vvvvvzg == 1) + if (add_php_before_getitem_vvvvvzg == 1) { return true; } @@ -792,74 +716,78 @@ function gettype_vvvvvzg_SomeFunc(gettype_vvvvvzg) return false; } -// the vvvvvzi function -function vvvvvzi(gettype_vvvvvzi) +// the vvvvvzh function +function vvvvvzh(add_php_after_getitem_vvvvvzh,gettype_vvvvvzh) { - if (isSet(gettype_vvvvvzi) && gettype_vvvvvzi.constructor !== Array) + if (isSet(add_php_after_getitem_vvvvvzh) && add_php_after_getitem_vvvvvzh.constructor !== Array) { - var temp_vvvvvzi = gettype_vvvvvzi; - var gettype_vvvvvzi = []; - gettype_vvvvvzi.push(temp_vvvvvzi); + var temp_vvvvvzh = add_php_after_getitem_vvvvvzh; + var add_php_after_getitem_vvvvvzh = []; + add_php_after_getitem_vvvvvzh.push(temp_vvvvvzh); } - else if (!isSet(gettype_vvvvvzi)) + else if (!isSet(add_php_after_getitem_vvvvvzh)) { - var gettype_vvvvvzi = []; + var add_php_after_getitem_vvvvvzh = []; } - var gettype = gettype_vvvvvzi.some(gettype_vvvvvzi_SomeFunc); + var add_php_after_getitem = add_php_after_getitem_vvvvvzh.some(add_php_after_getitem_vvvvvzh_SomeFunc); + + if (isSet(gettype_vvvvvzh) && gettype_vvvvvzh.constructor !== Array) + { + var temp_vvvvvzh = gettype_vvvvvzh; + var gettype_vvvvvzh = []; + gettype_vvvvvzh.push(temp_vvvvvzh); + } + else if (!isSet(gettype_vvvvvzh)) + { + var gettype_vvvvvzh = []; + } + var gettype = gettype_vvvvvzh.some(gettype_vvvvvzh_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_vvvvvzivzg_required) + jQuery('#jform_php_after_getitem').closest('.control-group').show(); + if (jform_vvvvvzhvzg_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_vvvvvzivzg_required = false; - } - - jQuery('#jform_add_php_before_getitem').closest('.control-group').show(); - if (jform_vvvvvzivzh_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_vvvvvzivzh_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_vvvvvzhvzg_required = false; } } else { - jQuery('#jform_add_php_after_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzivzg_required) + jQuery('#jform_php_after_getitem').closest('.control-group').hide(); + if (!jform_vvvvvzhvzg_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_vvvvvzivzg_required = true; - } - jQuery('#jform_add_php_before_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzivzh_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_vvvvvzivzh_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_vvvvvzhvzg_required = true; } } } -// the vvvvvzi Some function -function gettype_vvvvvzi_SomeFunc(gettype_vvvvvzi) +// the vvvvvzh Some function +function add_php_after_getitem_vvvvvzh_SomeFunc(add_php_after_getitem_vvvvvzh) { // set the function logic - if (gettype_vvvvvzi == 1 || gettype_vvvvvzi == 3) + if (add_php_after_getitem_vvvvvzh == 1) + { + return true; + } + return false; +} + +// the vvvvvzh Some function +function gettype_vvvvvzh_SomeFunc(gettype_vvvvvzh) +{ + // set the function logic + if (gettype_vvvvvzh == 1 || gettype_vvvvvzh == 3) { return true; } @@ -867,20 +795,8 @@ function gettype_vvvvvzi_SomeFunc(gettype_vvvvvzi) } // the vvvvvzj function -function vvvvvzj(add_php_getlistquery_vvvvvzj,gettype_vvvvvzj) +function vvvvvzj(gettype_vvvvvzj) { - if (isSet(add_php_getlistquery_vvvvvzj) && add_php_getlistquery_vvvvvzj.constructor !== Array) - { - var temp_vvvvvzj = add_php_getlistquery_vvvvvzj; - var add_php_getlistquery_vvvvvzj = []; - add_php_getlistquery_vvvvvzj.push(temp_vvvvvzj); - } - else if (!isSet(add_php_getlistquery_vvvvvzj)) - { - var add_php_getlistquery_vvvvvzj = []; - } - var add_php_getlistquery = add_php_getlistquery_vvvvvzj.some(add_php_getlistquery_vvvvvzj_SomeFunc); - if (isSet(gettype_vvvvvzj) && gettype_vvvvvzj.constructor !== Array) { var temp_vvvvvzj = gettype_vvvvvzj; @@ -895,49 +811,57 @@ function vvvvvzj(add_php_getlistquery_vvvvvzj,gettype_vvvvvzj) // 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_vvvvvzjvzh_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_vvvvvzjvzh_required = false; + } + + jQuery('#jform_add_php_before_getitem').closest('.control-group').show(); if (jform_vvvvvzjvzi_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_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_vvvvvzjvzi_required = false; } } else { - jQuery('#jform_php_getlistquery').closest('.control-group').hide(); + jQuery('#jform_add_php_after_getitem').closest('.control-group').hide(); + if (!jform_vvvvvzjvzh_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_vvvvvzjvzh_required = true; + } + jQuery('#jform_add_php_before_getitem').closest('.control-group').hide(); if (!jform_vvvvvzjvzi_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_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_vvvvvzjvzi_required = true; } } } -// the vvvvvzj Some function -function add_php_getlistquery_vvvvvzj_SomeFunc(add_php_getlistquery_vvvvvzj) -{ - // set the function logic - if (add_php_getlistquery_vvvvvzj == 1) - { - return true; - } - return false; -} - // the vvvvvzj Some function function gettype_vvvvvzj_SomeFunc(gettype_vvvvvzj) { // set the function logic - if (gettype_vvvvvzj == 2 || gettype_vvvvvzj == 4) + if (gettype_vvvvvzj == 1 || gettype_vvvvvzj == 3) { return true; } @@ -945,19 +869,19 @@ function gettype_vvvvvzj_SomeFunc(gettype_vvvvvzj) } // the vvvvvzk function -function vvvvvzk(add_php_before_getitems_vvvvvzk,gettype_vvvvvzk) +function vvvvvzk(add_php_getlistquery_vvvvvzk,gettype_vvvvvzk) { - if (isSet(add_php_before_getitems_vvvvvzk) && add_php_before_getitems_vvvvvzk.constructor !== Array) + if (isSet(add_php_getlistquery_vvvvvzk) && add_php_getlistquery_vvvvvzk.constructor !== Array) { - var temp_vvvvvzk = add_php_before_getitems_vvvvvzk; - var add_php_before_getitems_vvvvvzk = []; - add_php_before_getitems_vvvvvzk.push(temp_vvvvvzk); + var temp_vvvvvzk = add_php_getlistquery_vvvvvzk; + var add_php_getlistquery_vvvvvzk = []; + add_php_getlistquery_vvvvvzk.push(temp_vvvvvzk); } - else if (!isSet(add_php_before_getitems_vvvvvzk)) + else if (!isSet(add_php_getlistquery_vvvvvzk)) { - var add_php_before_getitems_vvvvvzk = []; + var add_php_getlistquery_vvvvvzk = []; } - var add_php_before_getitems = add_php_before_getitems_vvvvvzk.some(add_php_before_getitems_vvvvvzk_SomeFunc); + var add_php_getlistquery = add_php_getlistquery_vvvvvzk.some(add_php_getlistquery_vvvvvzk_SomeFunc); if (isSet(gettype_vvvvvzk) && gettype_vvvvvzk.constructor !== Array) { @@ -973,38 +897,38 @@ function vvvvvzk(add_php_before_getitems_vvvvvzk,gettype_vvvvvzk) // set this function logic - if (add_php_before_getitems && gettype) + if (add_php_getlistquery && gettype) { - jQuery('#jform_php_before_getitems').closest('.control-group').show(); + jQuery('#jform_php_getlistquery').closest('.control-group').show(); if (jform_vvvvvzkvzj_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'); + 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_vvvvvzkvzj_required = false; } } else { - jQuery('#jform_php_before_getitems').closest('.control-group').hide(); + jQuery('#jform_php_getlistquery').closest('.control-group').hide(); if (!jform_vvvvvzkvzj_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'); + updateFieldRequired('php_getlistquery',1); + jQuery('#jform_php_getlistquery').removeAttr('required'); + jQuery('#jform_php_getlistquery').removeAttr('aria-required'); + jQuery('#jform_php_getlistquery').removeClass('required'); jform_vvvvvzkvzj_required = true; } } } // the vvvvvzk Some function -function add_php_before_getitems_vvvvvzk_SomeFunc(add_php_before_getitems_vvvvvzk) +function add_php_getlistquery_vvvvvzk_SomeFunc(add_php_getlistquery_vvvvvzk) { // set the function logic - if (add_php_before_getitems_vvvvvzk == 1) + if (add_php_getlistquery_vvvvvzk == 1) { return true; } @@ -1023,19 +947,19 @@ function gettype_vvvvvzk_SomeFunc(gettype_vvvvvzk) } // the vvvvvzl function -function vvvvvzl(add_php_after_getitems_vvvvvzl,gettype_vvvvvzl) +function vvvvvzl(add_php_before_getitems_vvvvvzl,gettype_vvvvvzl) { - if (isSet(add_php_after_getitems_vvvvvzl) && add_php_after_getitems_vvvvvzl.constructor !== Array) + if (isSet(add_php_before_getitems_vvvvvzl) && add_php_before_getitems_vvvvvzl.constructor !== Array) { - var temp_vvvvvzl = add_php_after_getitems_vvvvvzl; - var add_php_after_getitems_vvvvvzl = []; - add_php_after_getitems_vvvvvzl.push(temp_vvvvvzl); + var temp_vvvvvzl = add_php_before_getitems_vvvvvzl; + var add_php_before_getitems_vvvvvzl = []; + add_php_before_getitems_vvvvvzl.push(temp_vvvvvzl); } - else if (!isSet(add_php_after_getitems_vvvvvzl)) + else if (!isSet(add_php_before_getitems_vvvvvzl)) { - var add_php_after_getitems_vvvvvzl = []; + var add_php_before_getitems_vvvvvzl = []; } - var add_php_after_getitems = add_php_after_getitems_vvvvvzl.some(add_php_after_getitems_vvvvvzl_SomeFunc); + var add_php_before_getitems = add_php_before_getitems_vvvvvzl.some(add_php_before_getitems_vvvvvzl_SomeFunc); if (isSet(gettype_vvvvvzl) && gettype_vvvvvzl.constructor !== Array) { @@ -1051,38 +975,38 @@ function vvvvvzl(add_php_after_getitems_vvvvvzl,gettype_vvvvvzl) // 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(); + jQuery('#jform_php_before_getitems').closest('.control-group').show(); if (jform_vvvvvzlvzk_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'); + 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_vvvvvzlvzk_required = false; } } else { - jQuery('#jform_php_after_getitems').closest('.control-group').hide(); + jQuery('#jform_php_before_getitems').closest('.control-group').hide(); if (!jform_vvvvvzlvzk_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'); + 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_vvvvvzlvzk_required = true; } } } // the vvvvvzl Some function -function add_php_after_getitems_vvvvvzl_SomeFunc(add_php_after_getitems_vvvvvzl) +function add_php_before_getitems_vvvvvzl_SomeFunc(add_php_before_getitems_vvvvvzl) { // set the function logic - if (add_php_after_getitems_vvvvvzl == 1) + if (add_php_before_getitems_vvvvvzl == 1) { return true; } @@ -1100,93 +1024,78 @@ function gettype_vvvvvzl_SomeFunc(gettype_vvvvvzl) return false; } -// the vvvvvzn function -function vvvvvzn(gettype_vvvvvzn) +// the vvvvvzm function +function vvvvvzm(add_php_after_getitems_vvvvvzm,gettype_vvvvvzm) { - if (isSet(gettype_vvvvvzn) && gettype_vvvvvzn.constructor !== Array) + if (isSet(add_php_after_getitems_vvvvvzm) && add_php_after_getitems_vvvvvzm.constructor !== Array) { - var temp_vvvvvzn = gettype_vvvvvzn; - var gettype_vvvvvzn = []; - gettype_vvvvvzn.push(temp_vvvvvzn); + var temp_vvvvvzm = add_php_after_getitems_vvvvvzm; + var add_php_after_getitems_vvvvvzm = []; + add_php_after_getitems_vvvvvzm.push(temp_vvvvvzm); } - else if (!isSet(gettype_vvvvvzn)) + else if (!isSet(add_php_after_getitems_vvvvvzm)) { - var gettype_vvvvvzn = []; + var add_php_after_getitems_vvvvvzm = []; } - var gettype = gettype_vvvvvzn.some(gettype_vvvvvzn_SomeFunc); + var add_php_after_getitems = add_php_after_getitems_vvvvvzm.some(add_php_after_getitems_vvvvvzm_SomeFunc); + + if (isSet(gettype_vvvvvzm) && gettype_vvvvvzm.constructor !== Array) + { + var temp_vvvvvzm = gettype_vvvvvzm; + var gettype_vvvvvzm = []; + gettype_vvvvvzm.push(temp_vvvvvzm); + } + else if (!isSet(gettype_vvvvvzm)) + { + var gettype_vvvvvzm = []; + } + var gettype = gettype_vvvvvzm.some(gettype_vvvvvzm_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_vvvvvznvzl_required) + jQuery('#jform_php_after_getitems').closest('.control-group').show(); + if (jform_vvvvvzmvzl_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_vvvvvznvzl_required = false; - } - - jQuery('#jform_add_php_before_getitems').closest('.control-group').show(); - if (jform_vvvvvznvzm_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_vvvvvznvzm_required = false; - } - - jQuery('#jform_add_php_getlistquery').closest('.control-group').show(); - if (jform_vvvvvznvzn_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_vvvvvznvzn_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_vvvvvzmvzl_required = false; } } else { - jQuery('#jform_add_php_after_getitems').closest('.control-group').hide(); - if (!jform_vvvvvznvzl_required) + jQuery('#jform_php_after_getitems').closest('.control-group').hide(); + if (!jform_vvvvvzmvzl_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_vvvvvznvzl_required = true; - } - jQuery('#jform_add_php_before_getitems').closest('.control-group').hide(); - if (!jform_vvvvvznvzm_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_vvvvvznvzm_required = true; - } - jQuery('#jform_add_php_getlistquery').closest('.control-group').hide(); - if (!jform_vvvvvznvzn_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_vvvvvznvzn_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_vvvvvzmvzl_required = true; } } } -// the vvvvvzn Some function -function gettype_vvvvvzn_SomeFunc(gettype_vvvvvzn) +// the vvvvvzm Some function +function add_php_after_getitems_vvvvvzm_SomeFunc(add_php_after_getitems_vvvvvzm) { // set the function logic - if (gettype_vvvvvzn == 2 || gettype_vvvvvzn == 4) + if (add_php_after_getitems_vvvvvzm == 1) + { + return true; + } + return false; +} + +// the vvvvvzm Some function +function gettype_vvvvvzm_SomeFunc(gettype_vvvvvzm) +{ + // set the function logic + if (gettype_vvvvvzm == 2 || gettype_vvvvvzm == 4) { return true; } @@ -1212,26 +1121,64 @@ function vvvvvzo(gettype_vvvvvzo) // 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_vvvvvzovzm_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_vvvvvzovzm_required = false; + } + + jQuery('#jform_add_php_before_getitems').closest('.control-group').show(); + if (jform_vvvvvzovzn_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_vvvvvzovzn_required = false; + } + + jQuery('#jform_add_php_getlistquery').closest('.control-group').show(); if (jform_vvvvvzovzo_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_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_vvvvvzovzo_required = false; } } else { - jQuery('#jform_pagination').closest('.control-group').hide(); + jQuery('#jform_add_php_after_getitems').closest('.control-group').hide(); + if (!jform_vvvvvzovzm_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_vvvvvzovzm_required = true; + } + jQuery('#jform_add_php_before_getitems').closest('.control-group').hide(); + if (!jform_vvvvvzovzn_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_vvvvvzovzn_required = true; + } + jQuery('#jform_add_php_getlistquery').closest('.control-group').hide(); if (!jform_vvvvvzovzo_required) { - updateFieldRequired('pagination',1); - jQuery('#jform_pagination').removeAttr('required'); - jQuery('#jform_pagination').removeAttr('aria-required'); - jQuery('#jform_pagination').removeClass('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_vvvvvzovzo_required = true; } } @@ -1241,7 +1188,62 @@ function vvvvvzo(gettype_vvvvvzo) function gettype_vvvvvzo_SomeFunc(gettype_vvvvvzo) { // set the function logic - if (gettype_vvvvvzo == 2) + if (gettype_vvvvvzo == 2 || gettype_vvvvvzo == 4) + { + return true; + } + return false; +} + +// the vvvvvzp function +function vvvvvzp(gettype_vvvvvzp) +{ + if (isSet(gettype_vvvvvzp) && gettype_vvvvvzp.constructor !== Array) + { + var temp_vvvvvzp = gettype_vvvvvzp; + var gettype_vvvvvzp = []; + gettype_vvvvvzp.push(temp_vvvvvzp); + } + else if (!isSet(gettype_vvvvvzp)) + { + var gettype_vvvvvzp = []; + } + var gettype = gettype_vvvvvzp.some(gettype_vvvvvzp_SomeFunc); + + + // set this function logic + if (gettype) + { + jQuery('#jform_pagination').closest('.control-group').show(); + if (jform_vvvvvzpvzp_required) + { + updateFieldRequired('pagination',0); + jQuery('#jform_pagination').prop('required','required'); + jQuery('#jform_pagination').attr('aria-required',true); + jQuery('#jform_pagination').addClass('required'); + jform_vvvvvzpvzp_required = false; + } + + } + else + { + jQuery('#jform_pagination').closest('.control-group').hide(); + if (!jform_vvvvvzpvzp_required) + { + updateFieldRequired('pagination',1); + jQuery('#jform_pagination').removeAttr('required'); + jQuery('#jform_pagination').removeAttr('aria-required'); + jQuery('#jform_pagination').removeClass('required'); + jform_vvvvvzpvzp_required = true; + } + } +} + +// the vvvvvzp Some function +function gettype_vvvvvzp_SomeFunc(gettype_vvvvvzp) +{ + // set the function logic + if (gettype_vvvvvzp == 2) { return true; } @@ -1300,16 +1302,16 @@ function getViewTableColumns_server(viewId,asKey,rowType) }); } -function getViewTableColumns(id,asKey,key,rowType,main) +function getViewTableColumns(id,asKey,key,rowType,main, table_, nr_) { getViewTableColumns_server(id,asKey,rowType).done(function(result) { if (result) { - loadSelectionData(result,'view',key,main); + loadSelectionData(result, 'view', key, main, table_, nr_); } else { - loadSelectionData(false,'view',key,main); + loadSelectionData(false, 'view', key, main, table_, nr_); } }) } @@ -1330,21 +1332,21 @@ function getDbTableColumns_server(name,asKey,rowType) }); } -function getDbTableColumns(name,asKey,key,rowType,main) +function getDbTableColumns(name, asKey, key, rowType, main, table_, nr_) { getDbTableColumns_server(name,asKey,rowType).done(function(result) { if (result) { - loadSelectionData(result,'db',key,main); + loadSelectionData(result, 'db', key, main, table_, nr_); } else { - loadSelectionData(false,'db',key,main); + loadSelectionData(false, 'db', key, main, table_, nr_); } }) } -function loadSelectionData(result,type,key,main) +function loadSelectionData(result, type, key, main, table_, nr_) { if (main) { @@ -1352,7 +1354,7 @@ function loadSelectionData(result,type,key,main) } else { - var textArea = 'textarea#'+key+'-jform_join_'+type+'_table_fields_selection'; + var textArea = 'textarea#jform_join_'+type+'_table'+table_+'_join_'+type+'_table'+key+nr_+'_selection'; } // no update the text area if (result) @@ -1363,4 +1365,44 @@ function loadSelectionData(result,type,key,main) { jQuery(textArea).val(''); } +} +function updateSubItems(fieldName, fieldNr, table_, nr_){ + if(jQuery('#jform_join_'+fieldName+'_table'+table_+'_join_'+fieldName+'_table'+fieldNr+nr_+'_'+fieldName+'_table').length) { + jQuery('#adminForm').on('change', '#jform_join_'+fieldName+'_table'+table_+'_join_'+fieldName+'_table'+fieldNr+nr_+'_'+fieldName+'_table',function (e) { + e.preventDefault(); + // get options + var value1 = jQuery("#jform_join_"+fieldName+"_table"+table_+"_join_"+fieldName+"_table"+fieldNr+nr_+"_"+fieldName+"_table option:selected").val(); + var as_value2 = jQuery("#jform_join_"+fieldName+"_table"+table_+"_join_"+fieldName+"_table"+fieldNr+nr_+"_as option:selected").val(); + var row_value1 = jQuery("#jform_join_"+fieldName+"_table"+table_+"_join_"+fieldName+"_table"+fieldNr+nr_+"_row_type option:selected").val(); + if (fieldName === 'view') { + getViewTableColumns(value1, as_value2, fieldNr, row_value1, false, table_, nr_); + } else { + getDbTableColumns(value1, as_value2, fieldNr, row_value1, false, table_, nr_); + } + }); + jQuery('#adminForm').on('change', '#jform_join_'+fieldName+'_table'+table_+'_join_'+fieldName+'_table'+fieldNr+nr_+'_as',function (e) { + e.preventDefault(); + // get options + var value1 = jQuery("#jform_join_"+fieldName+"_table"+table_+"_join_"+fieldName+"_table"+fieldNr+nr_+"_"+fieldName+"_table option:selected").val(); + var as_value2 = jQuery("#jform_join_"+fieldName+"_table"+table_+"_join_"+fieldName+"_table"+fieldNr+nr_+"_as option:selected").val(); + var row_value1 = jQuery("#jform_join_"+fieldName+"_table"+table_+"_join_"+fieldName+"_table"+fieldNr+nr_+"_row_type option:selected").val(); + if (fieldName === 'view') { + getViewTableColumns(value1, as_value2, fieldNr, row_value1, false, table_, nr_); + } else { + getDbTableColumns(value1, as_value2, fieldNr, row_value1, false, table_, nr_); + } + }); + jQuery('#adminForm').on('change', '#jform_join_'+fieldName+'_table'+table_+'_join_'+fieldName+'_table'+fieldNr+nr_+'_row_type',function (e) { + e.preventDefault(); + // get options + var value1 = jQuery("#jform_join_"+fieldName+"_table"+table_+"_join_"+fieldName+"_table"+fieldNr+nr_+"_"+fieldName+"_table option:selected").val(); + var as_value2 = jQuery("#jform_join_"+fieldName+"_table"+table_+"_join_"+fieldName+"_table"+fieldNr+nr_+"_as option:selected").val(); + var row_value1 = jQuery("#jform_join_"+fieldName+"_table"+table_+"_join_"+fieldName+"_table"+fieldNr+nr_+"_row_type option:selected").val(); + if (fieldName === 'view') { + getViewTableColumns(value1, as_value2, fieldNr, row_value1, false, table_, nr_); + } else { + getDbTableColumns(value1, as_value2, fieldNr, row_value1, false, table_, nr_); + } + }); + } } diff --git a/admin/models/forms/dynamic_get.xml b/admin/models/forms/dynamic_get.xml index 3bebc3e11..0bfce606d 100644 --- a/admin/models/forms/dynamic_get.xml +++ b/admin/models/forms/dynamic_get.xml @@ -161,11 +161,12 @@ - + @@ -202,264 +203,120 @@ - + - - - +