From 4b3bc9bd0350a2410355024e18c65bba5cd3e12f Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 25 Aug 2017 02:46:12 +0100 Subject: [PATCH 1/4] Moved FTP signature to its own table, so we can use it more securely around JCB (even in the global settings). Improved the Linked view option in admin-views. --- README.md | 12 +- admin/README.txt | 12 +- admin/access.xml | 29 + admin/assets/css/admin.css | 4 +- admin/assets/css/dashboard.css | 4 +- admin/assets/css/ftp.css | 27 + admin/assets/css/ftps.css | 27 + admin/assets/css/joomla_component.css | 4 +- admin/assets/css/joomla_components.css | 4 +- admin/assets/images/icons/ftps.png | Bin 0 -> 12108 bytes admin/componentbuilder.php | 4 +- admin/controller.php | 5 +- admin/controllers/ajax.json.php | 4 +- admin/controllers/componentbuilder.php | 4 +- admin/controllers/ftp.php | 326 ++++++ admin/controllers/ftps.php | 111 ++ 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/helpers/compiler.php | 31 +- admin/helpers/compiler/a_Get.php | 21 +- admin/helpers/compiler/e_Interpretation.php | 88 +- admin/helpers/componentbuilder.php | 107 +- 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 | 105 +- 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 | 4 +- .../admin_view/javascript_fullwidth.php | 4 +- .../linked_components_fullwidth.php | 4 +- admin/layouts/admin_view/mysql_fullwidth.php | 4 +- admin/layouts/admin_view/mysql_left.php | 4 +- admin/layouts/admin_view/php_fullwidth.php | 4 +- admin/layouts/admin_view/publishing.php | 4 +- admin/layouts/admin_view/publlshing.php | 4 +- admin/layouts/admin_view/settings_above.php | 4 +- admin/layouts/admin_view/settings_left.php | 4 +- admin/layouts/admin_view/settings_right.php | 4 +- admin/layouts/admin_view/settings_under.php | 4 +- admin/layouts/batchselection.php | 4 +- .../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 | 4 +- .../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/gettable_above.php | 4 +- .../dynamic_get/gettable_fullwidth.php | 4 +- admin/layouts/dynamic_get/gettable_left.php | 4 +- admin/layouts/dynamic_get/gettable_right.php | 4 +- admin/layouts/dynamic_get/gettable_under.php | 4 +- admin/layouts/dynamic_get/publishing.php | 4 +- admin/layouts/dynamic_get/publlshing.php | 4 +- admin/layouts/field/details_fullwidth.php | 4 +- admin/layouts/field/details_left.php | 4 +- admin/layouts/field/details_right.php | 4 +- admin/layouts/field/details_under.php | 4 +- .../field/linked_admin_views_fullwidth.php | 4 +- admin/layouts/field/publishing.php | 4 +- admin/layouts/field/publlshing.php | 4 +- admin/layouts/field/scripts_left.php | 4 +- admin/layouts/field/scripts_right.php | 4 +- admin/layouts/fieldtype/details_left.php | 4 +- admin/layouts/fieldtype/details_right.php | 4 +- admin/layouts/fieldtype/fields_fullwidth.php | 4 +- admin/layouts/fieldtype/publishing.php | 4 +- admin/layouts/fieldtype/publlshing.php | 4 +- admin/layouts/ftp/details_above.php | 41 + admin/layouts/ftp/details_fullwidth.php | 49 + admin/layouts/ftp/index.html | 1 + .../ftp/linked_components_fullwidth.php | 138 +++ admin/layouts/ftp/publishing.php | 58 ++ admin/layouts/ftp/publlshing.php | 60 ++ 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 | 4 +- .../custom_admin_views_fullwidth.php | 4 +- .../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 | 4 +- .../dynamic_integration_fullwidth.php | 4 +- .../libs_helpers_fullwidth.php | 4 +- .../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 | 4 +- .../translation_fullwidth.php | 4 +- 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 | 4 +- admin/layouts/site_view/php_fullwidth.php | 4 +- admin/layouts/site_view/publishing.php | 4 +- admin/layouts/site_view/publlshing.php | 4 +- admin/layouts/snippet/details_above.php | 4 +- admin/layouts/snippet/details_left.php | 4 +- admin/layouts/snippet/details_right.php | 4 +- admin/layouts/snippet/publishing.php | 4 +- admin/layouts/snippet/publlshing.php | 4 +- .../template/custom_script_fullwidth.php | 4 +- admin/layouts/template/details_fullwidth.php | 4 +- admin/layouts/template/details_left.php | 4 +- admin/layouts/template/details_right.php | 4 +- admin/layouts/template/details_rightside.php | 4 +- admin/layouts/template/details_under.php | 4 +- admin/layouts/template/publishing.php | 4 +- admin/layouts/template/publlshing.php | 4 +- admin/models/ajax.php | 8 +- admin/models/componentbuilder.php | 11 +- 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/forms/admin_view.xml | 16 +- admin/models/forms/ftp.js | 25 + admin/models/forms/ftp.xml | 149 +++ admin/models/forms/help_document.js | 60 +- admin/models/forms/joomla_component.js | 4 +- admin/models/forms/joomla_component.xml | 31 +- admin/models/ftp.php | 980 ++++++++++++++++++ admin/models/ftps.php | 385 +++++++ admin/models/import.php | 4 +- admin/models/import_joomla_components.php | 4 +- admin/models/joomla_component.php | 28 +- admin/models/joomla_components.php | 14 +- admin/sql/install.mysql.utf8.sql | 36 +- admin/sql/uninstall.mysql.utf8.sql | 1 + admin/sql/updates/mysql/2.5.1.sql | 25 + admin/tables/ftp.php | 351 +++++++ admin/tables/joomla_component.php | 4 +- admin/views/componentbuilder/tmpl/default.php | 4 +- ...sed_issues_the_closed_issues_on_github.php | 4 +- .../componentbuilder/tmpl/default_main.php | 4 +- ..._open_issues_the_open_issues_on_github.php | 4 +- .../tmpl/default_readme_information.php | 4 +- .../tmpl/default_releases_information.php | 4 +- ...t_vast_development_method_notice_board.php | 4 +- .../componentbuilder/tmpl/default_vdm.php | 4 +- admin/views/componentbuilder/view.html.php | 4 +- admin/views/ftp/submitbutton.js | 49 + admin/views/ftp/tmpl/edit.php | 129 +++ admin/views/ftp/tmpl/index.html | 1 + admin/views/ftp/view.html.php | 213 ++++ admin/views/ftps/index.html | 1 + admin/views/ftps/tmpl/default.php | 99 ++ admin/views/ftps/tmpl/default_batch_body.php | 32 + .../views/ftps/tmpl/default_batch_footer.php | 37 + admin/views/ftps/tmpl/default_body.php | 108 ++ admin/views/ftps/tmpl/default_foot.php | 32 + admin/views/ftps/tmpl/default_head.php | 61 ++ admin/views/ftps/tmpl/default_toolbar.php | 59 ++ admin/views/ftps/tmpl/index.html | 1 + admin/views/ftps/view.html.php | 304 ++++++ 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 | 6 +- admin/views/joomla_component/submitbutton.js | 4 +- admin/views/joomla_component/tmpl/edit.php | 4 +- admin/views/joomla_component/view.html.php | 4 +- .../views/joomla_components/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../joomla_components/tmpl/default_body.php | 4 +- .../joomla_components/tmpl/default_foot.php | 4 +- .../joomla_components/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/joomla_components/view.html.php | 10 +- componentbuilder.xml | 6 +- componentbuilder_update_server.xml | 17 + script.php | 292 +++++- site/assets/css/site.css | 4 +- 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 | 103 +- site/helpers/headercheck.php | 4 +- site/helpers/route.php | 4 +- site/router.php | 4 +- site/views/api/submitbutton.js | 4 +- 261 files changed, 5281 insertions(+), 638 deletions(-) create mode 100644 admin/assets/css/ftp.css create mode 100644 admin/assets/css/ftps.css create mode 100644 admin/assets/images/icons/ftps.png create mode 100644 admin/controllers/ftp.php create mode 100644 admin/controllers/ftps.php create mode 100644 admin/layouts/ftp/details_above.php create mode 100644 admin/layouts/ftp/details_fullwidth.php create mode 100644 admin/layouts/ftp/index.html create mode 100644 admin/layouts/ftp/linked_components_fullwidth.php create mode 100644 admin/layouts/ftp/publishing.php create mode 100644 admin/layouts/ftp/publlshing.php create mode 100644 admin/models/fields/ftps.php create mode 100644 admin/models/forms/ftp.js create mode 100644 admin/models/forms/ftp.xml create mode 100644 admin/models/ftp.php create mode 100644 admin/models/ftps.php create mode 100644 admin/sql/updates/mysql/2.5.1.sql create mode 100644 admin/tables/ftp.php create mode 100644 admin/views/ftp/submitbutton.js create mode 100644 admin/views/ftp/tmpl/edit.php create mode 100644 admin/views/ftp/tmpl/index.html create mode 100644 admin/views/ftp/view.html.php create mode 100644 admin/views/ftps/index.html create mode 100644 admin/views/ftps/tmpl/default.php create mode 100644 admin/views/ftps/tmpl/default_batch_body.php create mode 100644 admin/views/ftps/tmpl/default_batch_footer.php create mode 100644 admin/views/ftps/tmpl/default_body.php create mode 100644 admin/views/ftps/tmpl/default_foot.php create mode 100644 admin/views/ftps/tmpl/default_head.php create mode 100644 admin/views/ftps/tmpl/default_toolbar.php create mode 100644 admin/views/ftps/tmpl/index.html create mode 100644 admin/views/ftps/view.html.php diff --git a/README.md b/README.md index ed0ff2894..8fe1e865f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.5.1) 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.2) with **ALL** its features and **ALL** concepts totally open-source and free! Once installed upgrades are quick and easy via the default Joomla upgrade area. @@ -108,13 +108,13 @@ 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*: 23rd August, 2017 -+ *Version*: 2.5.1 ++ *Last Build*: 25th August, 2017 ++ *Version*: 2.5.2 + *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*: **111668** -+ *File count*: **664** -+ *Folder count*: **117** ++ *Line count*: **116210** ++ *File count*: **695** ++ *Folder count*: **121** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/README.txt b/admin/README.txt index ed0ff2894..8fe1e865f 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -9,7 +9,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.5.1) 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.2) with **ALL** its features and **ALL** concepts totally open-source and free! Once installed upgrades are quick and easy via the default Joomla upgrade area. @@ -108,13 +108,13 @@ 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*: 23rd August, 2017 -+ *Version*: 2.5.1 ++ *Last Build*: 25th August, 2017 ++ *Version*: 2.5.2 + *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*: **111668** -+ *File count*: **664** -+ *Folder count*: **117** ++ *Line count*: **116210** ++ *File count*: **695** ++ *Folder count*: **121** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/access.xml b/admin/access.xml index af91880cd..3c8d9485e 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -88,6 +88,22 @@ + + + + + + + + + + + + + + + + @@ -285,6 +301,19 @@ +
+ + + + + + + + + + + +
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index ee1a801a2..c38b242bb 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 6101fbdd2..9f5bf08d3 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/ftp.css b/admin/assets/css/ftp.css new file mode 100644 index 000000000..aa5b07198 --- /dev/null +++ b/admin/assets/css/ftp.css @@ -0,0 +1,27 @@ +/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/ + __ __ _ _____ _ _ __ __ _ _ _ + \ \ / / | | | __ \ | | | | | \/ | | | | | | | + \ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| | + \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | + \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | + \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| + | | + |_| +/-------------------------------------------------------------------------------------------------------------------------------/ + + @version @update number 10 of this MVC + @build 24th August, 2017 + @created 23rd August, 2017 + @package Component Builder + @subpackage ftp.css + @author Llewellyn van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +/* CSS Document */ + + diff --git a/admin/assets/css/ftps.css b/admin/assets/css/ftps.css new file mode 100644 index 000000000..8e597f403 --- /dev/null +++ b/admin/assets/css/ftps.css @@ -0,0 +1,27 @@ +/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/ + __ __ _ _____ _ _ __ __ _ _ _ + \ \ / / | | | __ \ | | | | | \/ | | | | | | | + \ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| | + \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | + \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | + \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| + | | + |_| +/-------------------------------------------------------------------------------------------------------------------------------/ + + @version @update number 10 of this MVC + @build 24th August, 2017 + @created 23rd August, 2017 + @package Component Builder + @subpackage ftps.css + @author Llewellyn van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +/* CSS Document */ + + diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index f3f4a7dfd..d688c1961 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 359 of this MVC - @build 23rd August, 2017 + @version @update number 361 of this MVC + @build 24th August, 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 6073eb16d..bf3f38bac 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 359 of this MVC - @build 23rd August, 2017 + @version @update number 361 of this MVC + @build 24th August, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.css diff --git a/admin/assets/images/icons/ftps.png b/admin/assets/images/icons/ftps.png new file mode 100644 index 0000000000000000000000000000000000000000..db130da40d8acd9696cf3b0db77a2f7ee3562998 GIT binary patch literal 12108 zcmV-SFSF2zP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z001O+Nkl*&AEkYDv~&*^*^zYfG||jGfHDK#UB6 zQRZP1V_qf?L6G$=156Uk!(bd>k^qS_i5(RVO!+yCG9og>)W61#lvaP55QT|T#K25x?xP985us*B-9@6#&u2Y<(T-{=Mi$FvJdpM0Sw?0wB7MKpd|A3c@;L4Zuo%j*{Q2gnF_L zW)F;CXR1tIZvst#VzE@tWiv;G5NRO|LrNh)i$hn?Ptz~7)>E&jV|f{`srsr^vF{m{NOXc@C*O(vC+|yM}!c0!!S+5kV5N2j`ed1 z0ZOSLj3O8G8=wE&=f3pZbI*P4@BjYqUu-lQ9*|1}pquoKgg|V;eA%V-7SMS2gAd;O zd%ySJf8*zV_M;yI^6OVrDkiNCxql!+AO%u_l-HOwH8uIUKlp<`{9k|aCx7yFAf2$r z2f|HmLH8m6>&&;3f46`6mp}2b-~avJ|K!ln;4y$^(FTbV;^fAC&GV3?9ZJ`J$) zH-GcDzx6A>^2?uXx7$|2{LMnJtpKc>dlRsM+Hd^kZ~wPH{Dc4TNq|<%B?zMpb9A_F z0ddf=P-HS`(kWBD^wP_}@zIZd~%B0@r%Fs?8iU($v^sY z!w{m;bO^!-A;h7s-%2ha`8x)uwb&+(-aq@;e*w z&zw1X|DXN&r#?G8RL(S;4pA5#YW=MrAfh#?haP&*U6YfOU%qhRf}cFCHVJ~*>;goW z=4XJ;pZ@8eedZIN_%9!8w>>=1KV<$pWGM}Ug9T=1=6>g0@4EXh8;ynyv;e0oCeZ7V z{$}mB0QX(*y6@4CeDtF~8w3hJ@IhQ3dODNB_e|KJt-LqS&eA(dYv5 z-X;L+FHp}s^UTkUjvlc*KR_vs)*RA1h~f;5_kH~1zc7)=MLMzWX14&Cn_yl8(AjME z*!lBMJ=AGCvDw$#B8rFW)=U*eWoYC9;D!VYKr3|!@V&D=ft@frl?3=kw;M1wrGd#4+Kj>o5QpynCm|BJmffu@`i4qh z&jlD-X`xhHL^|~U?{EQ#87RA$FK?6uYy<`xEn`GUuLI3{hNuLaai@cje!YGdZfgnX zvhHtd+S%L?vTg~4*0J{Q)dJ{*0XHL-5Qtd#gt%>mAmLwkQ_owt(Cq@QJ!*v3Z|yzW zE&Ejz;)jx^W8yjuwDJ$c5=d!~$rdPP6{aZ=Lf+0X!1c_p=*9uMUoT?S>4KH^u>8oT zz4#Kt;TNz<_u~XMD6hXlAOxoD;H`z!-G5K9Jc4cArfxvrPyp!00XCTp*bf&VM67xB zW<=xizwo}tB8E=?G=zdpW$AtX(gG|&>j$4?c5xUZ^D!(_A%wgQgW9dX@AYDU4d1aJ z0w8h84nNE*7e0*l+~4xS$6rMlc~lhk&ju(LQMiY6u0nR@CF-^Fs35x?duoBShm3%z^tEO@E&^Yp>8A z_#nlsLP~j<+V&yIgel?K_fezacx(rnc z%w7E_8qJ5v+BT+Xa=Rc~>pa{tSl;?S?+0lNsVEl93>|;F?iE2+_ zXNMWKF5;}dhU3cw+`7F=!@Cdw{gxPDFBEIJz%l|xPQD-4zMsoiYoK-f=6&gk&>$?d zw*;gZ9ZZvMKTo6O5hk6?`}O^9W$Gzi-Z}=@Kavtk;ca6DwzC9sD+qBv-GJ60Ma00+aWW%M@#b`gcFV&M0^Wzf1?Hvcm?LdV6{xGJDD36@P8hVT?GcKMJVG812 z=DxUs_{*ry3Il^`^Z2uwp!8M~LI(j#1) z{v6{YIi!^R1BMXbt)T*+k)b2ZU-<%!#uMc10_hY;!-Bn33sp!Eh8WUB8s@IWK%fYN zfM}oYLoaT?+#1U5PkmaT$>q`voOqhK3oo-&ZF6k2fUo+vvy8L}8?R#zKEPP^d#tX0 z2dDHQvTU+}O2ev`;=Q>hG+n|_W~^Zn?2 ziXUIR%3pA3|YJPy?prbhgn>y@!fBK1IrYcrq%OxwAKW!N49)~ z;)kB%SjEQi{JkriQf!ChZ(R%M7iz9GQV0r#BE@6pnfcK-sMcIY2GjUj^+y0SAZ()6 zEcU<|ju@|UvHAlB2Os0yooDf!7Af1rH0_?}-c=OQX*X%CF0)o|a`%~2%+1Z?I}Ot5 zOmZF3!|hObu7m6OEG@4vHkc@b-uqY9>>&o&kCw0-@meqoVXYl5-SL6&NDvbh|VmEIC-y>^>5zUQKK#PaeA)3Zxd&Yei&rM;Bn zx330mX#rG1ec``~eT-!U44r(G>B-MCIrAnDoJ%3J>Yo)57TQ@r7fv!Z5OH<&OEiYg zGFZ&f>Np4~vFz0LmRp0VV=yUS9H6tf!0VT;a{pbYDdchlktUP1kcQmejcSlm5=9}+ zMuX|Avm8GwD0Qxvip(zcD`#(N*>WYen~V+(O1LmDQjY>sp~#r*stDhwGJEaG@RVH9j^ zp0y>#5`bx^$mjF4+f9~MYDj794-j^%Ac1d*D-!7x64JJ$GVv7E@Dx+Ct4T|;j-#M{ z5GGM;24UtHFNMhEe%#4>Gi`4UdM$>pmH9339OGz?tF zC5l3{?%_HJ48tUq&6BbWrf279dl7~ddjo=YjRYRVAEjbbDnbT^k7JBH&XqY2#|e@2 zQvgASEdp=?dfd8sXB{2tr9^AcyM*gh8;8M{i}mmDUKuNX&PEdVP(_*(Jt? z2QZ|dKW#m z1I#bCk%<0TfGCay!rByOW`yy~0>Q%95W;34m!aA25QRa^IK4H+H4cesrO4*P;dv=@r|^eh=NIDQXa z;oV%BtrLb3eeE4ZqTMQ?*JfyNfI{;H>Wvn~Tm}%hp0{xmw>7guAWe&OCXWSMGz)lJP^L9PC~~hB$!YicHIm(3$?T$;ZZUwd>w8lsT5XE7G~R?Y&h6H!|-pnUv6oZS6f znQaiMxO&*XK-55aO`;%RcrZ_P?KzsQ4#NXELZu0O4;4jS_4VtMN@^HJf(u9@-khAF zl+RGeW@xoLggsnG>j*70LP~5qMJ8plw6w%(!@)9*jnuBE3_#uLSwMI1TJk6b6p91n zPd?3bRkBuhG1fbV`a%j21kG780~3rz-=)3uD(Q5VVlG9i?Zo~&Qm9C8NioJGF|9P2 zbcWfvc~)voj*ph{{E#5 zVTvb-297;M!#Km#Y%SU3RQIoW6pN^F6{RId${A8iU&QegBLfBeAi{G!BBh9w-jd=z zLxE|SWO8`|&*jq893$ldxr|MxU)LR~=l)c3g>!kM3 z7OoC>gk=K|A)+`iL~8szSC%x5riUr|m=P%ABGK9v^5tWUhObate3N`GM=_VC<2a}& zM6-3oo$S+#Gz{!inrzx;>gp^l*XP7&nU3ob_=R3 zAPi$*C{o)pPiqAtPUX_s9G=tSjmy)F3>8VIEIOSID!~`FPvMe`Af3TB1y`nKs5?HE zC3hAG?%V~4uHn#|)5>fZn&Qwg?C~eLvgpz7gxAo)evyg@TT7G%k22hPkw$ffVm3=Q zlcLk<5Jq8789|)U#Hn1`wwausrQ-yQkCbt}py$kDeW1oP?ZgVKF+E?6`wn+db9o1( zfo~@PWYQ+3Q;)G6jxn=XM+)6vKnfFo^%Bx9F<$7P=U+r&Q_5v%x_%4{X+;!mO)3fE z4AUZ;%h75!xH!GYkxD5($HntdD(c}n3Izzmz|Lf_jo1pb-4H{{9tB{R!=X2GgnIqM z8w8YwC(uKWFty+&@G#eQzTa;`LeL>-uQ4< zVoJe}-kiiVBu9qJbUYswg+0{=lwQXdY_i!5%S%hlEUj&{vF`;6Hn&6q`_vS=llE~5 zq*7T@$DSa(_#&N-i(#euGP7{)%bWPiR|q48Y)AsPO{$n7o3g0Yn^>lakiE_jNDR}) zwo^1)Egauxu#{zHVVNKZFn7@P7pIpQ>dg-IW*c#&yaAa=N0tdBGHkN6RHZ84L(#TbskK>LsggD&VWcp3Fi9k(1jA%(bclg` zjvu@+h3|HVGHDD$_4r+`?f9B24sdL21Sth7QV1z-)D*Za`^+sHXm6qg5C}AiAQCwB zIV#nEX0TjB%QQke^mCsjPK=Lnd}M%Ht=6UKH@4!t7J!>+0JMk!noek-7rw<% zG>vH=$M3B5)bGA00YFf%H>v6)6iz)x%L|yBUqA|lKqgJCswXklTG8%w7#b`yI#lB2 zZ+{=(ZIR1W-jZr>+e44W4}7FyFmZg8F!1q%U}I0u8_gT++5+4PF+iXM&Dt`>#pfvJ z({a@7w-M6r+q{C5;Cmqps~*wO^AtzV^5&JRw3-bng9At*6RlSC(mNi8K0&BBH!;py zz0I4Krm!pn)3gzYp0A^|qSJ909j8I_ zurgz@_G9#Q<7c6v*>YIZqvTFKffq!~%+Hgt4NNNqhJhBn1z2&q=VIA5um)2fF&HVBbomPWlK8In(hi~-k|5Ze*?eOk<&Jctl zSEi=1Oo?e{kiv-T5Tb|gqBV_Xi&8Pq@zFA^cKh1Ehu+d|>_Gr-;?gR@2@S%f*Erhx z4))O@La#+q4DZi-CTVB8?Xu!!$(%fouu@FV&LMP!nMxz1Og>*P2%N@qJJ`0(xzpoZ znwq6nTcuPiV3;!A%(9n69f+a;$Mw1U>;$>A$-+`?-@f-v84lfA3k8AFwA(J3na?wn zjWPPDvy50Th4uw=h)2_xR~^~|Pjd9sdstjtVr8XDA(z20Oz7EU$CJbLro(;bPGcF8 z3qSlZmH}2O1HwR|5xq=8YmMVL6!UrRI5tAP(M-->=w<474{6}d5`ai++{naP`4Pw4 zuaFrn6FIH;^rAj~7Ac_9@mTR}th+ymu(M2FeFLdOY&(sR@vZ9B{Cl2@Wt!YMag^7u z%urofNd(D42ytyBtOsk@Y&pF9UB}61OjcGJ8;5Z8CIGvR0ruy-fSn?LQKV>fBCOdL z8L~QH3==hHL7MbyVpIswO0Zh@Xyo6^$i(|tUS48(d6{e`jWliI4)xydhgK0C$K}q` z$H}Er{NS~VpdzeP79nL%d-z_{{tmfZhBGHd@LZQL3hDXm_B{`V9JKF8<12wzy+XPA z64}Bak=xp|gu$Jsj^cD2qA*OrCEc?^?S6+4y2haUpY@@Y!dC{) z+EpqmFHk#Z`Z4g+H^Bqn4_IshXFrIM8{*3Me}oP_to#5%8u7UXJ(zzjAPRi^ zDB`|zCs|ltW$Nk-8QaD%t%P~7-Nrpy#J!5mc8BpJqZ}U@pkAx(cq_W~5xCu_fd}RO zg+M7y+m8@)-(W~x#mJn*Z!Ranm+q_Z)mk2F_Av@~JVB@9u&}g9$~F?;FT1o~ZwJ-m zI4;ALG85w?eE!SdB=jAud?gVidfLDl4PoHpg^GL5977P{?`FFgy(bqy&t`A$88~t3 zS6iVl|0PQKTs&7FgaNNT0Ktvq}b7|*i#yqWU~ii z29#1bp@E+N4nyvnSc7BuPBVG3kEx%8TEnF(N)*qW$MGU2r)M!Fm{ux2YEEkus)w7c zXtvu_1_qcoc7(5e=T+LRCIh7sQeGSD>LqfIqJT)jJ*ST&q7c_}W1wosw_$(^^f^cs936ld*uC8#_ry)~LP@l6fuYV1u?xe5oz*z+@8bs$K+6fJk|T5aJVB(HygEbLl1MuhONbVz zu6;Icyv2dS^E`@$0(YH0%7xc1(rVPP)0t$)G11$2ztTiei0cQOJ3WqVg5!DY76a?$ zzueSnpa3Er(dsy4rvHUXHj!G-0i%Dwj})LIO|_0rWL29 zsGjbk&=HMRhsPei1En;tzJ3YI5}1}9w~h%mhDWzk*;cDfu~^`a}MKy z5Dg(JfqjFeS2#qyng8_^|e(>gIXq#S?!|_wh(@!+ zU1uj4Eav#9FMb8f1j9~mq<+0r57C;y_eo{a+<)f@I-NFJM;nJZ_e%oIn^g+X8r;ah zTX}=AwQrIgC=huaM4zpW6yUfa%Pz=!o<>+X=I4KmEj7YQfi!l2wrQd;KuCl8&zQnudp~;N-%YUqanUED?L}DA&ofLN zkv@j1&BqMrm-Z)*YYj~;f0ofZA7{0?%GLQr(zdm+QFOesMh{oh5zSVcJ5HV8=x~`A zzW!aJz{Aex<4)in1xag-@4DEj6!+bEg249(f?!8Gmv7C(U1kCO!+tb@7PxD3lonnl zUnmgy>tk1a+#pnd=PQ=mU`?DSOqF@{$CuHegKejf(m+bl)79d`9ee_%x%b>j-k6+Y zZf=fjCaxdE%_F^@Z4}XR98R4WW2{o3-e?{eE6gorrw=Y5_Wg>sFOgF(Fv>D!W(=>k z%)acAzJ>M+3DugSnjU80+|$f0E_3nn6uFe3?nIbjCmHzYq1i%(xUR=NcizEprNn3c z;Y-x(EuumZ4;N{Ky)|tpg^mKORGN3+J%Q)C1VMDIZm>r;yGJB&|6PFAnm`*k^#ukN zUZ$8&6NMo<3=yX6PXG{a#Y-3{R@xArIggbeVj}Cpqwgh9VB2=$Z+ko}B2r{CDek#r z92xmMaPBxqM~6tI)3N#Q@j6Py8$nEr4>MfKP_NbZ@gD4TyZF8UKZ;JE&@t={I`sUtj; z&ts=-48zy~Y8Sg4$MLAu8w6o^kSsa)rqEDBr_~@g`(*}l5)}pU>0MIL*P>6PS#E-V z{9y)1PGcLINI|{PqTXoj3T)ZfOG#@S*T->JHw1mh$(q(TWd`Sffgp_&ny9&dW3=-c z=_5nQ%D`X^~Uf1sIPd8ZDU`)y;-S!9eLYJ4A2iKI8=gG zr$hGYb5v5Gg@tw<;@u$oXZjVIl_oet4^ljOH zgJ}K&L$y~(jSLbrS4j4S?>%dRTjj*R*V8rr}=|O_(eEjaBf7&l3thJ$8Iz{Hh zL!?C*r+SA1aBu<;_xc-n)k}=7eueyC4i&bLR)6h}A;1e`?N?`>qEM<}$cVoBoI?S) zj_+3r#|Lx%>kP|PjO-9Ws|t4iwZGPc)%-Z=Q;(4{In@4}VF3aqaOz7`s$Zf!Xre`k zmU>Tzb@v4Pgs|d*I{75o!EsEf4h3K*0w9Fgpj}7cfD@RArEhY?Tp(2%!fV%%ss2X( zri5At>Zu~B6OWOzC8ki_Xv=M}df}hBr5W9$00a>@tyKo=&oexnMc4+08zPMUYJa3) z)dhF>Q3i%5unmQj@saGeQv@J{*jC_gC;(DQq!dYG!|s+J7}%@d=BR!hY3J}dOK79N zU)lgxJFuuzSSLP2A)CcC13>h2DD+QMjxV?W&NsFIQebQ}NbFSdBw8yBD@C;M0L z=Sn-?__)tJ&Eq%WsjT`SFxUB^c5@{I8MC9#Kk;)^ z&3lQobr6UXh9SvkOv=X}rkG1@1b^Z-%>JZdAh(IOw{Zb-PcA@+kdZroioz*{io(99 z;9BeWw5@a&LpzxGJJ{0oC(#ASjeU)J6##wB1xTb3)9xkE#zIp_3*yB8AZ&mJ?Ib^2 z+|ElH*HvKMlLauO#E=HY9yCbA#qyiCG-z($yx%lTjBSFr&BOPCctBZ8DKSkmKDYL8 zy)%PA(?m+S&fn{m-n6;NEX3!w2@xu#10jTE8fI^EZHMdDvj9>e4a2#PqHpm0dNF|1 zTDM!R=CV@isA-u!Z;f`iZZQEcO$@`B19Cvfbv6tzH!)uWG6;f|$?2&nA;i&CI)(4~ zhefn^*wR{KrEJRO@@qf|@VHK=XSWMjKRU@!O0B*8@>gDY_Ss+hKrvGwiViKnJ8cOe z2!gQofByK7e*lz$CJ=S;SzpfrLexfVD3EzRd!tF6jsXv(ac={_DT~%oiSg^aDR%C>Ch9+q*6d9j=2- zeeIM@d9d94o!|Z4zx9280`P&Li^uDaZ*u`rA^{Nfk?_5XeP)1Q9tul?GuO-Lc= zIL@IE-0J*SniD5Z@`W#a{(pYzQ=jsI5#Ul10|c9c!F6s*zyi`h78n4AfOIaGyXTKS z`A5I^?6d!=xK^v-dETKA+`^{+$ml4mYipnS>7V-Pzqs)I3-<%_z%oz;YCtDZ@BmQV zF+jHk@PRgvZMWMOfBScS`+sZne|`4ZXNSWuq+YKl=i?paTwO z;~)RKg!%1+I*A1cyUl;M1rXP<0;ME+tN^BA7-xU|*MI$&e(N`X^IZewGVOL7$8m1j zOxtZA<;S5uXwA^@FhKRQpZ)Boe)U&>^`(V{g|kW2zX+@*0bqTz_LFQ&*?mouxN4ID z@<1^Wg2Cju;SYS^15bY96Q6j`Pks2qXUE3IwyicDuD-987hZVbYybBz{^G^I`t+xl zlZd|ttR#$IXMP)S66+prjsd!@fC;3!grJbb1m)!40vJAV^5h*)KJmn{_rL%BmC@1B zN~u&Duv4jc()X>_<#6p=d=JtvBH#0t*Vfh+zxvg$zV`CVFIO*IxUiU5Z7cEj^+X72 zi6v+y%=fy2K(1#2)-!|6mY|SWgJSZt-6be?^2Y099^#PseH8-Tm9G2Azl}u0*O}c& zsGIrgnjdxx)Mg;4I~er4n7IxT1&I{p65&|?AXf4r)~(2)0Q64)R2M(ig}_bxdnaLd zt1I|(yO_UaEucFa=oX0061V4dB<0g#6Ra3BJpt|I{5Lf~}$uABL9!}M=d>|cLj zx4GzkL+3ioH@gJjFb3#T4A8~Mu*)h33A4Q}@;3oL>W10G7QYu=n!O$ytTR28JZE(= zzFPneSD(`UO|%a2dR@X0b}>HMWX*dLfXza%?%TUHz1!>?U8Y~`;5`mk@0x$TK(HIz z4>nl_#am0idM6g(Mz87i@v@8g-9mD>4n7#{F7a+Q_qtc+ZudI9NyEi;X!C0i*ZwkH zY|`krZHC(Qb5Gl@?UhNQkJmn2Tf2f@pWAZ%{{aA&<(1%fxdxyB0000 'fieldtypes', 'language_translation' => 'language_translations', 'language' => 'languages', + 'ftp' => 'ftps', 'help_document' => 'help_documents' ); // check if this is a list view diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 93d84c6ae..b5b5d0cb8 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 6c55d52bf..6711fbda9 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/ftp.php b/admin/controllers/ftp.php new file mode 100644 index 000000000..e27df64cc --- /dev/null +++ b/admin/controllers/ftp.php @@ -0,0 +1,326 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import Joomla controllerform library +jimport('joomla.application.component.controllerform'); + +/** + * Ftp Controller + */ +class ComponentbuilderControllerFtp extends JControllerForm +{ + /** + * Current or most recently performed task. + * + * @var string + * @since 12.2 + * @note Replaces _task. + */ + protected $task; + + public function __construct($config = array()) + { + $this->view_list = 'Ftps'; // safeguard for setting the return view listing to the main view. + parent::__construct($config); + } + + /** + * Method override to check if you can add a new record. + * + * @param array $data An array of input data. + * + * @return boolean + * + * @since 1.6 + */ + protected function allowAdd($data = array()) + { + // Access check. + $access = JFactory::getUser()->authorise('ftp.access', 'com_componentbuilder'); + if (!$access) + { + return false; + } + // In the absense of better information, revert to the component permissions. + return JFactory::getUser()->authorise('ftp.create', $this->option); + } + + /** + * Method override to check if you can edit an existing record. + * + * @param array $data An array of input data. + * @param string $key The name of the key for the primary key. + * + * @return boolean + * + * @since 1.6 + */ + protected function allowEdit($data = array(), $key = 'id') + { + // get user object. + $user = JFactory::getUser(); + // get record id. + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + + + // Access check. + $access = ($user->authorise('ftp.access', 'com_componentbuilder.ftp.' . (int) $recordId) && $user->authorise('ftp.access', 'com_componentbuilder')); + if (!$access) + { + return false; + } + + if ($recordId) + { + // The record has been set. Check the record permissions. + $permission = $user->authorise('ftp.edit', 'com_componentbuilder.ftp.' . (int) $recordId); + if (!$permission) + { + if ($user->authorise('ftp.edit.own', 'com_componentbuilder.ftp.' . $recordId)) + { + // Now test the owner is the user. + $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; + if (empty($ownerId)) + { + // Need to do a lookup from the model. + $record = $this->getModel()->getItem($recordId); + + if (empty($record)) + { + return false; + } + $ownerId = $record->created_by; + } + + // If the owner matches 'me' then allow. + if ($ownerId == $user->id) + { + if ($user->authorise('ftp.edit.own', 'com_componentbuilder')) + { + return true; + } + } + } + return false; + } + } + // Since there is no permission, revert to the component permissions. + return $user->authorise('ftp.edit', $this->option); + } + + /** + * Gets the URL arguments to append to an item redirect. + * + * @param integer $recordId The primary key id for the item. + * @param string $urlVar The name of the URL variable for the id. + * + * @return string The arguments to append to the redirect URL. + * + * @since 12.2 + */ + protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') + { + $tmpl = $this->input->get('tmpl'); + $layout = $this->input->get('layout', 'edit', 'string'); + + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); + + // Setup redirect info. + + $append = ''; + + if ($refid) + { + $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + } + elseif ($ref) + { + $append .= '&ref='.(string)$ref; + } + + if ($tmpl) + { + $append .= '&tmpl=' . $tmpl; + } + + if ($layout) + { + $append .= '&layout=' . $layout; + } + + if ($recordId) + { + $append .= '&' . $urlVar . '=' . $recordId; + } + + return $append; + } + + /** + * Method to run batch operations. + * + * @param object $model The model. + * + * @return boolean True if successful, false otherwise and internal error is set. + * + * @since 2.5 + */ + public function batch($model = null) + { + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + + // Set the model + $model = $this->getModel('Ftp', '', array()); + + // Preset the redirect + $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=ftps' . $this->getRedirectToListAppend(), false)); + + return parent::batch($model); + } + + /** + * Method to cancel an edit. + * + * @param string $key The name of the primary key of the URL variable. + * + * @return boolean True if access level checks pass, false otherwise. + * + * @since 12.2 + */ + public function cancel($key = null) + { + // get the referal details + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + $cancel = parent::cancel($key); + + if ($cancel) + { + if ($this->refid) + { + $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + } + else + { + // Redirect to the items screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + ) + ); + } + return $cancel; + } + + /** + * Method to save a record. + * + * @param string $key The name of the primary key of the URL variable. + * @param string $urlVar The name of the URL variable if different from the primary key (sometimes required to avoid router collisions). + * + * @return boolean True if successful, false otherwise. + * + * @since 12.2 + */ + public function save($key = null, $urlVar = null) + { + // get the referal details + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + if ($this->ref || $this->refid) + { + // to make sure the item is checkedin on redirect + $this->task = 'save'; + } + + $saved = parent::save($key, $urlVar); + + if ($this->refid && $saved) + { + $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref && $saved) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + return $saved; + } + + /** + * Function that allows child controller access to model data + * after the data has been saved. + * + * @param JModel &$model The data model object. + * @param array $validData The validated data. + * + * @return void + * + * @since 11.1 + */ + protected function postSaveHook(JModelLegacy $model, $validData = array()) + { + return; + } + +} diff --git a/admin/controllers/ftps.php b/admin/controllers/ftps.php new file mode 100644 index 000000000..9cc9583ec --- /dev/null +++ b/admin/controllers/ftps.php @@ -0,0 +1,111 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import Joomla controlleradmin library +jimport('joomla.application.component.controlleradmin'); + +/** + * Ftps Controller + */ +class ComponentbuilderControllerFtps extends JControllerAdmin +{ + protected $text_prefix = 'COM_COMPONENTBUILDER_FTPS'; + /** + * Proxy for getModel. + * @since 2.5 + */ + public function getModel($name = 'Ftp', $prefix = 'ComponentbuilderModel', $config = array()) + { + $model = parent::getModel($name, $prefix, array('ignore_request' => true)); + + return $model; + } + + public function exportData() + { + // Check for request forgeries + JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); + // check if export is allowed for this user. + $user = JFactory::getUser(); + if ($user->authorise('ftp.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder')) + { + // Get the input + $input = JFactory::getApplication()->input; + $pks = $input->post->get('cid', array(), 'array'); + // Sanitize the input + JArrayHelper::toInteger($pks); + // Get the model + $model = $this->getModel('Ftps'); + // get the data to export + $data = $model->getExportData($pks); + if (ComponentbuilderHelper::checkArray($data)) + { + // now set the data to the spreadsheet + $date = JFactory::getDate(); + ComponentbuilderHelper::xls($data,'Ftps_'.$date->format('jS_F_Y'),'Ftps exported ('.$date->format('jS F, Y').')','ftps'); + } + } + // Redirect to the list screen with error. + $message = JText::_('COM_COMPONENTBUILDER_EXPORT_FAILED'); + $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=ftps', false), $message, 'error'); + return; + } + + + public function importData() + { + // Check for request forgeries + JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); + // check if import is allowed for this user. + $user = JFactory::getUser(); + if ($user->authorise('ftp.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder')) + { + // Get the import model + $model = $this->getModel('Ftps'); + // get the headers to import + $headers = $model->getExImPortHeaders(); + if (ComponentbuilderHelper::checkObject($headers)) + { + // Load headers to session. + $session = JFactory::getSession(); + $headers = json_encode($headers); + $session->set('ftp_VDM_IMPORTHEADERS', $headers); + $session->set('backto_VDM_IMPORT', 'ftps'); + $session->set('dataType_VDM_IMPORTINTO', 'ftp'); + // Redirect to import view. + $message = JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FTPS'); + $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import', false), $message); + return; + } + } + // Redirect to the list screen with error. + $message = JText::_('COM_COMPONENTBUILDER_IMPORT_FAILED'); + $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=ftps', false), $message, 'error'); + return; + } +} diff --git a/admin/controllers/help.php b/admin/controllers/help.php index f5d04461b..5924d05ab 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 75527f0a8..42cf3dfa0 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 22450a754..3ca3796ac 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 97486c338..7891798e9 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 359 of this MVC - @build 23rd August, 2017 + @version @update number 361 of this MVC + @build 24th August, 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 d59ad7248..499378a95 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 359 of this MVC - @build 23rd August, 2017 + @version @update number 361 of this MVC + @build 24th August, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php index 031efecc5..7fb5e4570 100644 --- a/admin/helpers/compiler.php +++ b/admin/helpers/compiler.php @@ -244,7 +244,7 @@ class Compiler extends Infusion protected function setUpdateServer() { // move the update server to host - if ($this->componentData->add_update_server && $this->componentData->update_server_target == 1 && isset($this->updateServerFileName) && $this->dynamicIntegration) + if ($this->componentData->add_update_server == 1 && $this->componentData->update_server_target == 1 && isset($this->updateServerFileName) && $this->dynamicIntegration) { $xml_update_server_path = $this->componentPath.'/'.$this->updateServerFileName.'.xml'; // make sure we have the correct file @@ -423,8 +423,9 @@ class Compiler extends Infusion { JFile::copy($this->filepath, $this->backupPath); } + // move to sales server host - if ($this->componentData->add_sales_server && $this->dynamicIntegration) + if ($this->componentData->add_sales_server == 1 && $this->dynamicIntegration) { // make sure we have the correct file if (isset($this->componentData->sales_server_ftp)) @@ -474,30 +475,31 @@ class Compiler extends Infusion private function getFTP($clientInput) { - $signature = md5($clientInput); - if (isset($this->FTP[$signature]) && $this->FTP[$signature] instanceof JClientFtp) + $s1GnAtnr3 = md5($clientInput); + if (isset($this->FTP[$s1GnAtnr3]) && $this->FTP[$s1GnAtnr3] instanceof JClientFtp) { - return $this->FTP[$signature]; + // return the FTP instance + return $this->FTP[$s1GnAtnr3]; } else { // make sure we have a string and it is not default or empty if (ComponentbuilderHelper::checkString($clientInput)) { - // turn into vars - parse_str($clientInput); + // turn into variables + parse_str($clientInput); // because of this I am using strand variable naming to avoid any collisions. // set options if (isset($options) && ComponentbuilderHelper::checkArray($options)) { - foreach ($options as $option => $value) + foreach ($options as $o__p0t1on => $vAln3) { - if ('timeout' === $option) + if ('timeout' === $o__p0t1on) { - $options[$option] = (int) $value; + $options[$o__p0t1on] = (int) $vAln3; } - if ('type' === $option) + if ('type' === $o__p0t1on) { - $options[$option] = (string) $value; + $options[$o__p0t1on] = (string) $vAln3; } } } @@ -509,8 +511,9 @@ class Compiler extends Infusion if (isset($host) && $host != 'HOSTNAME' && isset($port) && $port != 'PORT_INT' && isset($username) && $username != 'user@name.com' && isset($password) && $password != 'password') { // load for reuse - $this->FTP[$signature] = JClientFtp::getInstance($host, $port, $options, $username, $password); - return $this->FTP[$signature]; + $this->FTP[$s1GnAtnr3] = JClientFtp::getInstance($host, $port, $options, $username, $password); + // return the FTP instance + return $this->FTP[$s1GnAtnr3]; } } } diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index b2baa3d05..3b6f4bd77 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -1032,7 +1032,26 @@ class Get $component->php_dashboard_methods = ''; $component->dashboard_tab = ''; } - + // add the update FTP server sig + if ($component->add_update_server == 1 && is_numeric($component->update_server_ftp) && $component->update_server_ftp > 0) + { + $component->update_server_ftp = ComponentbuilderHelper::getVar('ftp', (int) $component->update_server_ftp, 'id', 'signature'); + } + else + { + $component->update_server_ftp = 0; + } + // add the sales FTP server sig + if ($component->add_sales_server == 1 && is_numeric($component->sales_server_ftp) && $component->sales_server_ftp > 0) + { + $component->sales_server_ftp = ComponentbuilderHelper::getVar('ftp', (int) $component->sales_server_ftp, 'id', 'signature'); + } + else + { + $component->sales_server_ftp = 0; + $component->add_sales_server = 0; + } + // return the found component data return $component; } diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 8b0131f96..af072f1af 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -3117,7 +3117,7 @@ class Interpretation extends Fields { $this->onlyFunctionButton[$viewsName] = array(); } - $this->onlyFunctionButton[$viewsName][] = "\t".$tab."if (\$this->user->authorise('".$viewName.".".$keyCode."'))"; + $this->onlyFunctionButton[$viewsName][] = "\t".$tab."if (\$this->user->authorise('".$viewName.".".$keyCode."', 'com_".$this->fileContentStatic['###component###']."'))"; $this->onlyFunctionButton[$viewsName][] = "\t".$tab."{"; $this->onlyFunctionButton[$viewsName][] = "\t".$tab."\t//".$this->setLine(__LINE__)." add ".$custom_button['name']." button."; $this->onlyFunctionButton[$viewsName][] = "\t".$tab."\tJToolBarHelper::custom('".$viewsName.".".$custom_button['method']."', '".$custom_button['icomoon']."', '', '".$keyLang."', false);"; @@ -3125,7 +3125,7 @@ class Interpretation extends Fields } else { - $buttons[] = "\t".$tab."\tif (\$this->user->authorise('".$viewName.".".$keyCode."'))"; + $buttons[] = "\t".$tab."\tif (\$this->user->authorise('".$viewName.".".$keyCode."', 'com_".$this->fileContentStatic['###component###']."'))"; $buttons[] = "\t".$tab."\t{"; $buttons[] = "\t".$tab."\t\t//".$this->setLine(__LINE__)." add ".$custom_button['name']." button."; $buttons[] = "\t".$tab."\t\tJToolBarHelper::custom('".$viewsName.".".$custom_button['method']."', '".$custom_button['icomoon']."', '', '".$keyLang."', false);"; @@ -6628,7 +6628,7 @@ class Interpretation extends Fields /** * @param $args - */ + */ public function setLinkedView($args) { /** @@ -6676,22 +6676,44 @@ class Interpretation extends Fields { list($parent_key) = explode('-',$parentKey); } + elseif(strpos($parentKey, '-OR>') !== false) + { + // this is not good... (TODO) + $parent_keys = explode('-OR>',$parentKey); + } else { $parent_key = $parentKey; } + if(strpos($key, '-R>') !== false || strpos($key, '-A>') !== false) { list($_key) = explode('-',$key); } + elseif(strpos($key, '-OR>') !== false) + { + $_key = str_replace('-OR>', '',$key); + } else { $_key = $key; } - // set the global key - $globalKey = ComponentbuilderHelper::safeString($_key.$this->uniquekey(4)); // ###LINKEDVIEWGLOBAL### <<>> - $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWGLOBAL###'] .= PHP_EOL."\t\t\$this->".$globalKey." = \$item->".$parent_key.";"; + if (isset($parent_keys) && ComponentbuilderHelper::checkArray($parent_keys)) + { + $globalKey = array(); + foreach ($parent_keys as $parent_key) + { + $globalKey[$parent_key] = ComponentbuilderHelper::safeString($_key.$this->uniquekey(4)); + $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWGLOBAL###'] .= PHP_EOL."\t\t\$this->".$globalKey[$parent_key]." = \$item->".$parent_key.";"; + } + } + else + { + // set the global key + $globalKey = ComponentbuilderHelper::safeString($_key.$this->uniquekey(4)); + $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWGLOBAL###'] .= PHP_EOL."\t\t\$this->".$globalKey." = \$item->".$parent_key.";"; + } // ###LINKEDVIEWMETHODS### <<>> $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] .= $this->setListQueryLinked($single, $list, $functionName, $key, $_key, $parentKey, $parent_key, $globalKey); } @@ -7221,7 +7243,9 @@ class Interpretation extends Fields $query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, PHP_EOL.PHP_EOL); // add the custom fields query $query .= $this->setCustomQuery($viewName_list, $viewName_single); - if ($key && strpos($key,'-R>') === false && strpos($key,'-A>') === false && strpos($parentKey,'-R>') === false && strpos($parentKey,'-A>') === false) + if (ComponentbuilderHelper::checkString($globalKey) && + $key && strpos($key,'-R>') === false && strpos($key,'-A>') === false && strpos($key,'-OR>') === false && + $parentKey && strpos($parentKey,'-R>') === false && strpos($parentKey,'-A>') === false && strpos($parentKey,'-OR>') === false) { $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." global."; $query .= PHP_EOL."\t\t\$".$globalKey." = \$this->".$globalKey.";"; @@ -7238,6 +7262,48 @@ class Interpretation extends Fields $query .= PHP_EOL."\t\t\t\$query->where('a.".$key." = -5');"; $query .= PHP_EOL."\t\t}"; } + elseif (strpos($parentKey,'-OR>') !== false || strpos($key,'-OR>') !== false) + { + // get both strings + if (strpos($key,'-OR>') !== false) + { + $ORarray = explode('-OR>', $key); + } + else + { + $ORarray = array($key); + } + // make sure we have an array + if (!ComponentbuilderHelper::checkArray($globalKey)) + { + $globalKey = array($globalKey); + } + // now load the query (this may be to much... but hey let it write the code :) + foreach ($globalKey as $_globalKey) + { + // now build the query + $ORquery = array('s' => array(), 'i' => array()); + foreach ($ORarray as $ORkey) + { + $ORquery['i'][] = "a.".$ORkey." = ' . (int) \$".$_globalKey; + $ORquery['s'][] = "a.".$ORkey." = ' . \$db->quote(\$".$_globalKey.")"; + } + $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Filter by ".$_globalKey." global."; + $query .= PHP_EOL."\t\t\$".$_globalKey." = \$this->".$_globalKey.";"; + $query .= PHP_EOL."\t\tif (is_numeric(\$".$_globalKey." ))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$query->where('" . implode(" . ' OR ", $ORquery['i']) . ", ' OR');"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL."\t\telseif (is_string(\$".$_globalKey."))"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$query->where('" . implode(" . ' OR ", $ORquery['s']) . ", ' OR');"; + $query .= PHP_EOL."\t\t}"; + $query .= PHP_EOL."\t\telse"; + $query .= PHP_EOL."\t\t{"; + $query .= PHP_EOL."\t\t\t\$query->where('a.".$ORkey." = -5');"; + $query .= PHP_EOL."\t\t}"; + } + } if (isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single])) { $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Join over the asset groups."; @@ -7269,7 +7335,7 @@ class Interpretation extends Fields // ###SELECTIONTRANSLATIONFIX### <<>> $query .= $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###'],"\t"); // filter by child repetable field values - if ($key && strpos($key,'-R>') !== false && strpos($key,'-A>') === false) + if (ComponentbuilderHelper::checkString($globalKey) && $key && strpos($key,'-R>') !== false && strpos($key,'-A>') === false) { list($field,$target) = explode('-R>',$key); $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." in this Repetable Field"; @@ -7299,7 +7365,7 @@ class Interpretation extends Fields $query .= PHP_EOL."\t\t\t}"; } // filter by child array field values - if ($key && strpos($key,'-R>') === false && strpos($key,'-A>') !== false) + if (ComponentbuilderHelper::checkString($globalKey) && $key && strpos($key,'-R>') === false && strpos($key,'-A>') !== false) { $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." Array Field"; $query .= PHP_EOL."\t\t\t\$".$globalKey." = \$this->".$globalKey.";"; @@ -7347,7 +7413,7 @@ class Interpretation extends Fields } // filter by parent repetable field values - if ($key && strpos($parentKey,'-R>') !== false && strpos($parentKey,'-A>') === false) + if (ComponentbuilderHelper::checkString($globalKey) && $key && strpos($parentKey,'-R>') !== false && strpos($parentKey,'-A>') === false) { list($bin,$target) = explode('-R>',$parentKey); $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Filter by ".$_key." Repetable Field"; @@ -7377,7 +7443,7 @@ class Interpretation extends Fields $query .= PHP_EOL."\t\t\t}"; } // filter by parent array field values - if ($key && strpos($parentKey,'-R>') === false && strpos($parentKey,'-A>') !== false) + if (ComponentbuilderHelper::checkString($globalKey) && $key && strpos($parentKey,'-R>') === false && strpos($parentKey,'-A>') !== false) { $query .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." Array Field"; $query .= PHP_EOL."\t\t\t\$".$globalKey." = \$this->".$globalKey.";"; diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index f4cab24f6..b08ed156e 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -41,6 +41,11 @@ abstract class ComponentbuilderHelper self::loadSession(); } + /** + * The global params + **/ + protected static $params = false; + /* * get all component IDs */ @@ -209,31 +214,6 @@ abstract class ComponentbuilderHelper fclose($fh); return $klaar; } - - /** - * The user notice info File Name - **/ - protected static $usernotice = false; - - /** - * The backup hash file name - **/ - protected static $backuphash = false; - - public static function getFilePath($type, $name = 'listing', $key = '', $fileType = '.json', $PATH = JPATH_COMPONENT_SITE) - { - if (!self::checkString(self::${$type.$name})) - { - // Get local key - $localkey = self::getLocalKey(); - // set the name - $fileName = md5($type.$name.$localkey.$key); - // set file path - self::${$type.$name} = $PATH.'/helpers/'.$fileName.$fileType; - } - // return the path - return self::${$type.$name}; - } public static function getFieldOptions($value, $type, $settings = array()) { @@ -1162,13 +1142,13 @@ abstract class ComponentbuilderHelper /** * check if it is a new hash **/ - public static function newHash($hash, $name = 'backup', $type = 'hash', $key = '', $fileType = '.txt') + public static function newHash($hash, $name = 'backup', $type = 'hash', $key = '', $fileType = 'txt') { // make sure we have a hash if (self::checkString($hash)) { // first get the file path - $path_filename = self::getFilePath($name, $type, $key, $fileType, JPATH_COMPONENT_ADMINISTRATOR); + $path_filename = self::getFilePath('path', $name.$type, $fileType, $key, JPATH_COMPONENT_ADMINISTRATOR); // set as read if not already set if (($content = @file_get_contents($path_filename)) !== FALSE) { @@ -1182,6 +1162,71 @@ abstract class ComponentbuilderHelper } return false; } + + /** + * Get the file path or url + * + * @param string $type The (url/path) type to return + * @param string $target The Params Target name (if set) + * @param string $fileType The kind of filename to generate (if not set no file name is generated) + * @param string $key The key to adjust the filename (if not set ignored) + * @param string $default The default path if not set in Params (fallback path) + * @param bool $createIfNotSet The switch to create the folder if not found + * + * @return string On success the path or url is returned based on the type requested + * + */ + public static function getFilePath($type = 'path', $target = 'filepath', $fileType = null, $key = '', $default = JPATH_SITE . '/images/', $createIfNotSet = true) + { + // get the global settings + if (!self::checkObject(self::$params)) + { + self::$params = JComponentHelper::getParams('com_componentbuilder'); + } + $filePath = self::$params->get($target, $default); + // check the file path (revert to default only of not a hidden file path) + if ('hiddenfilepath' !== $target && strpos($filePath, JPATH_SITE) === false) + { + $filePath = JPATH_SITE . '/images/'; + } + jimport('joomla.filesystem.folder'); + // create the folder if it does not exist + if ($createIfNotSet && !JFolder::exists($filePath)) + { + JFolder::create($filePath); + } + // setup the file name + $fileName = ''; + if (self::checkString($fileType)) + { + // Get basic key + $basickey = 'Th!s_iS_n0t_sAfe_buT_b3tter_then_n0thiug'; + if (method_exists(get_called_class(), "getCryptKey")) + { + $basickey = self::getCryptKey('basic', $basickey); + } + // check the key + if (self::checkString($key)) + { + $key = 'vDm'; + } + // set the name + $fileName = trim(md5($type.$target.$basickey.$key) . '.' . trim($fileType, '.')); + } + // return the url + if ($type === 'url') + { + if (strpos($filePath, JPATH_SITE) !== false) + { + $filePath = trim( str_replace( JPATH_SITE, '', $filePath), '/'); + return JURI::root() . $filePath . '/' . $fileName; + } + // since the path is behind the root folder of the site, return only the root url (may be used to build the link) + return JURI::root(); + } + // sanitize the path + return '/' . trim( $filePath, '/' ) . '/' . $fileName; + } /** * Load the Component xml manifest. **/ @@ -1369,6 +1414,10 @@ abstract class ComponentbuilderHelper { JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_LANGUAGES'), 'index.php?option=com_componentbuilder&view=languages', $submenu === 'languages'); } + if ($user->authorise('ftp.access', 'com_componentbuilder') && $user->authorise('ftp.submenu', 'com_componentbuilder')) + { + JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_FTPS'), 'index.php?option=com_componentbuilder&view=ftps', $submenu === 'ftps'); + } if ($user->authorise('help_document.access', 'com_componentbuilder') && $user->authorise('help_document.submenu', 'com_componentbuilder')) { JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_HELP_DOCUMENTS'), 'index.php?option=com_componentbuilder&view=help_documents', $submenu === 'help_documents'); diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index 28c888b25..e697f67a6 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilderemail.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 8ed81d711..e46b98b5b 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 b4d717f6d..eb33964e6 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 198313195..987cdbff2 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index deae64628..34f97d2b6 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index eccefec58..53683dea0 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 7e128f209..f5d87f5fc 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -243,6 +243,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_LABEL="Description" COM_COMPONENTBUILDER_ADMIN_VIEW_DOWNLOAD="Download" COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP="Dump" COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT="Editing the Admin View" +COM_COMPONENTBUILDER_ADMIN_VIEW_EDITING="Editing" COM_COMPONENTBUILDER_ADMIN_VIEW_ENTER="Enter" COM_COMPONENTBUILDER_ADMIN_VIEW_ENVELOPE="Envelope" COM_COMPONENTBUILDER_ADMIN_VIEW_ENVELOPE_OPENED="Envelope Opened" @@ -413,6 +414,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NEW_TAB="New Tab" COM_COMPONENTBUILDER_ADMIN_VIEW_NEW_TAB_TWO="New Tab 2" COM_COMPONENTBUILDER_ADMIN_VIEW_NEXT="Next" COM_COMPONENTBUILDER_ADMIN_VIEW_NO="No" +COM_COMPONENTBUILDER_ADMIN_VIEW_NONE="None" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION="

The scripts that are automatic added to the input fields below is identical to the default import scripts used. Adapt them to your own custom needs.

" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL="Advanced notice." COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION="

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

" @@ -448,7 +450,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PAUSE_CIRCLE="Pause Circle" COM_COMPONENTBUILDER_ADMIN_VIEW_PENCIL="Pencil" COM_COMPONENTBUILDER_ADMIN_VIEW_PENCIL_TWO="Pencil 2" COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION="Permissions" -COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION_DESCRIPTION="Should permission be used." +COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION_DESCRIPTION="What permission to use." COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION_LABEL="Permissions" COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE="Phone" COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE_TWO="Phone 2" @@ -1655,6 +1657,7 @@ COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES="Fieldtypes

" COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES_CATID="Category  For
Fieldtypes" COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPE_ADD="Add Fieldtype

" COM_COMPONENTBUILDER_DASHBOARD_FIELD_ADD="Add Field

" +COM_COMPONENTBUILDER_DASHBOARD_FTPS="Ftps

" COM_COMPONENTBUILDER_DASHBOARD_HELP_DOCUMENTS="Help Documents

" COM_COMPONENTBUILDER_DASHBOARD_HELP_DOCUMENT_ADD="Add Help Document

" COM_COMPONENTBUILDER_DASHBOARD_JOOMLA_COMPONENTS="Joomla Components

" @@ -2288,6 +2291,90 @@ COM_COMPONENTBUILDER_FIELD_XML_LABEL="XML field definition (Please set the field COM_COMPONENTBUILDER_FIELD_YES="Yes" COM_COMPONENTBUILDER_FIELD_ZERO="0" COM_COMPONENTBUILDER_FORCE_LOCAL_UPDATE="Force Local Update" +COM_COMPONENTBUILDER_FTP="FTP" +COM_COMPONENTBUILDER_FTPS="FTP's" +COM_COMPONENTBUILDER_FTPS_ACCESS="Ftps Access" +COM_COMPONENTBUILDER_FTPS_ACCESS_DESC="Allows the users in this group to access access ftps" +COM_COMPONENTBUILDER_FTPS_BATCH_OPTIONS="Batch process the selected FTP's" +COM_COMPONENTBUILDER_FTPS_BATCH_TIP="All changes will be applied to all selected FTP's" +COM_COMPONENTBUILDER_FTPS_BATCH_USE="Ftps Batch Use" +COM_COMPONENTBUILDER_FTPS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch ftps" +COM_COMPONENTBUILDER_FTPS_CREATE="Ftps Create" +COM_COMPONENTBUILDER_FTPS_CREATE_DESC="Allows the users in this group to create create ftps" +COM_COMPONENTBUILDER_FTPS_DASHBOARD_LIST="Ftps Dashboard List" +COM_COMPONENTBUILDER_FTPS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the ftp" +COM_COMPONENTBUILDER_FTPS_DELETE="Ftps Delete" +COM_COMPONENTBUILDER_FTPS_DELETE_DESC="Allows the users in this group to delete delete ftps" +COM_COMPONENTBUILDER_FTPS_EDIT="Ftps Edit" +COM_COMPONENTBUILDER_FTPS_EDIT_CREATED_BY="Ftps Edit Created By" +COM_COMPONENTBUILDER_FTPS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by ftps" +COM_COMPONENTBUILDER_FTPS_EDIT_CREATED_DATE="Ftps Edit Created Date" +COM_COMPONENTBUILDER_FTPS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created ftps" +COM_COMPONENTBUILDER_FTPS_EDIT_DESC="Allows the users in this group to edit the ftp" +COM_COMPONENTBUILDER_FTPS_EDIT_NAME="Ftps Edit Name" +COM_COMPONENTBUILDER_FTPS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the ftp" +COM_COMPONENTBUILDER_FTPS_EDIT_OWN="Ftps Edit Own" +COM_COMPONENTBUILDER_FTPS_EDIT_OWN_DESC="Allows the users in this group to edit edit own ftps created by them" +COM_COMPONENTBUILDER_FTPS_EDIT_SIGNATURE="Ftps Edit Signature" +COM_COMPONENTBUILDER_FTPS_EDIT_SIGNATURE_DESC="Allows the users in this group to update the edit signature of the ftp" +COM_COMPONENTBUILDER_FTPS_EDIT_STATE="Ftps Edit State" +COM_COMPONENTBUILDER_FTPS_EDIT_STATE_DESC="Allows the users in this group to update the state of the ftp" +COM_COMPONENTBUILDER_FTPS_EDIT_VERSION="Ftps Edit Version" +COM_COMPONENTBUILDER_FTPS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version ftps" +COM_COMPONENTBUILDER_FTPS_EXPORT="Ftps Export" +COM_COMPONENTBUILDER_FTPS_EXPORT_DESC="Allows the users in this group to export export ftps" +COM_COMPONENTBUILDER_FTPS_IMPORT="Ftps Import" +COM_COMPONENTBUILDER_FTPS_IMPORT_DESC="Allows the users in this group to import import ftps" +COM_COMPONENTBUILDER_FTPS_N_ITEMS_ARCHIVED="%s FTP's archived." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_ARCHIVED_1="%s FTP archived." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_CHECKED_IN_0="No FTP successfully checked in." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_CHECKED_IN_1="%d FTP successfully checked in." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_CHECKED_IN_MORE="%d FTP's successfully checked in." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_DELETED="%s FTP's deleted." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_DELETED_1="%s FTP deleted." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_FEATURED="%s FTP's featured." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_FEATURED_1="%s FTP featured." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_PUBLISHED="%s FTP's published." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_PUBLISHED_1="%s FTP published." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_TRASHED="%s FTP's trashed." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_TRASHED_1="%s FTP trashed." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_UNFEATURED="%s FTP's unfeatured." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_UNFEATURED_1="%s FTP unfeatured." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_UNPUBLISHED="%s FTP's unpublished." +COM_COMPONENTBUILDER_FTPS_N_ITEMS_UNPUBLISHED_1="%s FTP unpublished." +COM_COMPONENTBUILDER_FTPS_SUBMENU="Ftps Submenu" +COM_COMPONENTBUILDER_FTPS_SUBMENU_DESC="Allows the users in this group to update the submenu of the ftp" +COM_COMPONENTBUILDER_FTP_CREATED_BY_DESC="The user that created this FTP." +COM_COMPONENTBUILDER_FTP_CREATED_BY_LABEL="Created By" +COM_COMPONENTBUILDER_FTP_CREATED_DATE_DESC="The date this FTP was created." +COM_COMPONENTBUILDER_FTP_CREATED_DATE_LABEL="Created Date" +COM_COMPONENTBUILDER_FTP_DETAILS="Details" +COM_COMPONENTBUILDER_FTP_EDIT="Editing the FTP" +COM_COMPONENTBUILDER_FTP_ERROR_UNIQUE_ALIAS="Another FTP has the same alias." +COM_COMPONENTBUILDER_FTP_ID="Id" +COM_COMPONENTBUILDER_FTP_LINKED_COMPONENTS="Linked Components" +COM_COMPONENTBUILDER_FTP_MODIFIED_BY_DESC="The last user that modified this FTP." +COM_COMPONENTBUILDER_FTP_MODIFIED_BY_LABEL="Modified By" +COM_COMPONENTBUILDER_FTP_MODIFIED_DATE_DESC="The date this FTP was modified." +COM_COMPONENTBUILDER_FTP_MODIFIED_DATE_LABEL="Modified Date" +COM_COMPONENTBUILDER_FTP_NAME="Name" +COM_COMPONENTBUILDER_FTP_NAME_DESCRIPTION="Enter Name Here" +COM_COMPONENTBUILDER_FTP_NAME_HINT="Name Here" +COM_COMPONENTBUILDER_FTP_NAME_LABEL="Name" +COM_COMPONENTBUILDER_FTP_NEW="A New FTP" +COM_COMPONENTBUILDER_FTP_NOTE_FTP_SIGNATURE_DESCRIPTION="Add your FTP signature in the given field.
Here are the details of the signature:
   string $host = '127.0.0.1'
   string $port = '21'
   array $options = array()
   string $user = null
   string $pass = null
   OPTIONS = Array with any of these options:
      type=>[FTP_AUTOASCII|FTP_ASCII|FTP_BINARY]
      timeout=>(int)
Here is an example signature:
host=HOSTNAME&port=PORT_INT&options[type]=FTP_BINARY&options[timeout]=15&username=user@name.com&password=password" +COM_COMPONENTBUILDER_FTP_NOTE_FTP_SIGNATURE_LABEL="The FTP Signature Details" +COM_COMPONENTBUILDER_FTP_ORDERING_LABEL="Ordering" +COM_COMPONENTBUILDER_FTP_PERMISSION="Permissions" +COM_COMPONENTBUILDER_FTP_PUBLISHING="Publishing" +COM_COMPONENTBUILDER_FTP_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the FTP to customise the alias." +COM_COMPONENTBUILDER_FTP_SIGNATURE="Signature" +COM_COMPONENTBUILDER_FTP_SIGNATURE_DESCRIPTION="The FTP login details needed. If the basic key was not set when you created this FTP signature, then add the basic key, come back here and save this FTP signature again to ensure that it gets encrypted." +COM_COMPONENTBUILDER_FTP_SIGNATURE_HINT="host=HOSTNAME&port=PORT_INT&options[type]=FTP_BINARY&options[timeout]=15&username=user@name.com&password=password" +COM_COMPONENTBUILDER_FTP_SIGNATURE_LABEL="FTP Server (Signature)
(encrypted field)
This field is only encrypted if your basic key in the JCB global settings is set." +COM_COMPONENTBUILDER_FTP_STATUS="Status" +COM_COMPONENTBUILDER_FTP_VERSION_DESC="A count of the number of times this FTP has been revised." +COM_COMPONENTBUILDER_FTP_VERSION_LABEL="Revision" COM_COMPONENTBUILDER_GET_THE_KEY_FROM_BSB_FOR_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA="Get the key from %s for %s" COM_COMPONENTBUILDER_GLOBAL="Global" COM_COMPONENTBUILDER_GREAT_THIS_FUNCTION_NAME_WILL_WORK="Great, this function name will work!" @@ -2439,6 +2526,7 @@ COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CUSTOM_CODES="Select the file to imp COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_DYNAMIC_GETS="Select the file to import data to dynamic_gets." COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FIELDS="Select the file to import data to fields." COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FIELDTYPES="Select the file to import data to fieldtypes." +COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FTPS="Select the file to import data to ftps." COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_HELP_DOCUMENTS="Select the file to import data to help_documents." COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_JOOMLA_COMPONENTS="Select the file to import data to joomla_components." COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGES="Select the file to import data to languages." @@ -2954,8 +3042,8 @@ Project duration: **###projectWeekTime### weeks** or **###projectMonthTime### mo * Ethereum: 0x243392daa3c9c8bc841fcacf7c7f72541cb16823 " COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_LABEL="Demo README (with all place-holders)" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION="Add your FTP signature in the given field and during compilation the file will be moved to the FTP folder. You still need to point the above update server url to the xml file on your FTP server for it to work correctly.
Here are the details of the signature:
   string $host = '127.0.0.1'
   string $port = '21'
   array $options = array()
   string $user = null
   string $pass = null
   OPTIONS = Array with any of these options:
      type=>[FTP_AUTOASCII|FTP_ASCII|FTP_BINARY]
      timeout=>(int)
Here is an example signature:
host=HOSTNAME&port=PORT_INT&options[type]=FTP_BINARY&options[timeout]=15&username=user@name.com&password=password" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL="The FTP Option" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION="During compilation the file will be moved to the FTP folder. You still need to point the above update server url to the xml file on your FTP server for it to work correctly." +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL="Select the FTP server used for your update server." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION="Not really sure what other options to add.... so let me know. For now this option does not really do anything except adding the link above to your component as an update server. So it really could be called the manual option, since you will need to set the update server your self. You still need to point the above update server url to the manually created xml file for it to work correctly." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL="The Other Options" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION="The update server XML file will be added to the zipped package during compilation. You still need to point the above update server url to the xml wherever you have placed the files online." @@ -3060,9 +3148,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL="README.md" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RENAME_LABEL="Rename" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REPLY="Reply" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_FTP="Sales Server Ftp" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_FTP_DESCRIPTION="The FTP details for the update server XML location. (string $host = '127.0.0.1', string $port = '21', array $options = array(), string $user = null, string $pass = null) OPTIONS = Array with any of these options: type=>[FTP_AUTOASCII|FTP_ASCII|FTP_BINARY], timeout=>(int)" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_FTP_HINT="host=HOSTNAME&port=PORT_INT&options[type]=FTP_BINARY&options[timeout]=15&username=user@name.com&password=password" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_FTP_LABEL="Sales Server FTP
(encrypted field)" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_FTP_DESCRIPTION="Select your sales server (FTP) for this component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_FTP_LABEL="Sales Server (FTP)" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SAVE_COPY="Save Copy" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SAVE_NEW="Save New" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Joomla Component to customise the alias." @@ -3142,9 +3229,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATES_USED_IN_JOOMLA_UPDATER="Updates (u COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER="Update Server" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_DESCRIPTION="Enter Update Server URL" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_FTP="Update Server Ftp" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_FTP_DESCRIPTION="The FTP details for the update server XML location." -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_FTP_HINT="host=HOSTNAME&port=PORT_INT&options[type]=FTP_BINARY&options[timeout]=15&username=user@name.com&password=password" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_FTP_LABEL="Update Server FTP
(encrypted field)" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_FTP_DESCRIPTION="Select your update server (FTP) for this component." +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_FTP_LABEL="Update Server (FTP)" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_HINT="http://www.example.com/update/component.xml" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_LABEL="Update Server" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_TARGET="Update Server Target" @@ -4039,6 +4125,7 @@ COM_COMPONENTBUILDER_SUBMENU_DASHBOARD="Dashboard" COM_COMPONENTBUILDER_SUBMENU_DYNAMIC_GETS="Dynamic Gets" COM_COMPONENTBUILDER_SUBMENU_FIELDS="Fields" COM_COMPONENTBUILDER_SUBMENU_FIELDTYPES="Fieldtypes" +COM_COMPONENTBUILDER_SUBMENU_FTPS="FTP's" COM_COMPONENTBUILDER_SUBMENU_HELP_DOCUMENTS="Help Documents" COM_COMPONENTBUILDER_SUBMENU_JOOMLA_COMPONENTS="Joomla Components" COM_COMPONENTBUILDER_SUBMENU_LANGUAGES="Languages" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 87dcb3953..c2f8a278b 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 60e3d419a..1303eab57 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 8445d42dd..b92990a15 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 cdf958976..aa34effbe 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 9763a520b..66611850b 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 6000be73f..7803b079a 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 b83ca9ca5..dbc25b094 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index ee20e1f96..b8ddbb8a9 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 8dd8f0bf8..acbb0def1 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e56140549..67d21863d 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e80b73b9f..48bd99022 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 a115e48f1..cbdfe228c 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 339194593..8530ffc03 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 116d3130b..a7399505d 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6bef75787..ec581bade 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6d7fde348..1a5718b0b 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 7b8036fe9..29039850c 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 8445d42dd..b92990a15 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 ffb03d916..6186c209c 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 98a185f4c..aa3d042d5 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 ab21e7e30..e00bcb565 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 66c8b3945..edfd5ca4c 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 d2ac727d1..6b0536762 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 ae2c72025..287c91f5a 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 894a6aa44..bb888edea 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 72cfb66fb..46eff3008 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index e80b73b9f..48bd99022 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 82a12e6cf..fcfcb8dc0 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 af796cf88..5a7ca75e5 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 91bfbd0bc..a74d1b9ad 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e25b1ff87..0a3dabef4 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 894a6aa44..bb888edea 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e80b73b9f..48bd99022 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 cac0d9c17..ceabaa092 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 f344db730..0708a84cc 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 9cc58efd5..d11898972 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index 18ce49833..fe4597c24 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_above.php diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index 502778f2b..01850b94e 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index 54e219092..bfe9bbd25 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_left.php diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index ccb630088..1ec2dad71 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_right.php diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index e0701ce78..fbbac0310 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index e80b73b9f..48bd99022 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 77a28ad98..41b0f729a 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 7db6d741a..f5a457359 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 c9d064537..7d67a7b80 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 894a6aa44..bb888edea 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e65944b6a..62d52dc0b 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_admin_views_fullwidth.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index e80b73b9f..48bd99022 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 50bfc1e19..5595f96e7 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 dba655afc..9de42a952 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 2694ea2ff..42aaa4fdf 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 c3dfc06c5..b2586bc94 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 9bee0c30f..a44b1e173 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index e80b73b9f..48bd99022 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 new file mode 100644 index 000000000..11588147f --- /dev/null +++ b/admin/layouts/ftp/details_above.php @@ -0,0 +1,41 @@ + + @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 = array( + 'name' +); + +?> +
+ renderField($field); + } ?> +
diff --git a/admin/layouts/ftp/details_fullwidth.php b/admin/layouts/ftp/details_fullwidth.php new file mode 100644 index 000000000..ebfd814a8 --- /dev/null +++ b/admin/layouts/ftp/details_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( + 'note_ftp_signature', + 'signature' +); + +?> +
+ +
+
+ getLabel($field); ?> +
+
+ getInput($field); ?> +
+
+ +
diff --git a/admin/layouts/ftp/index.html b/admin/layouts/ftp/index.html new file mode 100644 index 000000000..fa6d84e80 --- /dev/null +++ b/admin/layouts/ftp/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php new file mode 100644 index 000000000..de1a28f6f --- /dev/null +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -0,0 +1,138 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +// set the defaults +$items = $displayData->waclinked_components; +$user = JFactory::getUser(); +$id = $displayData->item->id; +$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; + +?> +
+ + + + + + + + + + + + + + + + $item): ?> + authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; + $userChkOut = JFactory::getUser($item->checked_out); + $canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components'); + ?> + + + + + + + + published == 1):?> + + published == 0):?> + + published == 2):?> + + published == -2):?> + + + + + + +
+ + + + + + + + + + + + + + + +
+ get('core.edit')): ?> + escape($item->system_name); ?> + checked_out): ?> + name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> + + +
escape($item->system_name); ?>
+ + 		+ escape($item->name_code); ?> + + escape($item->component_version); ?> + + escape($item->short_description); ?> + + escape($item->companyname); ?> + + escape($item->author); ?> + + + + + + + + + + + + + + + + + + id; ?> +
+ +
+ +
+ +
diff --git a/admin/layouts/ftp/publishing.php b/admin/layouts/ftp/publishing.php new file mode 100644 index 000000000..48bd99022 --- /dev/null +++ b/admin/layouts/ftp/publishing.php @@ -0,0 +1,58 @@ + + @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'); + +$app = JFactory::getApplication(); +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'created', + 'created_by', + 'modified', + 'modified_by' +); + +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + +foreach ($fields as $field) +{ + $field = is_array($field) ? $field : array($field); + foreach ($field as $f) + { + if ($form->getField($f)) + { + if (in_array($f, $hiddenFields)) + { + $form->setFieldAttribute($f, 'type', 'hidden'); + } + + echo $form->renderField($f); + break; + } + } +} diff --git a/admin/layouts/ftp/publlshing.php b/admin/layouts/ftp/publlshing.php new file mode 100644 index 000000000..ef5c3b358 --- /dev/null +++ b/admin/layouts/ftp/publlshing.php @@ -0,0 +1,60 @@ + + @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'); + +$app = JFactory::getApplication(); +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'published', + 'ordering', + 'access', + 'version', + 'hits', + 'id' +); + +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + +foreach ($fields as $field) +{ + $field = is_array($field) ? $field : array($field); + foreach ($field as $f) + { + if ($form->getField($f)) + { + if (in_array($f, $hiddenFields)) + { + $form->setFieldAttribute($f, 'type', 'hidden'); + } + + echo $form->renderField($f); + break; + } + } +} diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 5041198e2..d893a3be7 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 95e5f7e68..d0653adc0 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 f0958e010..42fa5c2ca 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 b46b10d35..94ac740a8 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 894a6aa44..bb888edea 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e80b73b9f..48bd99022 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 044e99e91..f3f4b751a 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 b38a77408..a4e09531d 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index 3db83f7bd..4587d48d8 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index 98a185f4c..aa3d042d5 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6b027dc1f..6517302e4 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 34e08195b..7ae754595 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 894a6aa44..bb888edea 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 3f01dbe60..0fce95ef0 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index ad8733b9f..cfdc18ef2 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e28b33dcb..b681d4048 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index d1c300244..ab445e4a2 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 fecec07ea..547559345 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e80b73b9f..48bd99022 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/joomla_component/publlshing.php +++ b/admin/layouts/joomla_component/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 0c4459c7b..89878ded6 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 bc2a81bd2..95a810610 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 cfd40b41e..e5585925a 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 ed438cadd..ce00880f7 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 9d0f1afc1..b7492ae32 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php index 21fe83fc1..697fbab94 100644 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ b/admin/layouts/joomla_component/translation_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage translation_fullwidth.php diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index e3cf25925..0c48d7a69 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 53b879110..e15ec9a4f 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e80b73b9f..48bd99022 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 c50ec0615..eebc9107c 100644 --- a/admin/layouts/language_translation/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 9eb97206a..a7ceebe6b 100644 --- a/admin/layouts/language_translation/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e80b73b9f..48bd99022 100644 --- a/admin/layouts/language_translation/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/language_translation/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 668ed5c03..d5621094a 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 ba2ab01dc..b53aeaa1a 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 9afdf990d..6ccf1586d 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e39aeff1d..724571822 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6f7cb2d68..af5e939c3 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 894a6aa44..bb888edea 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e80b73b9f..48bd99022 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 7b8036fe9..29039850c 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 bde4e62b9..5355d803a 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 b251e5cec..556150db3 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 98a185f4c..aa3d042d5 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 ab21e7e30..e00bcb565 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 66c8b3945..edfd5ca4c 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e39aeff1d..724571822 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 ae2c72025..287c91f5a 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 894a6aa44..bb888edea 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 65af344a2..7fbc26899 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 f366f920a..cb5594357 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.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index f774d64fc..a94da30a5 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e80b73b9f..48bd99022 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 189fc6075..46f56cedd 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 a701c98dc..fb4bc4c88 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 caea0b65b..ffa640730 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e80b73b9f..48bd99022 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 668ed5c03..d5621094a 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 34a0b2e2a..823d99643 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 9afdf990d..6ccf1586d 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e39aeff1d..724571822 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6f7cb2d68..af5e939c3 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 894a6aa44..bb888edea 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 e80b73b9f..48bd99022 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6754d5e40..ef5c3b358 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index b0e7830fb..4eb7fb227 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -51,7 +51,7 @@ class ComponentbuilderModelAjax extends JModelList public function isNew($notice) { // first get the file path - $path_filename = ComponentbuilderHelper::getFilePath('user', 'notice', JFactory::getUser()->username, $fileType = '.md', JPATH_COMPONENT_ADMINISTRATOR); + $path_filename = ComponentbuilderHelper::getFilePath('path', 'usernotice', 'md', JFactory::getUser()->username, JPATH_COMPONENT_ADMINISTRATOR); // check if the file is set if (($content = @file_get_contents($path_filename)) !== FALSE) { @@ -69,7 +69,7 @@ class ComponentbuilderModelAjax extends JModelList public function isRead($notice) { // first get the file path - $path_filename = ComponentbuilderHelper::getFilePath('user', 'notice', JFactory::getUser()->username, $fileType = '.md', JPATH_COMPONENT_ADMINISTRATOR); + $path_filename = ComponentbuilderHelper::getFilePath('path', 'usernotice', 'md', JFactory::getUser()->username, JPATH_COMPONENT_ADMINISTRATOR); // set as read if not already set if (($content = @file_get_contents($path_filename)) !== FALSE) { diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 1a5ffe5de..f5d20a379 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -43,7 +43,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList $icons = array(); // view groups array $viewGroups = array( - 'main' => array('png.compiler', 'png.joomla_component.add', 'png.joomla_components', 'png.admin_view.add', 'png.admin_views', 'png.custom_admin_view.add', 'png.custom_admin_views', 'png.site_view.add', 'png.site_views', 'png.template.add', 'png.templates', 'png.layout.add', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.snippet.add', 'png.snippets', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_translations', 'png.help_document.add', 'png.help_documents') + 'main' => array('png.compiler', 'png.joomla_component.add', 'png.joomla_components', 'png.admin_view.add', 'png.admin_views', 'png.custom_admin_view.add', 'png.custom_admin_views', 'png.site_view.add', 'png.site_views', 'png.template.add', 'png.templates', 'png.layout.add', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.snippet.add', 'png.snippets', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_translations', 'png.ftps', 'png.help_document.add', 'png.help_documents') ); // view access array $viewAccess = array( @@ -116,6 +116,11 @@ class ComponentbuilderModelComponentbuilder extends JModelList 'languages.access' => 'language.access', 'language.access' => 'language.access', 'languages.submenu' => 'language.submenu', + 'ftp.create' => 'ftp.create', + 'ftps.access' => 'ftp.access', + 'ftp.access' => 'ftp.access', + 'ftps.submenu' => 'ftp.submenu', + 'ftps.dashboard_list' => 'ftp.dashboard_list', 'help_document.create' => 'help_document.create', 'help_documents.access' => 'help_document.access', 'help_document.access' => 'help_document.access', diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index a52c07834..5c39c94ef 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 9c8960952..e040f3655 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 306cb904a..9645afd3b 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 2ccae07c8..fa9e7e160 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 3dcc831f5..8d35d3a24 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 b343f2eaa..fbe137c7e 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 3a62af9a4..3ded6016e 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6002a04c7..e59e5bfeb 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 4d9399517..6028b308d 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 c549e949c..f11beed14 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 49ca65f74..948027a79 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 1e8920435..7305315f9 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 285984f10..f1640a8ba 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 6b4500aa3..fc6f0863b 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 92ca2ece0..44d135a72 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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..691eac1d9 --- /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 fca57b902..00908d106 100644 --- a/admin/models/fields/lang.php +++ b/admin/models/fields/lang.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 3aa6f01e7..44a750c00 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 07f2ca6b9..78099bc28 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 1e8bf31ca..5da0ffb4a 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 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 d2a63dc92..fe9e0dd22 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.1 - @build 23rd August, 2017 + @version 2.5.2 + @build 25th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index 53f0093cf..6a7b86c42 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -618,19 +618,21 @@ last="100" step="1" /> - + + class="list_class" + multiple="false" + required="false" + default="0"> - + COM_COMPONENTBUILDER_ADMIN_VIEW_NONE + diff --git a/admin/models/forms/ftp.js b/admin/models/forms/ftp.js new file mode 100644 index 000000000..326fb21ed --- /dev/null +++ b/admin/models/forms/ftp.js @@ -0,0 +1,25 @@ +/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/ + __ __ _ _____ _ _ __ __ _ _ _ + \ \ / / | | | __ \ | | | | | \/ | | | | | | | + \ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| | + \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | + \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | + \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| + | | + |_| +/-------------------------------------------------------------------------------------------------------------------------------/ + + @version @update number 10 of this MVC + @build 24th August, 2017 + @created 23rd August, 2017 + @package Component Builder + @subpackage ftp.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 + +/-----------------------------------------------------------------------------------------------------------------------------*/ + + diff --git a/admin/models/forms/ftp.xml b/admin/models/forms/ftp.xml new file mode 100644 index 000000000..02c5e67c1 --- /dev/null +++ b/admin/models/forms/ftp.xml @@ -0,0 +1,149 @@ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + +
+
\ No newline at end of file diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index c21185390..5f6f0452e 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -23,12 +23,12 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvwacwac_required = false; -jform_vvvvwadwad_required = false; -jform_vvvvwaewae_required = false; -jform_vvvvwafwaf_required = false; -jform_vvvvwagwag_required = false; -jform_vvvvwahwah_required = false; +jform_vvvvwacwad_required = false; +jform_vvvvwadwae_required = false; +jform_vvvvwaewaf_required = false; +jform_vvvvwafwag_required = false; +jform_vvvvwagwah_required = false; +jform_vvvvwahwai_required = false; // Initial Script jQuery(document).ready(function() @@ -59,26 +59,26 @@ function vvvvwac(location_vvvvwac) if (location_vvvvwac == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); - if (jform_vvvvwacwac_required) + if (jform_vvvvwacwad_required) { updateFieldRequired('admin_view',0); jQuery('#jform_admin_view').prop('required','required'); jQuery('#jform_admin_view').attr('aria-required',true); jQuery('#jform_admin_view').addClass('required'); - jform_vvvvwacwac_required = false; + jform_vvvvwacwad_required = false; } } else { jQuery('#jform_admin_view').closest('.control-group').hide(); - if (!jform_vvvvwacwac_required) + if (!jform_vvvvwacwad_required) { updateFieldRequired('admin_view',1); jQuery('#jform_admin_view').removeAttr('required'); jQuery('#jform_admin_view').removeAttr('aria-required'); jQuery('#jform_admin_view').removeClass('required'); - jform_vvvvwacwac_required = true; + jform_vvvvwacwad_required = true; } } } @@ -90,26 +90,26 @@ function vvvvwad(location_vvvvwad) if (location_vvvvwad == 2) { jQuery('#jform_site_view').closest('.control-group').show(); - if (jform_vvvvwadwad_required) + if (jform_vvvvwadwae_required) { updateFieldRequired('site_view',0); jQuery('#jform_site_view').prop('required','required'); jQuery('#jform_site_view').attr('aria-required',true); jQuery('#jform_site_view').addClass('required'); - jform_vvvvwadwad_required = false; + jform_vvvvwadwae_required = false; } } else { jQuery('#jform_site_view').closest('.control-group').hide(); - if (!jform_vvvvwadwad_required) + if (!jform_vvvvwadwae_required) { updateFieldRequired('site_view',1); jQuery('#jform_site_view').removeAttr('required'); jQuery('#jform_site_view').removeAttr('aria-required'); jQuery('#jform_site_view').removeClass('required'); - jform_vvvvwadwad_required = true; + jform_vvvvwadwae_required = true; } } } @@ -134,26 +134,26 @@ function vvvvwae(type_vvvvwae) if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_vvvvwaewae_required) + if (jform_vvvvwaewaf_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_vvvvwaewae_required = false; + jform_vvvvwaewaf_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_vvvvwaewae_required) + if (!jform_vvvvwaewaf_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_vvvvwaewae_required = true; + jform_vvvvwaewaf_required = true; } } } @@ -189,26 +189,26 @@ function vvvvwaf(type_vvvvwaf) if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_vvvvwafwaf_required) + if (jform_vvvvwafwag_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_vvvvwafwaf_required = false; + jform_vvvvwafwag_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_vvvvwafwaf_required) + if (!jform_vvvvwafwag_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_vvvvwafwaf_required = true; + jform_vvvvwafwag_required = true; } } } @@ -244,26 +244,26 @@ function vvvvwag(type_vvvvwag) if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_vvvvwagwag_required) + if (jform_vvvvwagwah_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_vvvvwagwag_required = false; + jform_vvvvwagwah_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_vvvvwagwag_required) + if (!jform_vvvvwagwah_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_vvvvwagwag_required = true; + jform_vvvvwagwah_required = true; } } } @@ -286,26 +286,26 @@ function vvvvwah(target_vvvvwah) if (target_vvvvwah == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_vvvvwahwah_required) + if (jform_vvvvwahwai_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_vvvvwahwah_required = false; + jform_vvvvwahwai_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_vvvvwahwah_required) + if (!jform_vvvvwahwai_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvwahwah_required = true; + jform_vvvvwahwai_required = true; } } } diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js index 460da64b5..327a3396f 100644 --- a/admin/models/forms/joomla_component.js +++ b/admin/models/forms/joomla_component.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 359 of this MVC - @build 23rd August, 2017 + @version @update number 361 of this MVC + @build 24th August, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.js diff --git a/admin/models/forms/joomla_component.xml b/admin/models/forms/joomla_component.xml index 2bdf819d3..86be34334 100644 --- a/admin/models/forms/joomla_component.xml +++ b/admin/models/forms/joomla_component.xml @@ -216,7 +216,7 @@ class="dashboard_tabs" select="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TAB_SELECT" icon="list" - maximum="5" + maximum="10" filter="raw">
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -198,6 +425,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index c38b242bb..088105a2b 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index 64dd8a178..1c20b341e 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.css diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index b8dc4a2ee..e23ed7a2b 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 9f5bf08d3..f5de90620 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index a1d7c013c..982d7a0cd 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 6 of this MVC - @build 18th October, 2016 + @build 17th October, 2016 @created 4th March, 2016 @package Component Builder @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 300e648f9..03e4a4295 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 6 of this MVC - @build 18th October, 2016 + @build 17th October, 2016 @created 4th March, 2016 @package Component Builder @subpackage help_documents.css diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index d688c1961..1a27fe992 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 361 of this MVC - @build 24th August, 2017 + @version @update number 366 of this MVC + @build 7th September, 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 bf3f38bac..820ae2783 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 361 of this MVC - @build 24th August, 2017 + @version @update number 366 of this MVC + @build 7th September, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.css diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 6e3e07d4c..f2412eb97 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 24cd00131..88aa6b3e1 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 66e3aebbb..4ecc91914 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 016170f57..39672aac5 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index b5b5d0cb8..3a00860e3 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 6711fbda9..9e5f61a8b 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 5924d05ab..2a020076d 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 1389b5741..e7a5d3383 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 6 of this MVC - @build 18th October, 2016 + @build 17th October, 2016 @created 4th March, 2016 @package Component Builder @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 7f4065f2c..892240596 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 6 of this MVC - @build 18th October, 2016 + @build 17th October, 2016 @created 4th March, 2016 @package Component Builder @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 42cf3dfa0..5ff4a9bd1 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 3ca3796ac..9b943e266 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 7891798e9..33334f6c0 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 361 of this MVC - @build 24th August, 2017 + @version @update number 366 of this MVC + @build 7th September, 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 499378a95..1c7f722ca 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 361 of this MVC - @build 24th August, 2017 + @version @update number 366 of this MVC + @build 7th September, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php index 7fb5e4570..82daf55f0 100644 --- a/admin/helpers/compiler.php +++ b/admin/helpers/compiler.php @@ -408,7 +408,7 @@ class Compiler extends Infusion // set the git path $this->gitPath = $this->gitPath.'/com_'.$this->componentData->sales_name.'__joomla_'.$this->joomlaVersion; // remove old data - $this->removeFolder($this->gitPath,true); + $this->removeFolder($this->gitPath, $this->componentData->toignore); // set the new data JFolder::copy($this->componentPath, $this->gitPath, '', true); } diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 3b6f4bd77..5d0152e60 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -1051,6 +1051,23 @@ class Get $component->sales_server_ftp = 0; $component->add_sales_server = 0; } + // set the ignore folders for git if found + if (isset($component->toignore) && ComponentbuilderHelper::checkString($component->toignore)) + { + if (strpos($component->toignore, ',') !== false) + { + $component->toignore = array_map('trim', (array) explode(',', $component->toignore)); + } + else + { + $component->toignore = array(trim($component->toignore)); + } + } + else + { + // the default is to ignore the git folder + $component->toignore = array('.git'); + } // return the found component data return $component; @@ -1395,7 +1412,7 @@ class Get } } // add_php - $addArrayP = array('php_getitem','php_save','php_postsavehook','php_getitems','php_getitems_after_all','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_before_publish','php_after_publish','php_batchcopy','php_batchmove','php_document'); + $addArrayP = array('php_getitem','php_before_save','php_save','php_postsavehook','php_getitems','php_getitems_after_all','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_before_publish','php_after_publish','php_batchcopy','php_batchmove','php_document'); foreach ($addArrayP as $scripter) { if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1) diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index af072f1af..cefd93ad0 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -379,13 +379,13 @@ class Interpretation extends Fields // make sure we have the correct file if (isset($this->componentData->whmcs_key) && ComponentbuilderHelper::checkString($this->componentData->whmcs_key)) { - // Get the basic encription. + // Get the basic encryption. $basickey = ComponentbuilderHelper::getCryptKey('basic'); - // Get the encription object. + // Get the encryption object. $basic = new FOFEncryptAes($basickey, 128); if (!empty($this->componentData->whmcs_key) && $basickey && !is_numeric($this->componentData->whmcs_key) && $this->componentData->whmcs_key === base64_encode(base64_decode($this->componentData->whmcs_key, true))) { - // basic decript data whmcs_key. + // basic decrypt data whmcs_key. $this->componentData->whmcs_key = rtrim($basic->decryptString($this->componentData->whmcs_key), "\0"); // set the needed string to connect to whmcs $key["kasier"] = $this->componentData->whmcs_url; @@ -2145,16 +2145,16 @@ class Interpretation extends Fields $script = ''; if (isset($this->siteDecrypt['basic'][$code]) && $this->siteDecrypt['basic'][$code]) { - $script .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the basic encription."; + $script .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the basic encryption."; $script .= PHP_EOL."\t".$tab."\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; - $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encryption object."; $script .= PHP_EOL."\t".$tab."\t\$basic = new FOFEncryptAes(\$basickey, 128);"; } if (isset($this->siteDecrypt['advanced'][$code]) && $this->siteDecrypt['advanced'][$code]) { - $script .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the advanced encription."; + $script .= PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the advanced encryption."; $script .= PHP_EOL."\t".$tab."\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; - $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encryption object."; $script .= PHP_EOL."\t".$tab."\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);"; } $getItem = $script . $getItem; @@ -2593,16 +2593,16 @@ class Interpretation extends Fields $script = ''; if ($this->siteDecrypt['basic'][$code]) { - $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the basic encription."; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the basic encryption."; $script .= PHP_EOL."\t\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; - $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encryption object."; $script .= PHP_EOL."\t\t\$basic = new FOFEncryptAes(\$basickey, 128);".PHP_EOL; } if ($this->siteDecrypt['advanced'][$code]) { - $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the advanced encription."; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the advanced encryption."; $script .= PHP_EOL."\t\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; - $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encryption object."; $script .= PHP_EOL."\t\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);".PHP_EOL; } $methods = str_replace('###CRYPT###',$script,$methods); @@ -2777,16 +2777,16 @@ class Interpretation extends Fields $script = ''; if ($this->siteDecrypt['basic'][$code]) { - $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the basic encription."; + $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the basic encryption."; $script .= PHP_EOL."\t\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; - $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encryption object."; $script .= PHP_EOL."\t\t\$basic = new FOFEncryptAes(\$basickey, 128);"; } if ($this->siteDecrypt['advanced'][$code]) { - $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the advanced encription."; + $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the advanced encryption."; $script .= PHP_EOL."\t\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; - $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encryption object."; $script .= PHP_EOL."\t\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);"; } $getItem = $script . $getItem; @@ -3787,30 +3787,30 @@ class Interpretation extends Fields $Component = $this->fileContentStatic['###Component###']; if (isset($this->basicEncryptionBuilder[$view]) && ComponentbuilderHelper::checkArray($this->basicEncryptionBuilder[$view])) { - $script .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Get the basic encription."; + $script .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Get the basic encryption."; $script .= PHP_EOL."\t\t\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; - $script .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Get the encryption object."; $script .= PHP_EOL."\t\t\t\$basic = new FOFEncryptAes(\$basickey, 128);"; foreach ($this->basicEncryptionBuilder[$view] as $baseString) { $script .= PHP_EOL.PHP_EOL."\t\t\tif (!empty(\$item->".$baseString.") && \$basickey && !is_numeric(\$item->".$baseString.") && \$item->".$baseString." === base64_encode(base64_decode(\$item->".$baseString.", true)))"; $script .= PHP_EOL."\t\t\t{"; - $script .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." basic decript data ".$baseString."."; + $script .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." basic decrypt data ".$baseString."."; $script .= PHP_EOL."\t\t\t\t\$item->".$baseString." = rtrim(\$basic->decryptString(\$item->".$baseString."), ".'"\0"'.");"; $script .= PHP_EOL."\t\t\t}"; } } if (isset($this->advancedEncryptionBuilder[$view]) && ComponentbuilderHelper::checkArray($this->advancedEncryptionBuilder[$view])) { - $script .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Get the advanced encription key."; + $script .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Get the advanced encryption key."; $script .= PHP_EOL."\t\t\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; - $script .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Get the encryption object."; $script .= PHP_EOL."\t\t\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);"; foreach ($this->advancedEncryptionBuilder[$view] as $baseString) { $script .= PHP_EOL.PHP_EOL."\t\t\tif (!empty(\$item->".$baseString.") && \$advancedkey && !is_numeric(\$item->".$baseString.") && \$item->".$baseString." === base64_encode(base64_decode(\$item->".$baseString.", true)))"; $script .= PHP_EOL."\t\t\t{"; - $script .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." advanced decript data ".$baseString."."; + $script .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." advanced decrypt data ".$baseString."."; $script .= PHP_EOL."\t\t\t\t\$item->".$baseString." = rtrim(\$advanced->decryptString(\$item->".$baseString."), ".'"\0"'.");"; $script .= PHP_EOL."\t\t\t}"; } @@ -3843,6 +3843,8 @@ class Interpretation extends Fields public function setMethodItemSave(&$view) { $script = ''; + // check if there was script added before modeling of data + $script .= $this->getCustomScriptBuilder('php_before_save', $view, PHP_EOL.PHP_EOL); // turn array into JSON string if(isset($this->jsonItemBuilder[$view]) && ComponentbuilderHelper::checkArray($this->jsonItemBuilder[$view])) { @@ -3892,13 +3894,13 @@ class Interpretation extends Fields $Component = $this->fileContentStatic['###Component###']; if(isset($this->basicEncryptionBuilder[$view]) && ComponentbuilderHelper::checkArray($this->basicEncryptionBuilder[$view])) { - $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the basic encription key."; + $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the basic encryption key."; $script .= PHP_EOL."\t\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; - $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encription object"; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encryption object"; $script .= PHP_EOL."\t\t\$basic = new FOFEncryptAes(\$basickey, 128);"; foreach ($this->basicEncryptionBuilder[$view] as $baseString) { - $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Encript data ".$baseString."."; + $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Encrypt data ".$baseString."."; $script .= PHP_EOL."\t\tif (isset(\$data['".$baseString."']) && \$basickey)"; $script .= PHP_EOL."\t\t{"; $script .= PHP_EOL."\t\t\t\$data['".$baseString."'] = \$basic->encryptString(\$data['".$baseString."']);"; @@ -3907,13 +3909,13 @@ class Interpretation extends Fields } if(isset($this->advancedEncryptionBuilder[$view]) && ComponentbuilderHelper::checkArray($this->advancedEncryptionBuilder[$view])) { - $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the advanced encription key."; + $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the advanced encryption key."; $script .= PHP_EOL."\t\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; - $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encription object"; + $script .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get the encryption object"; $script .= PHP_EOL."\t\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);"; foreach ($this->advancedEncryptionBuilder[$view] as $baseString) { - $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Encript data ".$baseString."."; + $script .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Encrypt data ".$baseString."."; $script .= PHP_EOL."\t\tif (isset(\$data['".$baseString."']) && \$advancedkey)"; $script .= PHP_EOL."\t\t{"; $script .= PHP_EOL."\t\t\t\$data['".$baseString."'] = \$advanced->encryptString(\$data['".$baseString."']);"; @@ -11070,7 +11072,7 @@ class Interpretation extends Fields { // add the fix if this view has the need for it $fix = ''; - // encription switches + // encryption switches $basicCrypt = false; $advancedCrypt = false; // setup correct core target @@ -11334,9 +11336,9 @@ class Interpretation extends Fields if ($basicCrypt) { - $script = PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the basic encription key."; + $script = PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the basic encryption key."; $script .= PHP_EOL."\t".$tab."\t\$basickey = ".$Component."Helper::getCryptKey('basic');"; - $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encryption object."; $script .= PHP_EOL."\t".$tab."\t\$basic = new FOFEncryptAes(\$basickey, 128);"; // add the encryption script $fix = $script . $fix; @@ -11344,9 +11346,9 @@ class Interpretation extends Fields if ($advancedCrypt) { - $script = PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the advanced encription key."; + $script = PHP_EOL.PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the advanced encryption key."; $script .= PHP_EOL."\t".$tab."\t\$advancedkey = ".$Component."Helper::getCryptKey('advanced');"; - $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encription object."; + $script .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Get the encryption object."; $script .= PHP_EOL."\t".$tab."\t\$advanced = new FOFEncryptAes(\$advancedkey, 256);"; // add the encryption script $fix = $script . $fix; @@ -13705,7 +13707,7 @@ function vdm_dkim() { $this->configFieldSets[] = "\t\t".'description="'.$lang.'_ENCRYPTION_DESC">'; // set tab lang $this->langContent[$this->lang][$lang.'_ENCRYPTION_LABEL'] = "Encryption Settings"; - $this->langContent[$this->lang][$lang.'_ENCRYPTION_DESC'] = "The encription key for the field encryption is set here."; + $this->langContent[$this->lang][$lang.'_ENCRYPTION_DESC'] = "The encryption key for the field encryption is set here."; if (isset($this->basicEncryption) && $this->basicEncryption) { diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index b08ed156e..0265d145d 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -107,13 +107,13 @@ abstract class ComponentbuilderHelper /** * Remove folders with files * - * @param string $dir The path to folder to remove - * @param boolean $git if there is a git folder in that must not be removed + * @param string $dir The path to folder to remove + * @param boolean $ignore The folders and files to ignore and not remove * * @return boolean True in all is removed * */ - public static function removeFolder($dir, $git = false) + public static function removeFolder($dir, $ignore = false) { if (JFolder::exists($dir)) { @@ -124,22 +124,53 @@ abstract class ComponentbuilderHelper if ('.' === $file->getBasename() || '..' === $file->getBasename()) continue; if ($file->isDir()) { - if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue; + $keeper = false; + if (self::checkArray($ignore)) + { + foreach ($ignore as $keep) + { + if (strpos($file->getPathname(), $dir.'/'.$keep) !== false) + { + $keeper = true; + } + } + } + if ($keeper) + { + continue; + } JFolder::delete($file->getPathname()); } else { - if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue; + $keeper = false; + if (self::checkArray($ignore)) + { + foreach ($ignore as $keep) + { + if (strpos($file->getPathname(), $dir.'/'.$keep) !== false) + { + $keeper = true; + } + } + } + if ($keeper) + { + continue; + } JFile::delete($file->getPathname()); } } - if (!$git && JFolder::delete($dir)) + if (!self::checkArray($ignore)) { - return true; + return JFolder::delete($dir); } + return true; } return false; - } /** + } + + /** * The dynamic builder of views, tables and fields **/ public static function dynamicBuilder(&$data, $type) diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index e697f67a6..87915f981 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilderemail.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index e46b98b5b..67a65af12 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 eb33964e6..78d917758 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 987cdbff2..d864e1b39 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index 34f97d2b6..32f4ace67 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 53683dea0..ccf439c60 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 f5d87f5fc..a488dda41 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -20,11 +20,165 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this g COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete" COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDCONDITIONS="Admin Views Edit Addconditions" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDCONDITIONS_DESC="Allows the users in this group to update the edit addconditions of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDFIELDS="Admin Views Edit Addfields" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDFIELDS_DESC="Allows the users in this group to update the edit addfields of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDLINKED_VIEWS="Admin Views Edit Addlinked Views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDLINKED_VIEWS_DESC="Allows the users in this group to update the edit addlinked views of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDPERMISSIONS="Admin Views Edit Addpermissions" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDPERMISSIONS_DESC="Allows the users in this group to update the edit addpermissions of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABLES="Admin Views Edit Addtables" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABLES_DESC="Allows the users in this group to update the edit addtables of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABS="Admin Views Edit Addtabs" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADDTABS_DESC="Allows the users in this group to update the edit addtabs of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEW="Admin Views Edit Add Css View" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEWS="Admin Views Edit Add Css Views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEWS_DESC="Allows the users in this group to update the edit add css views of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CSS_VIEW_DESC="Allows the users in this group to update the edit add css view of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_BUTTON="Admin Views Edit Add Custom Button" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_BUTTON_DESC="Allows the users in this group to update the edit add custom button of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_IMPORT="Admin Views Edit Add Custom Import" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_CUSTOM_IMPORT_DESC="Allows the users in this group to update the edit add custom import of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_FADEIN="Admin Views Edit Add Fadein" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_FADEIN_DESC="Allows the users in this group to update the edit add fadein of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FILE="Admin Views Edit Add Javascript Views File" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FILE_DESC="Allows the users in this group to update the edit add javascript views file of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FOOTER="Admin Views Edit Add Javascript Views Footer" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEWS_FOOTER_DESC="Allows the users in this group to update the edit add javascript views footer of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FILE="Admin Views Edit Add Javascript View File" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FILE_DESC="Allows the users in this group to update the edit add javascript view file of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FOOTER="Admin Views Edit Add Javascript View Footer" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_JAVASCRIPT_VIEW_FOOTER_DESC="Allows the users in this group to update the edit add javascript view footer of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_DELETE="Admin Views Edit Add Php After Delete" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_DELETE_DESC="Allows the users in this group to update the edit add php after delete of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_PUBLISH="Admin Views Edit Add Php After Publish" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AFTER_PUBLISH_DESC="Allows the users in this group to update the edit add php after publish of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AJAX="Admin Views Edit Add Php Ajax" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_AJAX_DESC="Allows the users in this group to update the edit add php ajax of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_ALLOWEDIT="Admin Views Edit Add Php Allowedit" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_ALLOWEDIT_DESC="Allows the users in this group to update the edit add php allowedit of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHCOPY="Admin Views Edit Add Php Batchcopy" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHCOPY_DESC="Allows the users in this group to update the edit add php batchcopy of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHMOVE="Admin Views Edit Add Php Batchmove" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BATCHMOVE_DESC="Allows the users in this group to update the edit add php batchmove of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_DELETE="Admin Views Edit Add Php Before Delete" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_DELETE_DESC="Allows the users in this group to update the edit add php before delete of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_PUBLISH="Admin Views Edit Add Php Before Publish" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_PUBLISH_DESC="Allows the users in this group to update the edit add php before publish of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_SAVE="Admin Views Edit Add Php Before Save" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_BEFORE_SAVE_DESC="Allows the users in this group to update the edit add php before save of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_DOCUMENT="Admin Views Edit Add Php Document" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_DOCUMENT_DESC="Allows the users in this group to update the edit add php document of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEM="Admin Views Edit Add Php Getitem" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS="Admin Views Edit Add Php Getitems" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS_AFTER_ALL="Admin Views Edit Add Php Getitems After All" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS_AFTER_ALL_DESC="Allows the users in this group to update the edit add php getitems after all of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEMS_DESC="Allows the users in this group to update the edit add php getitems of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETITEM_DESC="Allows the users in this group to update the edit add php getitem of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETLISTQUERY="Admin Views Edit Add Php Getlistquery" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_GETLISTQUERY_DESC="Allows the users in this group to update the edit add php getlistquery of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_POSTSAVEHOOK="Admin Views Edit Add Php Postsavehook" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_POSTSAVEHOOK_DESC="Allows the users in this group to update the edit add php postsavehook of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_SAVE="Admin Views Edit Add Php Save" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_PHP_SAVE_DESC="Allows the users in this group to update the edit add php save of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_SQL="Admin Views Edit Add Sql" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ADD_SQL_DESC="Allows the users in this group to update the edit add sql of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_AJAX_INPUT="Admin Views Edit Ajax Input" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_AJAX_INPUT_DESC="Allows the users in this group to update the edit ajax input of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEW="Admin Views Edit Css View" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEWS="Admin Views Edit Css Views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEWS_DESC="Allows the users in this group to update the edit css views of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CSS_VIEW_DESC="Allows the users in this group to update the edit css view of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CUSTOM_BUTTON="Admin Views Edit Custom Button" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CUSTOM_BUTTON_DESC="Allows the users in this group to update the edit custom button of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC="Allows the users in this group to edit the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESCRIPTION="Admin Views Edit Description" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_HTML_IMPORT_VIEW="Admin Views Edit Html Import View" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_HTML_IMPORT_VIEW_DESC="Allows the users in this group to update the edit html import view of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON="Admin Views Edit Icon" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_ADD="Admin Views Edit Icon Add" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_ADD_DESC="Allows the users in this group to update the edit icon add of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_CATEGORY="Admin Views Edit Icon Category" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_CATEGORY_DESC="Allows the users in this group to update the edit icon category of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_ICON_DESC="Allows the users in this group to update the edit icon of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FILE="Admin Views Edit Javascript Views File" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FILE_DESC="Allows the users in this group to update the edit javascript views file of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FOOTER="Admin Views Edit Javascript Views Footer" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEWS_FOOTER_DESC="Allows the users in this group to update the edit javascript views footer of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FILE="Admin Views Edit Javascript View File" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FILE_DESC="Allows the users in this group to update the edit javascript view file of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FOOTER="Admin Views Edit Javascript View Footer" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_JAVASCRIPT_VIEW_FOOTER_DESC="Allows the users in this group to update the edit javascript view footer of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_LIST="Admin Views Edit Name List" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_LIST_DESC="Allows the users in this group to update the edit name list of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_SINGLE="Admin Views Edit Name Single" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_NAME_SINGLE_DESC="Allows the users in this group to update the edit name single of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN="Admin Views Edit Own" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admin views created by them" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_DELETE="Admin Views Edit Php After Delete" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_DELETE_DESC="Allows the users in this group to update the edit php after delete of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_PUBLISH="Admin Views Edit Php After Publish" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AFTER_PUBLISH_DESC="Allows the users in this group to update the edit php after publish of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AJAXMETHOD="Admin Views Edit Php Ajaxmethod" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_AJAXMETHOD_DESC="Allows the users in this group to update the edit php ajaxmethod of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_ALLOWEDIT="Admin Views Edit Php Allowedit" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_ALLOWEDIT_DESC="Allows the users in this group to update the edit php allowedit of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHCOPY="Admin Views Edit Php Batchcopy" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHCOPY_DESC="Allows the users in this group to update the edit php batchcopy of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHMOVE="Admin Views Edit Php Batchmove" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BATCHMOVE_DESC="Allows the users in this group to update the edit php batchmove of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_DELETE="Admin Views Edit Php Before Delete" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_DELETE_DESC="Allows the users in this group to update the edit php before delete of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_PUBLISH="Admin Views Edit Php Before Publish" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_PUBLISH_DESC="Allows the users in this group to update the edit php before publish of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_SAVE="Admin Views Edit Php Before Save" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_BEFORE_SAVE_DESC="Allows the users in this group to update the edit php before save of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER="Admin Views Edit Php Controller" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER_DESC="Allows the users in this group to update the edit php controller of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER_LIST="Admin Views Edit Php Controller List" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_CONTROLLER_LIST_DESC="Allows the users in this group to update the edit php controller list of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_DOCUMENT="Admin Views Edit Php Document" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_DOCUMENT_DESC="Allows the users in this group to update the edit php document of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEM="Admin Views Edit Php Getitem" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS="Admin Views Edit Php Getitems" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS_AFTER_ALL="Admin Views Edit Php Getitems After All" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS_AFTER_ALL_DESC="Allows the users in this group to update the edit php getitems after all of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEMS_DESC="Allows the users in this group to update the edit php getitems of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETITEM_DESC="Allows the users in this group to update the edit php getitem of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETLISTQUERY="Admin Views Edit Php Getlistquery" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_GETLISTQUERY_DESC="Allows the users in this group to update the edit php getlistquery of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT="Admin Views Edit Php Import" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_DESC="Allows the users in this group to update the edit php import of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_DISPLAY="Admin Views Edit Php Import Display" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_DISPLAY_DESC="Allows the users in this group to update the edit php import display of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_EXT="Admin Views Edit Php Import Ext" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_EXT_DESC="Allows the users in this group to update the edit php import ext of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SAVE="Admin Views Edit Php Import Save" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SAVE_DESC="Allows the users in this group to update the edit php import save of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SETDATA="Admin Views Edit Php Import Setdata" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_IMPORT_SETDATA_DESC="Allows the users in this group to update the edit php import setdata of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL="Admin Views Edit Php Model" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL_DESC="Allows the users in this group to update the edit php model of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL_LIST="Admin Views Edit Php Model List" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_MODEL_LIST_DESC="Allows the users in this group to update the edit php model list of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_POSTSAVEHOOK="Admin Views Edit Php Postsavehook" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_POSTSAVEHOOK_DESC="Allows the users in this group to update the edit php postsavehook of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_SAVE="Admin Views Edit Php Save" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_PHP_SAVE_DESC="Allows the users in this group to update the edit php save of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SHORT_DESCRIPTION="Admin Views Edit Short Description" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to update the edit short description of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SOURCE="Admin Views Edit Source" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SOURCE_DESC="Allows the users in this group to update the edit source of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SQL="Admin Views Edit Sql" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SQL_DESC="Allows the users in this group to update the edit sql of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE="Admin Views Edit State" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SYSTEM_NAME="Admin Views Edit System Name" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_SYSTEM_NAME_DESC="Allows the users in this group to update the edit system name of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_TYPE="Admin Views Edit Type" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_TYPE_DESC="Allows the users in this group to update the edit type of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export" @@ -116,6 +270,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE="Add Php Before Delete" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL="Add PHP (script - before delete)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH="Add Php Before Publish" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL="Add PHP (script - before publish)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE="Add Php Before Save" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL="Add PHP (save Method - before data modeling)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL="Add PHP (custom document script)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM="Add Php Getitem" @@ -129,7 +285,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL="Add PHP (getListQuer COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK="Add Php Postsavehook" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL="Add PHP (postSaveHook Method)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE="Add Php Save" -COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL="Add PHP (save Method)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL="Add PHP (save Method - after data modeling)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL="Add Sql" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL="Add MySQL (to view table)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW="Adminview" @@ -487,6 +643,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH="Php Before Publish" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_HINT="// PHP Here that should run in the publish Method before items published state is changed. Array $pks is an array of record primary keys and $value is the published state." COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL="PHP" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE="Php Before Save" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_DESCRIPTION="Add your PHP here! [Do not add the php tags]" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_HINT="// PHP Here that should run in the save Method (array) $data is where all values are" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_LABEL="PHP" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER="Php Controller" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_HINT="// PHP methods for the controller that the button will target" @@ -897,7 +1057,7 @@ COM_COMPONENTBUILDER_CONFIG_EMAILFROM_LABEL=" From Email" COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_DESCRIPTION="The global email address that will be used to set as the reply email. (leave blank for none)" COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_HINT="Email Address Here" COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_LABEL=" Reply to Email" -COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_DESC="The encription key for the field encryption is set here." +COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_DESC="The encryption key for the field encryption is set here." COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_LABEL="Encryption Settings" COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_DESCRIPTION="Enter link where your JCB package key can be bought." COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_HINT="http://www.example.com/buy-keys" @@ -2555,12 +2715,162 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD="Joomla Components Dashboar COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST="Joomla Components Dashboard List" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDADMIN_VIEWS="Joomla Components Edit Addadmin Views" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDADMIN_VIEWS_DESC="Allows the users in this group to update the edit addadmin views of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONFIG="Joomla Components Edit Addconfig" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONFIG_DESC="Allows the users in this group to update the edit addconfig of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONTRIBUTORS="Joomla Components Edit Addcontributors" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONTRIBUTORS_DESC="Allows the users in this group to update the edit addcontributors of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOMMENUS="Joomla Components Edit Addcustommenus" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOMMENUS_DESC="Allows the users in this group to update the edit addcustommenus of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOM_ADMIN_VIEWS="Joomla Components Edit Addcustom Admin Views" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOM_ADMIN_VIEWS_DESC="Allows the users in this group to update the edit addcustom admin views of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFILES="Joomla Components Edit Addfiles" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFILES_DESC="Allows the users in this group to update the edit addfiles of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOLDERS="Joomla Components Edit Addfolders" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOLDERS_DESC="Allows the users in this group to update the edit addfolders of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOOTABLE="Joomla Components Edit Addfootable" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOOTABLE_DESC="Allows the users in this group to update the edit addfootable of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDREADME="Joomla Components Edit Addreadme" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDREADME_DESC="Allows the users in this group to update the edit addreadme of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDSITE_VIEWS="Joomla Components Edit Addsite Views" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDSITE_VIEWS_DESC="Allows the users in this group to update the edit addsite views of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDUIKIT="Joomla Components Edit Adduikit" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDUIKIT_DESC="Allows the users in this group to update the edit adduikit of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT="Joomla Components Edit Add Admin Event" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT_DESC="Allows the users in this group to update the edit add admin event of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS="Joomla Components Edit Add Css" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS_DESC="Allows the users in this group to update the edit add css of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER="Joomla Components Edit Add Email Helper" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER_DESC="Allows the users in this group to update the edit add email helper of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE="Joomla Components Edit Add License" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE_DESC="Allows the users in this group to update the edit add license of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS="Joomla Components Edit Add Php Dashboard Methods" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS_DESC="Allows the users in this group to update the edit add php dashboard methods of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN="Joomla Components Edit Add Php Helper Admin" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN_DESC="Allows the users in this group to update the edit add php helper admin of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_BOTH="Joomla Components Edit Add Php Helper Both" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_BOTH_DESC="Allows the users in this group to update the edit add php helper both of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_SITE="Joomla Components Edit Add Php Helper Site" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_SITE_DESC="Allows the users in this group to update the edit add php helper site of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_METHOD_UNINSTALL="Joomla Components Edit Add Php Method Uninstall" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_METHOD_UNINSTALL_DESC="Allows the users in this group to update the edit add php method uninstall of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_INSTALL="Joomla Components Edit Add Php Postflight Install" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit add php postflight install of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_UPDATE="Joomla Components Edit Add Php Postflight Update" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit add php postflight update of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_INSTALL="Joomla Components Edit Add Php Preflight Install" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit add php preflight install of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_UPDATE="Joomla Components Edit Add Php Preflight Update" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit add php preflight update of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SALES_SERVER="Joomla Components Edit Add Sales Server" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SALES_SERVER_DESC="Allows the users in this group to update the edit add sales server of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SITE_EVENT="Joomla Components Edit Add Site Event" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SITE_EVENT_DESC="Allows the users in this group to update the edit add site event of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SQL="Joomla Components Edit Add Sql" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SQL_DESC="Allows the users in this group to update the edit add sql of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_UPDATE_SERVER="Joomla Components Edit Add Update Server" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_UPDATE_SERVER_DESC="Allows the users in this group to update the edit add update server of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_AUTHOR="Joomla Components Edit Author" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_AUTHOR_DESC="Allows the users in this group to update the edit author of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BOM="Joomla Components Edit Bom" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BOM_DESC="Allows the users in this group to update the edit bom of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMP="Joomla Components Edit Buildcomp" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMPSQL="Joomla Components Edit Buildcompsql" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMPSQL_DESC="Allows the users in this group to update the edit buildcompsql of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMP_DESC="Allows the users in this group to update the edit buildcomp of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPANYNAME="Joomla Components Edit Companyname" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPANYNAME_DESC="Allows the users in this group to update the edit companyname of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPONENT_VERSION="Joomla Components Edit Component Version" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPONENT_VERSION_DESC="Allows the users in this group to update the edit component version of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COPYRIGHT="Joomla Components Edit Copyright" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COPYRIGHT_DESC="Allows the users in this group to update the edit copyright of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATUSERHELPER="Joomla Components Edit Creatuserhelper" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATUSERHELPER_DESC="Allows the users in this group to update the edit creatuserhelper of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CSS="Joomla Components Edit Css" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CSS_DESC="Allows the users in this group to update the edit css of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DASHBOARD_TAB="Joomla Components Edit Dashboard Tab" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DASHBOARD_TAB_DESC="Allows the users in this group to update the edit dashboard tab of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DEBUG_LINENR="Joomla Components Edit Debug Linenr" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DEBUG_LINENR_DESC="Allows the users in this group to update the edit debug linenr of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DESCRIPTION="Joomla Components Edit Description" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMAIL="Joomla Components Edit Email" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMAIL_DESC="Allows the users in this group to update the edit email of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMPTYCONTRIBUTORS="Joomla Components Edit Emptycontributors" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMPTYCONTRIBUTORS_DESC="Allows the users in this group to update the edit emptycontributors of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_BUY_LINK="Joomla Components Edit Export Buy Link" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_BUY_LINK_DESC="Allows the users in this group to update the edit export buy link of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_KEY="Joomla Components Edit Export Key" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_KEY_DESC="Allows the users in this group to update the edit export key of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK="Joomla Components Edit Export Package Link" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK_DESC="Allows the users in this group to update the edit export package link of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE="Joomla Components Edit Image" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE_DESC="Allows the users in this group to update the edit image of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE="Joomla Components Edit License" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_DESC="Allows the users in this group to update the edit license of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE="Joomla Components Edit License Type" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE_DESC="Allows the users in this group to update the edit license type of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_MVC_VERSIONDATE="Joomla Components Edit Mvc Versiondate" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_MVC_VERSIONDATE_DESC="Allows the users in this group to update the edit mvc versiondate of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME="Joomla Components Edit Name" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME_CODE="Joomla Components Edit Name Code" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME_CODE_DESC="Allows the users in this group to update the edit name code of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NUMBER="Joomla Components Edit Number" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NUMBER_DESC="Allows the users in this group to update the edit number of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_ADMIN_EVENT="Joomla Components Edit Php Admin Event" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_ADMIN_EVENT_DESC="Allows the users in this group to update the edit php admin event of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_DASHBOARD_METHODS="Joomla Components Edit Php Dashboard Methods" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_DASHBOARD_METHODS_DESC="Allows the users in this group to update the edit php dashboard methods of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_ADMIN="Joomla Components Edit Php Helper Admin" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_ADMIN_DESC="Allows the users in this group to update the edit php helper admin of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_BOTH="Joomla Components Edit Php Helper Both" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_BOTH_DESC="Allows the users in this group to update the edit php helper both of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_SITE="Joomla Components Edit Php Helper Site" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_SITE_DESC="Allows the users in this group to update the edit php helper site of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_METHOD_UNINSTALL="Joomla Components Edit Php Method Uninstall" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_METHOD_UNINSTALL_DESC="Allows the users in this group to update the edit php method uninstall of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_INSTALL="Joomla Components Edit Php Postflight Install" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit php postflight install of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_UPDATE="Joomla Components Edit Php Postflight Update" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit php postflight update of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_INSTALL="Joomla Components Edit Php Preflight Install" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_INSTALL_DESC="Allows the users in this group to update the edit php preflight install of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_UPDATE="Joomla Components Edit Php Preflight Update" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_UPDATE_DESC="Allows the users in this group to update the edit php preflight update of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_SITE_EVENT="Joomla Components Edit Php Site Event" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_SITE_EVENT_DESC="Allows the users in this group to update the edit php site event of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_README="Joomla Components Edit Readme" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_README_DESC="Allows the users in this group to update the edit readme of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SALES_SERVER_FTP="Joomla Components Edit Sales Server Ftp" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SALES_SERVER_FTP_DESC="Allows the users in this group to update the edit sales server ftp of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SHORT_DESCRIPTION="Joomla Components Edit Short Description" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to update the edit short description of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL="Joomla Components Edit Sql" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_DESC="Allows the users in this group to update the edit sql of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_TWEAK="Joomla Components Edit Sql Tweak" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_TWEAK_DESC="Allows the users in this group to update the edit sql tweak of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SYSTEM_NAME="Joomla Components Edit System Name" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SYSTEM_NAME_DESC="Allows the users in this group to update the edit system name of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_TOIGNORE="Joomla Components Edit Toignore" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_TOIGNORE_DESC="Allows the users in this group to update the edit toignore of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER="Joomla Components Edit Update Server" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_DESC="Allows the users in this group to update the edit update server of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_FTP="Joomla Components Edit Update Server Ftp" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_FTP_DESC="Allows the users in this group to update the edit update server ftp of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_TARGET="Joomla Components Edit Update Server Target" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_TARGET_DESC="Allows the users in this group to update the edit update server target of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION="Joomla Components Edit Version" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version joomla components" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_UPDATE="Joomla Components Edit Version Update" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_UPDATE_DESC="Allows the users in this group to update the edit version update of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WEBSITE="Joomla Components Edit Website" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WEBSITE_DESC="Allows the users in this group to update the edit website of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_KEY="Joomla Components Edit Whmcs Key" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_KEY_DESC="Allows the users in this group to update the edit whmcs key of the joomla component" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_URL="Joomla Components Edit Whmcs Url" +COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_URL_DESC="Allows the users in this group to update the edit whmcs url of the joomla component" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT="Joomla Components Export" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT_DESC="Allows the users in this group to export export joomla components" COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_IMPORT="Joomla Components Import" @@ -3215,6 +3525,12 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_THUMBS_UP="Thumbs Up" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_DESCRIPTION="Enter contributor's title in relation to this component" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_HINT="Contributor's Role" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_LABEL="Job Title" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE="Toignore" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_DESCRIPTION="Coma separated names of folders or files to ignore when updating the git files during compilations." +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_HINT="Coma separated names of folders or files" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_LABEL="Folders or Files to Ignore" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_DESCRIPTION="During compilation JCB deletes all files and folders from the git folder, and then adds the newly created files and folders back into the git folder. Yet there may be files or folders you may not want deleted, like the .git folder, since JCB does not dynamically create that folder and so it will not be placed back, but simply delete it, unless you add it in this text field below, so that it will be ignored, and therefore not deleted in the first place. You can add multiple folders and files, separated by commas. Like: .git, .hg" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_LABEL="Folders or Files to Ignore" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TRANSLATION="Translation" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TREE="Tree" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TREE_TWO="Tree 2" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index c2f8a278b..792161cee 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 1303eab57..9a162d398 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 b92990a15..2a9728564 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 aa34effbe..d5535a9ee 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 66611850b..59e225c67 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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->vxxfields; +$items = $displayData->vxyfields; $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 7803b079a..24ae69e46 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 dbc25b094..170149af1 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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->vxylinked_components; +$items = $displayData->vxzlinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index b8ddbb8a9..33f7404ba 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 acbb0def1..c25b2f16b 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 67d21863d..2d0f17260 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php @@ -41,6 +41,8 @@ $fields = $displayData->get('fields') ?: array( 'php_getitems_after_all', 'add_php_getlistquery', 'php_getlistquery', + 'add_php_before_save', + 'php_before_save', 'add_php_save', 'php_save', 'add_php_postsavehook', diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 cbdfe228c..ecf0c62c4 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 8530ffc03..5a6cb770d 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 a7399505d..1e059a6f2 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ec581bade..e20328063 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 1a5718b0b..329e67033 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 29039850c..23ee3917f 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 b92990a15..2a9728564 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 6186c209c..4082edad1 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 aa3d042d5..9f0760397 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 e00bcb565..b11e3454e 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 edfd5ca4c..c184f5192 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 6b0536762..8f4c61419 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 287c91f5a..89eb80caa 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 bb888edea..f9ac2d99d 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 46eff3008..680ee31c5 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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->vyilinked_components; +$items = $displayData->vyjlinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 fcfcb8dc0..c90697b31 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 5a7ca75e5..5c08abae4 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 a74d1b9ad..93b9da53e 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 0a3dabef4..de9e30be5 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 bb888edea..f9ac2d99d 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ceabaa092..2d855a878 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 0708a84cc..4c9006f37 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 d11898972..2b47c43d5 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index fe4597c24..8c743b424 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_above.php diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index 01850b94e..4a56f4867 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index bfe9bbd25..1617ce45e 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_left.php diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index 1ec2dad71..8e6c7bbc1 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_right.php diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index fbbac0310..fd52dadd2 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 41b0f729a..e99e07d45 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 f5a457359..c21ef15ac 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 7d67a7b80..9271ad508 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 bb888edea..f9ac2d99d 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 62d52dc0b..3d350b3d9 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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->waalinked_admin_views; +$items = $displayData->wablinked_admin_views; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit"; diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 5595f96e7..00d5148de 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 9de42a952..5fa8b29bb 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 42aaa4fdf..438163ec5 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 b2586bc94..93c2a99db 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 a44b1e173..e0e36afd0 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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->wabfields; +$items = $displayData->wacfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 11588147f..fcebf4092 100644 --- a/admin/layouts/ftp/details_above.php +++ b/admin/layouts/ftp/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ebfd814a8..7947ac0db 100644 --- a/admin/layouts/ftp/details_fullwidth.php +++ b/admin/layouts/ftp/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 de1a28f6f..69a3fbca9 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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->waclinked_components; +$items = $displayData->wadlinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/ftp/publishing.php b/admin/layouts/ftp/publishing.php index 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/ftp/publishing.php +++ b/admin/layouts/ftp/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/ftp/publlshing.php +++ b/admin/layouts/ftp/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 d893a3be7..e1d6b0d4f 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 d0653adc0..052993e77 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 42fa5c2ca..3e4cd8b48 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 94ac740a8..b4408e463 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 bb888edea..f9ac2d99d 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 f3f4b751a..d6d1bf9fc 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 a4e09531d..0062b040a 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index 4587d48d8..bb636bcb0 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index aa3d042d5..9f0760397 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 6517302e4..073df828d 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 7ae754595..908b9ed90 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 bb888edea..f9ac2d99d 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 0fce95ef0..5926122b7 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index cfdc18ef2..be9c1fd80 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 b681d4048..25bd81e08 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index ab445e4a2..295a6e1b4 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 547559345..232a4689c 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/joomla_component/publlshing.php +++ b/admin/layouts/joomla_component/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 89878ded6..07062235d 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 95a810610..360dfc691 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 e5585925a..39da3c41e 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ce00880f7..f68efdcb2 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php @@ -41,6 +41,9 @@ $fields = $displayData->get('fields') ?: array( 'note_add_folders', 'addfolders', 'spacer_hr_f', + 'to_ignore_note', + 'toignore', + 'spacer_hr_g', 'jcb_export_package_note', 'export_key', 'export_package_link', diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index b7492ae32..5f1c109bf 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php index 697fbab94..1c180b242 100644 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ b/admin/layouts/joomla_component/translation_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage translation_fullwidth.php diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index 0c48d7a69..fd2aad6f2 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 e15ec9a4f..6a4cdcb8c 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 eebc9107c..42c7c2a9d 100644 --- a/admin/layouts/language_translation/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 a7ceebe6b..48655c6d5 100644 --- a/admin/layouts/language_translation/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/language_translation/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/language_translation/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 d5621094a..364b79bed 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 b53aeaa1a..605e759b3 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 6ccf1586d..bad8ca1b6 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 724571822..bc16d0cff 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 af5e939c3..9b49750d7 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 bb888edea..f9ac2d99d 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 29039850c..23ee3917f 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 5355d803a..0f4d42aa3 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 556150db3..eef250b1b 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 aa3d042d5..9f0760397 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 e00bcb565..b11e3454e 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 edfd5ca4c..c184f5192 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 724571822..bc16d0cff 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 287c91f5a..89eb80caa 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 bb888edea..f9ac2d99d 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 7fbc26899..4b6a1aa17 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 cb5594357..fb9375c76 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.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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->vytlinked_components; +$items = $displayData->vyulinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index a94da30a5..42b09d5e1 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 46f56cedd..22c43e2d3 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 fb4bc4c88..d23297851 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ffa640730..d4218f1b6 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 d5621094a..364b79bed 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 823d99643..882f0c0ca 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 6ccf1586d..bad8ca1b6 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 724571822..bc16d0cff 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 af5e939c3..9b49750d7 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 bb888edea..f9ac2d99d 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 48bd99022..b8c21a1b5 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 ef5c3b358..8e6b361d7 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 de790c114..270964c5d 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -95,22 +95,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->php_getitems_after_all)) + if (!empty($item->php_batchmove)) { - // base64 Decode php_getitems_after_all. - $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); - } - - if (!empty($item->php_after_publish)) - { - // base64 Decode php_after_publish. - $item->php_after_publish = base64_decode($item->php_after_publish); - } - - if (!empty($item->php_allowedit)) - { - // base64 Decode php_allowedit. - $item->php_allowedit = base64_decode($item->php_allowedit); + // base64 Decode php_batchmove. + $item->php_batchmove = base64_decode($item->php_batchmove); } if (!empty($item->php_save)) @@ -119,28 +107,52 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_save = base64_decode($item->php_save); } - if (!empty($item->php_batchmove)) - { - // base64 Decode php_batchmove. - $item->php_batchmove = base64_decode($item->php_batchmove); - } - if (!empty($item->php_after_delete)) { // base64 Decode php_after_delete. $item->php_after_delete = base64_decode($item->php_after_delete); } + if (!empty($item->php_getlistquery)) + { + // base64 Decode php_getlistquery. + $item->php_getlistquery = base64_decode($item->php_getlistquery); + } + + if (!empty($item->php_allowedit)) + { + // base64 Decode php_allowedit. + $item->php_allowedit = base64_decode($item->php_allowedit); + } + + if (!empty($item->php_after_publish)) + { + // base64 Decode php_after_publish. + $item->php_after_publish = base64_decode($item->php_after_publish); + } + if (!empty($item->php_getitems)) { // base64 Decode php_getitems. $item->php_getitems = base64_decode($item->php_getitems); } - if (!empty($item->php_getlistquery)) + if (!empty($item->php_import)) { - // base64 Decode php_getlistquery. - $item->php_getlistquery = base64_decode($item->php_getlistquery); + // base64 Decode php_import. + $item->php_import = base64_decode($item->php_import); + } + + if (!empty($item->php_getitems_after_all)) + { + // base64 Decode php_getitems_after_all. + $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); + } + + if (!empty($item->php_before_save)) + { + // base64 Decode php_before_save. + $item->php_before_save = base64_decode($item->php_before_save); } if (!empty($item->php_postsavehook)) @@ -167,12 +179,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_before_delete = base64_decode($item->php_before_delete); } - if (!empty($item->php_import)) - { - // base64 Decode php_import. - $item->php_import = base64_decode($item->php_import); - } - if (!empty($item->php_document)) { // base64 Decode php_document. @@ -185,18 +191,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->sql = base64_decode($item->sql); } - if (!empty($item->php_getitem)) - { - // base64 Decode php_getitem. - $item->php_getitem = base64_decode($item->php_getitem); - } - if (!empty($item->php_import_display)) { // base64 Decode php_import_display. $item->php_import_display = base64_decode($item->php_import_display); } + if (!empty($item->php_getitem)) + { + // base64 Decode php_getitem. + $item->php_getitem = base64_decode($item->php_getitem); + } + if (!empty($item->php_import_save)) { // base64 Decode php_import_save. @@ -263,18 +269,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_model_list = base64_decode($item->php_model_list); } - if (!empty($item->html_import_view)) - { - // base64 Decode html_import_view. - $item->html_import_view = base64_decode($item->html_import_view); - } - if (!empty($item->php_ajaxmethod)) { // base64 Decode php_ajaxmethod. $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); } + if (!empty($item->html_import_view)) + { + // base64 Decode html_import_view. + $item->html_import_view = base64_decode($item->html_import_view); + } + if (!empty($item->php_import_setdata)) { // base64 Decode php_import_setdata. @@ -304,7 +310,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxxfields() + public function getVxyfields() { // Get the user object. $user = JFactory::getUser(); @@ -373,13 +379,13 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVxxfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVxyfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVxxfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVxyfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVxxfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVxyfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVxxfields($item->store, 'store'); + $item->store = $this->selectionTranslationVxyfields($item->store, 'store'); } } @@ -419,7 +425,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVxxfields($value,$name) + public function selectionTranslationVxyfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') @@ -497,7 +503,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxylinked_components() + public function getVxzlinked_components() { // Get the user object. $user = JFactory::getUser(); @@ -638,6 +644,1343 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin // Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } + // Modify the form based on Edit System Name access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.system_name', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.system_name', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('system_name', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('system_name', 'readonly', 'true'); + if (!$form->getValue('system_name')) + { + // Disable fields while saving. + $form->setFieldAttribute('system_name', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('system_name', 'required', 'false'); + } + } + // Modify the form based on Edit Name Single access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.name_single', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.name_single', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('name_single', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('name_single', 'readonly', 'true'); + if (!$form->getValue('name_single')) + { + // Disable fields while saving. + $form->setFieldAttribute('name_single', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('name_single', 'required', 'false'); + } + } + // Modify the form based on Edit Name List access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.name_list', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.name_list', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('name_list', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('name_list', 'readonly', 'true'); + if (!$form->getValue('name_list')) + { + // Disable fields while saving. + $form->setFieldAttribute('name_list', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('name_list', 'required', 'false'); + } + } + // Modify the form based on Edit Short Description access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.short_description', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.short_description', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('short_description', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('short_description', 'readonly', 'true'); + if (!$form->getValue('short_description')) + { + // Disable fields while saving. + $form->setFieldAttribute('short_description', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('short_description', 'required', 'false'); + } + } + // Modify the form based on Edit Php Batchmove access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_batchmove', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_batchmove', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_batchmove', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_batchmove', 'readonly', 'true'); + if (!$form->getValue('php_batchmove')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_batchmove', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_batchmove', 'required', 'false'); + } + } + // Modify the form based on Edit Type access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.type', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.type', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('type', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('type', 'readonly', 'true'); + if (!$form->getValue('type')) + { + // Disable fields while saving. + $form->setFieldAttribute('type', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('type', 'required', 'false'); + } + } + // Modify the form based on Edit Php Save access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_save', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_save', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_save', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_save', 'readonly', 'true'); + if (!$form->getValue('php_save')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_save', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_save', 'required', 'false'); + } + } + // Modify the form based on Edit Description access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.description', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.description', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('description', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('description', 'readonly', 'true'); + if (!$form->getValue('description')) + { + // Disable fields while saving. + $form->setFieldAttribute('description', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('description', 'required', 'false'); + } + } + // Modify the form based on Edit Php After Delete access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_after_delete', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_after_delete', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_after_delete', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_after_delete', 'readonly', 'true'); + if (!$form->getValue('php_after_delete')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_after_delete', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_after_delete', 'required', 'false'); + } + } + // Modify the form based on Edit Add Fadein access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_fadein', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_fadein', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_fadein', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_fadein', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_fadein', 'class', ''); + $form->setFieldAttribute('add_fadein', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_fadein')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_fadein', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_fadein', 'required', 'false'); + } + } + // Modify the form based on Edit Icon access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.icon', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.icon', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('icon', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('icon', 'readonly', 'true'); + if (!$form->getValue('icon')) + { + // Disable fields while saving. + $form->setFieldAttribute('icon', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('icon', 'required', 'false'); + } + } + // Modify the form based on Edit Php Getlistquery access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_getlistquery', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_getlistquery', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_getlistquery', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_getlistquery', 'readonly', 'true'); + if (!$form->getValue('php_getlistquery')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_getlistquery', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_getlistquery', 'required', 'false'); + } + } + // Modify the form based on Edit Icon Add access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.icon_add', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.icon_add', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('icon_add', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('icon_add', 'readonly', 'true'); + if (!$form->getValue('icon_add')) + { + // Disable fields while saving. + $form->setFieldAttribute('icon_add', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('icon_add', 'required', 'false'); + } + } + // Modify the form based on Edit Php Allowedit access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_allowedit', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_allowedit', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_allowedit', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_allowedit', 'readonly', 'true'); + if (!$form->getValue('php_allowedit')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_allowedit', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_allowedit', 'required', 'false'); + } + } + // Modify the form based on Edit Icon Category access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.icon_category', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.icon_category', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('icon_category', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('icon_category', 'readonly', 'true'); + if (!$form->getValue('icon_category')) + { + // Disable fields while saving. + $form->setFieldAttribute('icon_category', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('icon_category', 'required', 'false'); + } + } + // Modify the form based on Edit Php After Publish access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_after_publish', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_after_publish', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_after_publish', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_after_publish', 'readonly', 'true'); + if (!$form->getValue('php_after_publish')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_after_publish', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_after_publish', 'required', 'false'); + } + } + // Modify the form based on Edit Source access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.source', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.source', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('source', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('source', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('source', 'class', ''); + $form->setFieldAttribute('source', 'class', $class.' disabled no-click'); + if (!$form->getValue('source')) + { + // Disable fields while saving. + $form->setFieldAttribute('source', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('source', 'required', 'false'); + } + } + // Modify the form based on Edit Php Getitems access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_getitems', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_getitems', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_getitems', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_getitems', 'readonly', 'true'); + if (!$form->getValue('php_getitems')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_getitems', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_getitems', 'required', 'false'); + } + } + // Modify the form based on Edit Php Import access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_import', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_import', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_import', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_import', 'readonly', 'true'); + if (!$form->getValue('php_import')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_import', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_import', 'required', 'false'); + } + } + // Modify the form based on Edit Addpermissions access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.addpermissions', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.addpermissions', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addpermissions', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addpermissions', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addpermissions', 'class', ''); + $form->setFieldAttribute('addpermissions', 'class', $class.' disabled no-click'); + if (!$form->getValue('addpermissions')) + { + // Disable fields while saving. + $form->setFieldAttribute('addpermissions', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addpermissions', 'required', 'false'); + } + } + // Modify the form based on Edit Php Getitems After All access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_getitems_after_all', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_getitems_after_all', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_getitems_after_all', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_getitems_after_all', 'readonly', 'true'); + if (!$form->getValue('php_getitems_after_all')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_getitems_after_all', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_getitems_after_all', 'required', 'false'); + } + } + // Modify the form based on Edit Addtabs access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.addtabs', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.addtabs', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addtabs', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addtabs', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addtabs', 'class', ''); + $form->setFieldAttribute('addtabs', 'class', $class.' disabled no-click'); + if (!$form->getValue('addtabs')) + { + // Disable fields while saving. + $form->setFieldAttribute('addtabs', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addtabs', 'required', 'false'); + } + } + // Modify the form based on Edit Php Before Save access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_before_save', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_before_save', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_before_save', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_before_save', 'readonly', 'true'); + if (!$form->getValue('php_before_save')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_before_save', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_before_save', 'required', 'false'); + } + } + // Modify the form based on Edit Php Postsavehook access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_postsavehook', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_postsavehook', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_postsavehook', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_postsavehook', 'readonly', 'true'); + if (!$form->getValue('php_postsavehook')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_postsavehook', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_postsavehook', 'required', 'false'); + } + } + // Modify the form based on Edit Addfields access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.addfields', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.addfields', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addfields', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addfields', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addfields', 'class', ''); + $form->setFieldAttribute('addfields', 'class', $class.' disabled no-click'); + if (!$form->getValue('addfields')) + { + // Disable fields while saving. + $form->setFieldAttribute('addfields', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addfields', 'required', 'false'); + } + } + // Modify the form based on Edit Php Batchcopy access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_batchcopy', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_batchcopy', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_batchcopy', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_batchcopy', 'readonly', 'true'); + if (!$form->getValue('php_batchcopy')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_batchcopy', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_batchcopy', 'required', 'false'); + } + } + // Modify the form based on Edit Php Before Publish access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_before_publish', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_before_publish', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_before_publish', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_before_publish', 'readonly', 'true'); + if (!$form->getValue('php_before_publish')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_before_publish', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_before_publish', 'required', 'false'); + } + } + // Modify the form based on Edit Addconditions access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.addconditions', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.addconditions', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addconditions', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addconditions', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addconditions', 'class', ''); + $form->setFieldAttribute('addconditions', 'class', $class.' disabled no-click'); + if (!$form->getValue('addconditions')) + { + // Disable fields while saving. + $form->setFieldAttribute('addconditions', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addconditions', 'required', 'false'); + } + } + // Modify the form based on Edit Php Before Delete access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_before_delete', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_before_delete', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_before_delete', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_before_delete', 'readonly', 'true'); + if (!$form->getValue('php_before_delete')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_before_delete', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_before_delete', 'required', 'false'); + } + } + // Modify the form based on Edit Addlinked Views access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.addlinked_views', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.addlinked_views', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addlinked_views', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addlinked_views', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addlinked_views', 'class', ''); + $form->setFieldAttribute('addlinked_views', 'class', $class.' disabled no-click'); + if (!$form->getValue('addlinked_views')) + { + // Disable fields while saving. + $form->setFieldAttribute('addlinked_views', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addlinked_views', 'required', 'false'); + } + } + // Modify the form based on Edit Php Document access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_document', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_document', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_document', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_document', 'readonly', 'true'); + if (!$form->getValue('php_document')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_document', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_document', 'required', 'false'); + } + } + // Modify the form based on Edit Sql access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.sql', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.sql', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('sql', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('sql', 'readonly', 'true'); + if (!$form->getValue('sql')) + { + // Disable fields while saving. + $form->setFieldAttribute('sql', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('sql', 'required', 'false'); + } + } + // Modify the form based on Edit Php Import Display access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_import_display', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_import_display', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_import_display', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_import_display', 'readonly', 'true'); + if (!$form->getValue('php_import_display')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_import_display', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_import_display', 'required', 'false'); + } + } + // Modify the form based on Edit Php Getitem access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_getitem', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_getitem', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_getitem', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_getitem', 'readonly', 'true'); + if (!$form->getValue('php_getitem')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_getitem', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_getitem', 'required', 'false'); + } + } + // Modify the form based on Edit Php Import Save access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_import_save', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_import_save', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_import_save', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_import_save', 'readonly', 'true'); + if (!$form->getValue('php_import_save')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_import_save', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_import_save', 'required', 'false'); + } + } + // Modify the form based on Edit Add Css View access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_css_view', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_css_view', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_css_view', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_css_view', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_css_view', 'class', ''); + $form->setFieldAttribute('add_css_view', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_css_view')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_css_view', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_css_view', 'required', 'false'); + } + } + // Modify the form based on Edit Css View access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.css_view', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.css_view', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('css_view', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('css_view', 'readonly', 'true'); + if (!$form->getValue('css_view')) + { + // Disable fields while saving. + $form->setFieldAttribute('css_view', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('css_view', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Getitems access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_getitems', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_getitems', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_getitems', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_getitems', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_getitems', 'class', ''); + $form->setFieldAttribute('add_php_getitems', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_getitems')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_getitems', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_getitems', 'required', 'false'); + } + } + // Modify the form based on Edit Add Css Views access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_css_views', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_css_views', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_css_views', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_css_views', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_css_views', 'class', ''); + $form->setFieldAttribute('add_css_views', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_css_views')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_css_views', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_css_views', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Getitems After All access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_getitems_after_all', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_getitems_after_all', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_getitems_after_all', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_getitems_after_all', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_getitems_after_all', 'class', ''); + $form->setFieldAttribute('add_php_getitems_after_all', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_getitems_after_all')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_getitems_after_all', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_getitems_after_all', 'required', 'false'); + } + } + // Modify the form based on Edit Css Views access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.css_views', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.css_views', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('css_views', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('css_views', 'readonly', 'true'); + if (!$form->getValue('css_views')) + { + // Disable fields while saving. + $form->setFieldAttribute('css_views', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('css_views', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Getlistquery access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_getlistquery', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_getlistquery', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_getlistquery', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_getlistquery', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_getlistquery', 'class', ''); + $form->setFieldAttribute('add_php_getlistquery', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_getlistquery')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_getlistquery', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_getlistquery', 'required', 'false'); + } + } + // Modify the form based on Edit Add Javascript View File access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_javascript_view_file', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_javascript_view_file', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_javascript_view_file', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_javascript_view_file', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_javascript_view_file', 'class', ''); + $form->setFieldAttribute('add_javascript_view_file', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_javascript_view_file')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_javascript_view_file', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_javascript_view_file', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Before Save access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_before_save', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_before_save', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_before_save', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_before_save', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_before_save', 'class', ''); + $form->setFieldAttribute('add_php_before_save', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_before_save')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_before_save', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_before_save', 'required', 'false'); + } + } + // Modify the form based on Edit Javascript View File access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.javascript_view_file', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.javascript_view_file', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('javascript_view_file', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('javascript_view_file', 'readonly', 'true'); + if (!$form->getValue('javascript_view_file')) + { + // Disable fields while saving. + $form->setFieldAttribute('javascript_view_file', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('javascript_view_file', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Save access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_save', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_save', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_save', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_save', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_save', 'class', ''); + $form->setFieldAttribute('add_php_save', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_save')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_save', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_save', 'required', 'false'); + } + } + // Modify the form based on Edit Add Javascript View Footer access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_javascript_view_footer', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_javascript_view_footer', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_javascript_view_footer', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_javascript_view_footer', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_javascript_view_footer', 'class', ''); + $form->setFieldAttribute('add_javascript_view_footer', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_javascript_view_footer')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_javascript_view_footer', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_javascript_view_footer', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Postsavehook access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_postsavehook', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_postsavehook', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_postsavehook', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_postsavehook', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_postsavehook', 'class', ''); + $form->setFieldAttribute('add_php_postsavehook', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_postsavehook')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_postsavehook', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_postsavehook', 'required', 'false'); + } + } + // Modify the form based on Edit Javascript View Footer access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.javascript_view_footer', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.javascript_view_footer', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('javascript_view_footer', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('javascript_view_footer', 'readonly', 'true'); + if (!$form->getValue('javascript_view_footer')) + { + // Disable fields while saving. + $form->setFieldAttribute('javascript_view_footer', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('javascript_view_footer', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Allowedit access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_allowedit', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_allowedit', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_allowedit', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_allowedit', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_allowedit', 'class', ''); + $form->setFieldAttribute('add_php_allowedit', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_allowedit')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_allowedit', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_allowedit', 'required', 'false'); + } + } + // Modify the form based on Edit Add Javascript Views File access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_javascript_views_file', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_javascript_views_file', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_javascript_views_file', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_javascript_views_file', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_javascript_views_file', 'class', ''); + $form->setFieldAttribute('add_javascript_views_file', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_javascript_views_file')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_javascript_views_file', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_javascript_views_file', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Batchcopy access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_batchcopy', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_batchcopy', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_batchcopy', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_batchcopy', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_batchcopy', 'class', ''); + $form->setFieldAttribute('add_php_batchcopy', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_batchcopy')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_batchcopy', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_batchcopy', 'required', 'false'); + } + } + // Modify the form based on Edit Javascript Views File access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.javascript_views_file', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.javascript_views_file', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('javascript_views_file', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('javascript_views_file', 'readonly', 'true'); + if (!$form->getValue('javascript_views_file')) + { + // Disable fields while saving. + $form->setFieldAttribute('javascript_views_file', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('javascript_views_file', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Batchmove access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_batchmove', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_batchmove', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_batchmove', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_batchmove', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_batchmove', 'class', ''); + $form->setFieldAttribute('add_php_batchmove', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_batchmove')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_batchmove', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_batchmove', 'required', 'false'); + } + } + // Modify the form based on Edit Add Javascript Views Footer access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_javascript_views_footer', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_javascript_views_footer', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_javascript_views_footer', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_javascript_views_footer', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_javascript_views_footer', 'class', ''); + $form->setFieldAttribute('add_javascript_views_footer', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_javascript_views_footer')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_javascript_views_footer', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_javascript_views_footer', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Before Publish access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_before_publish', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_before_publish', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_before_publish', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_before_publish', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_before_publish', 'class', ''); + $form->setFieldAttribute('add_php_before_publish', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_before_publish')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_before_publish', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_before_publish', 'required', 'false'); + } + } + // Modify the form based on Edit Javascript Views Footer access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.javascript_views_footer', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.javascript_views_footer', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('javascript_views_footer', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('javascript_views_footer', 'readonly', 'true'); + if (!$form->getValue('javascript_views_footer')) + { + // Disable fields while saving. + $form->setFieldAttribute('javascript_views_footer', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('javascript_views_footer', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php After Publish access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_after_publish', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_after_publish', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_after_publish', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_after_publish', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_after_publish', 'class', ''); + $form->setFieldAttribute('add_php_after_publish', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_after_publish')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_after_publish', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_after_publish', 'required', 'false'); + } + } + // Modify the form based on Edit Add Custom Button access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_custom_button', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_custom_button', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_custom_button', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_custom_button', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_custom_button', 'class', ''); + $form->setFieldAttribute('add_custom_button', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_custom_button')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_custom_button', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_custom_button', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Before Delete access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_before_delete', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_before_delete', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_before_delete', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_before_delete', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_before_delete', 'class', ''); + $form->setFieldAttribute('add_php_before_delete', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_before_delete')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_before_delete', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_before_delete', 'required', 'false'); + } + } + // Modify the form based on Edit Custom Button access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.custom_button', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.custom_button', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('custom_button', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('custom_button', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('custom_button', 'class', ''); + $form->setFieldAttribute('custom_button', 'class', $class.' disabled no-click'); + if (!$form->getValue('custom_button')) + { + // Disable fields while saving. + $form->setFieldAttribute('custom_button', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('custom_button', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php After Delete access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_after_delete', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_after_delete', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_after_delete', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_after_delete', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_after_delete', 'class', ''); + $form->setFieldAttribute('add_php_after_delete', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_after_delete')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_after_delete', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_after_delete', 'required', 'false'); + } + } + // Modify the form based on Edit Php Controller access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_controller', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_controller', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_controller', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_controller', 'readonly', 'true'); + if (!$form->getValue('php_controller')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_controller', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_controller', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Document access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_document', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_document', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_document', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_document', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_document', 'class', ''); + $form->setFieldAttribute('add_php_document', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_document')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_document', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_document', 'required', 'false'); + } + } + // Modify the form based on Edit Php Model access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_model', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_model', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_model', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_model', 'readonly', 'true'); + if (!$form->getValue('php_model')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_model', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_model', 'required', 'false'); + } + } + // Modify the form based on Edit Add Sql access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_sql', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_sql', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_sql', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_sql', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_sql', 'class', ''); + $form->setFieldAttribute('add_sql', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_sql')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_sql', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_sql', 'required', 'false'); + } + } + // Modify the form based on Edit Php Controller List access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_controller_list', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_controller_list', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_controller_list', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_controller_list', 'readonly', 'true'); + if (!$form->getValue('php_controller_list')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_controller_list', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_controller_list', 'required', 'false'); + } + } + // Modify the form based on Edit Addtables access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.addtables', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.addtables', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addtables', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addtables', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addtables', 'class', ''); + $form->setFieldAttribute('addtables', 'class', $class.' disabled no-click'); + if (!$form->getValue('addtables')) + { + // Disable fields while saving. + $form->setFieldAttribute('addtables', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addtables', 'required', 'false'); + } + } + // Modify the form based on Edit Php Model List access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_model_list', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_model_list', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_model_list', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_model_list', 'readonly', 'true'); + if (!$form->getValue('php_model_list')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_model_list', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_model_list', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Ajax access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_ajax', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_ajax', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_ajax', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_ajax', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_ajax', 'class', ''); + $form->setFieldAttribute('add_php_ajax', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_ajax')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_ajax', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_ajax', 'required', 'false'); + } + } + // Modify the form based on Edit Add Custom Import access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_custom_import', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_custom_import', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_custom_import', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_custom_import', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_custom_import', 'class', ''); + $form->setFieldAttribute('add_custom_import', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_custom_import')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_custom_import', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_custom_import', 'required', 'false'); + } + } + // Modify the form based on Edit Php Ajaxmethod access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_ajaxmethod', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_ajaxmethod', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_ajaxmethod', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_ajaxmethod', 'readonly', 'true'); + if (!$form->getValue('php_ajaxmethod')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_ajaxmethod', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_ajaxmethod', 'required', 'false'); + } + } + // Modify the form based on Edit Html Import View access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.html_import_view', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.html_import_view', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('html_import_view', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('html_import_view', 'readonly', 'true'); + if (!$form->getValue('html_import_view')) + { + // Disable fields while saving. + $form->setFieldAttribute('html_import_view', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('html_import_view', 'required', 'false'); + } + } + // Modify the form based on Edit Ajax Input access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.ajax_input', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.ajax_input', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('ajax_input', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('ajax_input', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('ajax_input', 'class', ''); + $form->setFieldAttribute('ajax_input', 'class', $class.' disabled no-click'); + if (!$form->getValue('ajax_input')) + { + // Disable fields while saving. + $form->setFieldAttribute('ajax_input', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('ajax_input', 'required', 'false'); + } + } + // Modify the form based on Edit Php Import Setdata access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_import_setdata', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_import_setdata', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_import_setdata', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_import_setdata', 'readonly', 'true'); + if (!$form->getValue('php_import_setdata')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_import_setdata', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_import_setdata', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Getitem access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.add_php_getitem', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.add_php_getitem', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_getitem', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_getitem', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_getitem', 'class', ''); + $form->setFieldAttribute('add_php_getitem', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_getitem')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_getitem', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_getitem', 'required', 'false'); + } + } + // Modify the form based on Edit Php Import Ext access controls. + if ($id != 0 && (!$user->authorise('admin_view.edit.php_import_ext', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.php_import_ext', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_import_ext', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_import_ext', 'readonly', 'true'); + if (!$form->getValue('php_import_ext')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_import_ext', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_import_ext', 'required', 'false'); + } + } // Only load these values if no id is found if (0 == $id) { @@ -1278,22 +2621,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['metadata'] = (string) $metadata; } - // Set the php_getitems_after_all string to base64 string. - if (isset($data['php_getitems_after_all'])) + // Set the php_batchmove string to base64 string. + if (isset($data['php_batchmove'])) { - $data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']); - } - - // Set the php_after_publish string to base64 string. - if (isset($data['php_after_publish'])) - { - $data['php_after_publish'] = base64_encode($data['php_after_publish']); - } - - // Set the php_allowedit string to base64 string. - if (isset($data['php_allowedit'])) - { - $data['php_allowedit'] = base64_encode($data['php_allowedit']); + $data['php_batchmove'] = base64_encode($data['php_batchmove']); } // Set the php_save string to base64 string. @@ -1302,28 +2633,52 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_save'] = base64_encode($data['php_save']); } - // Set the php_batchmove string to base64 string. - if (isset($data['php_batchmove'])) - { - $data['php_batchmove'] = base64_encode($data['php_batchmove']); - } - // Set the php_after_delete string to base64 string. if (isset($data['php_after_delete'])) { $data['php_after_delete'] = base64_encode($data['php_after_delete']); } + // Set the php_getlistquery string to base64 string. + if (isset($data['php_getlistquery'])) + { + $data['php_getlistquery'] = base64_encode($data['php_getlistquery']); + } + + // Set the php_allowedit string to base64 string. + if (isset($data['php_allowedit'])) + { + $data['php_allowedit'] = base64_encode($data['php_allowedit']); + } + + // Set the php_after_publish string to base64 string. + if (isset($data['php_after_publish'])) + { + $data['php_after_publish'] = base64_encode($data['php_after_publish']); + } + // Set the php_getitems string to base64 string. if (isset($data['php_getitems'])) { $data['php_getitems'] = base64_encode($data['php_getitems']); } - // Set the php_getlistquery string to base64 string. - if (isset($data['php_getlistquery'])) + // Set the php_import string to base64 string. + if (isset($data['php_import'])) { - $data['php_getlistquery'] = base64_encode($data['php_getlistquery']); + $data['php_import'] = base64_encode($data['php_import']); + } + + // Set the php_getitems_after_all string to base64 string. + if (isset($data['php_getitems_after_all'])) + { + $data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']); + } + + // Set the php_before_save string to base64 string. + if (isset($data['php_before_save'])) + { + $data['php_before_save'] = base64_encode($data['php_before_save']); } // Set the php_postsavehook string to base64 string. @@ -1350,12 +2705,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_before_delete'] = base64_encode($data['php_before_delete']); } - // Set the php_import string to base64 string. - if (isset($data['php_import'])) - { - $data['php_import'] = base64_encode($data['php_import']); - } - // Set the php_document string to base64 string. if (isset($data['php_document'])) { @@ -1368,18 +2717,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['sql'] = base64_encode($data['sql']); } - // Set the php_getitem string to base64 string. - if (isset($data['php_getitem'])) - { - $data['php_getitem'] = base64_encode($data['php_getitem']); - } - // Set the php_import_display string to base64 string. if (isset($data['php_import_display'])) { $data['php_import_display'] = base64_encode($data['php_import_display']); } + // Set the php_getitem string to base64 string. + if (isset($data['php_getitem'])) + { + $data['php_getitem'] = base64_encode($data['php_getitem']); + } + // Set the php_import_save string to base64 string. if (isset($data['php_import_save'])) { @@ -1446,18 +2795,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_model_list'] = base64_encode($data['php_model_list']); } - // Set the html_import_view string to base64 string. - if (isset($data['html_import_view'])) - { - $data['html_import_view'] = base64_encode($data['html_import_view']); - } - // Set the php_ajaxmethod string to base64 string. if (isset($data['php_ajaxmethod'])) { $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); } + // Set the html_import_view string to base64 string. + if (isset($data['html_import_view'])) + { + $data['html_import_view'] = base64_encode($data['html_import_view']); + } + // Set the php_import_setdata string to base64 string. if (isset($data['php_import_setdata'])) { diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 32317290a..c30624758 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php @@ -191,7 +191,7 @@ class ComponentbuilderModelAdmin_views extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.name_list LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.description LIKE '.$search.' OR a.type LIKE '.$search.')'); + $query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.name_list LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.type LIKE '.$search.' OR a.description LIKE '.$search.')'); } } @@ -262,22 +262,26 @@ class ComponentbuilderModelAdmin_views extends JModelList continue; } - // decode php_getitems_after_all - $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); - // decode php_after_publish - $item->php_after_publish = base64_decode($item->php_after_publish); - // decode php_allowedit - $item->php_allowedit = base64_decode($item->php_allowedit); - // decode php_save - $item->php_save = base64_decode($item->php_save); // decode php_batchmove $item->php_batchmove = base64_decode($item->php_batchmove); + // decode php_save + $item->php_save = base64_decode($item->php_save); // decode php_after_delete $item->php_after_delete = base64_decode($item->php_after_delete); - // decode php_getitems - $item->php_getitems = base64_decode($item->php_getitems); // decode php_getlistquery $item->php_getlistquery = base64_decode($item->php_getlistquery); + // decode php_allowedit + $item->php_allowedit = base64_decode($item->php_allowedit); + // decode php_after_publish + $item->php_after_publish = base64_decode($item->php_after_publish); + // decode php_getitems + $item->php_getitems = base64_decode($item->php_getitems); + // decode php_import + $item->php_import = base64_decode($item->php_import); + // decode php_getitems_after_all + $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); + // decode php_before_save + $item->php_before_save = base64_decode($item->php_before_save); // decode php_postsavehook $item->php_postsavehook = base64_decode($item->php_postsavehook); // decode php_batchcopy @@ -286,16 +290,14 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->php_before_publish = base64_decode($item->php_before_publish); // decode php_before_delete $item->php_before_delete = base64_decode($item->php_before_delete); - // decode php_import - $item->php_import = base64_decode($item->php_import); // decode php_document $item->php_document = base64_decode($item->php_document); // decode sql $item->sql = base64_decode($item->sql); - // decode php_getitem - $item->php_getitem = base64_decode($item->php_getitem); // decode php_import_display $item->php_import_display = base64_decode($item->php_import_display); + // decode php_getitem + $item->php_getitem = base64_decode($item->php_getitem); // decode php_import_save $item->php_import_save = base64_decode($item->php_import_save); // decode css_view @@ -318,10 +320,10 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->php_controller_list = base64_decode($item->php_controller_list); // decode php_model_list $item->php_model_list = base64_decode($item->php_model_list); - // decode html_import_view - $item->html_import_view = base64_decode($item->html_import_view); // decode php_ajaxmethod $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); + // decode html_import_view + $item->html_import_view = base64_decode($item->html_import_view); // decode php_import_setdata $item->php_import_setdata = base64_decode($item->php_import_setdata); // decode php_import_ext diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 4eb7fb227..a6e9b84b2 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index f5d20a379..364663e10 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 eb2b91d45..55d7b5bb1 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -179,7 +179,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVyilinked_components() + public function getVyjlinked_components() { // Get the user object. $user = JFactory::getUser(); diff --git a/admin/models/field.php b/admin/models/field.php index d9f483b27..8fa0dbc10 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 getWaalinked_admin_views() + public function getWablinked_admin_views() { // Get the user object. $user = JFactory::getUser(); diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 5c39c94ef..a8c3fccf0 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 e040f3655..f373b53ec 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 9645afd3b..5709c8f04 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 fa9e7e160..8eb90ba88 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 8d35d3a24..623b354b2 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 fbe137c7e..6be42116e 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 3ded6016e..7e6bd70a0 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 e59e5bfeb..4e5f1e564 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 6028b308d..4683d5f95 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 f11beed14..5529fa27e 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 948027a79..90ecd539c 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 7305315f9..7c7d7bfc5 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 f1640a8ba..cf61e0488 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 fc6f0863b..7f877dea8 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 44d135a72..2a3bdbe70 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 deleted file mode 100644 index 691eac1d9..000000000 --- a/admin/models/fields/ftps.php +++ /dev/null @@ -1,171 +0,0 @@ - - @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Builds Complex Joomla Components - -/-----------------------------------------------------------------------------------------------------------------------------*/ - -// No direct access to this file -defined('_JEXEC') or die('Restricted access'); - -// import 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 00908d106..482522b65 100644 --- a/admin/models/fields/lang.php +++ b/admin/models/fields/lang.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 44a750c00..c8979ff48 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 78099bc28..5ae9182bf 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 5da0ffb4a..15cf3b8bb 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 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 fe9e0dd22..1f6d890e4 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 4527dcafc..57dc6bb28 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -111,7 +111,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWabfields() + public function getWacfields() { // Get the user object. $user = JFactory::getUser(); @@ -195,13 +195,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationWabfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationWacfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationWabfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationWacfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationWabfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationWacfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationWabfields($item->store, 'store'); + $item->store = $this->selectionTranslationWacfields($item->store, 'store'); } } @@ -215,7 +215,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationWabfields($value,$name) + public function selectionTranslationWacfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index d08e41ba3..cc2d7223d 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js @@ -46,16 +46,17 @@ jform_vvvvvxpvxj_required = false; jform_vvvvvxqvxk_required = false; jform_vvvvvxrvxl_required = false; jform_vvvvvxsvxm_required = false; -jform_vvvvvxwvxn_required = false; -jform_vvvvvxwvxo_required = false; -jform_vvvvvxwvxp_required = false; -jform_vvvvvxwvxq_required = false; -jform_vvvvvxwvxr_required = false; -jform_vvvvvxwvxs_required = false; -jform_vvvvvxyvxt_required = false; -jform_vvvvvxyvxu_required = false; -jform_vvvvvxyvxv_required = false; -jform_vvvvvxyvxw_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; // Initial Script jQuery(document).ready(function() @@ -93,55 +94,58 @@ jQuery(document).ready(function() var add_php_getlistquery_vvvvvxg = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); vvvvvxg(add_php_getlistquery_vvvvvxg); - var add_php_save_vvvvvxh = jQuery("#jform_add_php_save input[type='radio']:checked").val(); - vvvvvxh(add_php_save_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_postsavehook_vvvvvxi = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); - vvvvvxi(add_php_postsavehook_vvvvvxi); + var add_php_save_vvvvvxi = jQuery("#jform_add_php_save input[type='radio']:checked").val(); + vvvvvxi(add_php_save_vvvvvxi); - var add_php_allowedit_vvvvvxj = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); - vvvvvxj(add_php_allowedit_vvvvvxj); + var add_php_postsavehook_vvvvvxj = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); + vvvvvxj(add_php_postsavehook_vvvvvxj); - var add_php_batchcopy_vvvvvxk = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); - vvvvvxk(add_php_batchcopy_vvvvvxk); + var add_php_allowedit_vvvvvxk = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); + vvvvvxk(add_php_allowedit_vvvvvxk); - var add_php_batchmove_vvvvvxl = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); - vvvvvxl(add_php_batchmove_vvvvvxl); + var add_php_batchcopy_vvvvvxl = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); + vvvvvxl(add_php_batchcopy_vvvvvxl); - var add_php_before_publish_vvvvvxm = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); - vvvvvxm(add_php_before_publish_vvvvvxm); + var add_php_batchmove_vvvvvxm = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); + vvvvvxm(add_php_batchmove_vvvvvxm); - var add_php_after_publish_vvvvvxn = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); - vvvvvxn(add_php_after_publish_vvvvvxn); + var add_php_before_publish_vvvvvxn = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); + vvvvvxn(add_php_before_publish_vvvvvxn); - var add_php_before_delete_vvvvvxo = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); - vvvvvxo(add_php_before_delete_vvvvvxo); + var add_php_after_publish_vvvvvxo = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); + vvvvvxo(add_php_after_publish_vvvvvxo); - var add_php_after_delete_vvvvvxp = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); - vvvvvxp(add_php_after_delete_vvvvvxp); + var add_php_before_delete_vvvvvxp = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); + vvvvvxp(add_php_before_delete_vvvvvxp); - var add_php_document_vvvvvxq = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvxq(add_php_document_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_sql_vvvvvxr = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxr(add_sql_vvvvvxr); + var add_php_document_vvvvvxr = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvxr(add_php_document_vvvvvxr); - var source_vvvvvxs = jQuery("#jform_source input[type='radio']:checked").val(); var add_sql_vvvvvxs = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxs(source_vvvvvxs,add_sql_vvvvvxs); + vvvvvxs(add_sql_vvvvvxs); - 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 source_vvvvvxt = jQuery("#jform_source input[type='radio']:checked").val(); + var add_sql_vvvvvxt = jQuery("#jform_add_sql input[type='radio']:checked").val(); + vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt); - var add_custom_import_vvvvvxw = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); - vvvvvxw(add_custom_import_vvvvvxw); + 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 add_custom_import_vvvvvxx = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); vvvvvxx(add_custom_import_vvvvvxx); - var add_custom_button_vvvvvxy = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvxy(add_custom_button_vvvvvxy); + 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); }); // the vvvvvww function @@ -488,382 +492,413 @@ function vvvvvxg(add_php_getlistquery_vvvvvxg) } // the vvvvvxh function -function vvvvvxh(add_php_save_vvvvvxh) +function vvvvvxh(add_php_before_save_vvvvvxh) { // set the function logic - if (add_php_save_vvvvvxh == 1) + if (add_php_before_save_vvvvvxh == 1) { - jQuery('#jform_php_save').closest('.control-group').show(); + jQuery('#jform_php_before_save').closest('.control-group').show(); if (jform_vvvvvxhvxb_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_vvvvvxhvxb_required = false; } } else { - jQuery('#jform_php_save').closest('.control-group').hide(); + jQuery('#jform_php_before_save').closest('.control-group').hide(); if (!jform_vvvvvxhvxb_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_vvvvvxhvxb_required = true; } } } // the vvvvvxi function -function vvvvvxi(add_php_postsavehook_vvvvvxi) +function vvvvvxi(add_php_save_vvvvvxi) { // set the function logic - if (add_php_postsavehook_vvvvvxi == 1) + if (add_php_save_vvvvvxi == 1) { - jQuery('#jform_php_postsavehook').closest('.control-group').show(); + jQuery('#jform_php_save').closest('.control-group').show(); if (jform_vvvvvxivxc_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_vvvvvxivxc_required = false; } } else { - jQuery('#jform_php_postsavehook').closest('.control-group').hide(); + jQuery('#jform_php_save').closest('.control-group').hide(); if (!jform_vvvvvxivxc_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_vvvvvxivxc_required = true; } } } // the vvvvvxj function -function vvvvvxj(add_php_allowedit_vvvvvxj) +function vvvvvxj(add_php_postsavehook_vvvvvxj) { // set the function logic - if (add_php_allowedit_vvvvvxj == 1) + if (add_php_postsavehook_vvvvvxj == 1) { - jQuery('#jform_php_allowedit').closest('.control-group').show(); + jQuery('#jform_php_postsavehook').closest('.control-group').show(); if (jform_vvvvvxjvxd_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_vvvvvxjvxd_required = false; } } else { - jQuery('#jform_php_allowedit').closest('.control-group').hide(); + jQuery('#jform_php_postsavehook').closest('.control-group').hide(); if (!jform_vvvvvxjvxd_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_vvvvvxjvxd_required = true; } } } // the vvvvvxk function -function vvvvvxk(add_php_batchcopy_vvvvvxk) +function vvvvvxk(add_php_allowedit_vvvvvxk) { // set the function logic - if (add_php_batchcopy_vvvvvxk == 1) + if (add_php_allowedit_vvvvvxk == 1) { - jQuery('#jform_php_batchcopy').closest('.control-group').show(); + jQuery('#jform_php_allowedit').closest('.control-group').show(); if (jform_vvvvvxkvxe_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_vvvvvxkvxe_required = false; } } else { - jQuery('#jform_php_batchcopy').closest('.control-group').hide(); + jQuery('#jform_php_allowedit').closest('.control-group').hide(); if (!jform_vvvvvxkvxe_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_vvvvvxkvxe_required = true; } } } // the vvvvvxl function -function vvvvvxl(add_php_batchmove_vvvvvxl) +function vvvvvxl(add_php_batchcopy_vvvvvxl) { // set the function logic - if (add_php_batchmove_vvvvvxl == 1) + if (add_php_batchcopy_vvvvvxl == 1) { - jQuery('#jform_php_batchmove').closest('.control-group').show(); + jQuery('#jform_php_batchcopy').closest('.control-group').show(); if (jform_vvvvvxlvxf_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_vvvvvxlvxf_required = false; } } else { - jQuery('#jform_php_batchmove').closest('.control-group').hide(); + jQuery('#jform_php_batchcopy').closest('.control-group').hide(); if (!jform_vvvvvxlvxf_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_vvvvvxlvxf_required = true; } } } // the vvvvvxm function -function vvvvvxm(add_php_before_publish_vvvvvxm) +function vvvvvxm(add_php_batchmove_vvvvvxm) { // set the function logic - if (add_php_before_publish_vvvvvxm == 1) + if (add_php_batchmove_vvvvvxm == 1) { - jQuery('#jform_php_before_publish').closest('.control-group').show(); + jQuery('#jform_php_batchmove').closest('.control-group').show(); if (jform_vvvvvxmvxg_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_vvvvvxmvxg_required = false; } } else { - jQuery('#jform_php_before_publish').closest('.control-group').hide(); + jQuery('#jform_php_batchmove').closest('.control-group').hide(); if (!jform_vvvvvxmvxg_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_vvvvvxmvxg_required = true; } } } // the vvvvvxn function -function vvvvvxn(add_php_after_publish_vvvvvxn) +function vvvvvxn(add_php_before_publish_vvvvvxn) { // set the function logic - if (add_php_after_publish_vvvvvxn == 1) + if (add_php_before_publish_vvvvvxn == 1) { - jQuery('#jform_php_after_publish').closest('.control-group').show(); + jQuery('#jform_php_before_publish').closest('.control-group').show(); if (jform_vvvvvxnvxh_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_vvvvvxnvxh_required = false; } } else { - jQuery('#jform_php_after_publish').closest('.control-group').hide(); + jQuery('#jform_php_before_publish').closest('.control-group').hide(); if (!jform_vvvvvxnvxh_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_vvvvvxnvxh_required = true; } } } // the vvvvvxo function -function vvvvvxo(add_php_before_delete_vvvvvxo) +function vvvvvxo(add_php_after_publish_vvvvvxo) { // set the function logic - if (add_php_before_delete_vvvvvxo == 1) + if (add_php_after_publish_vvvvvxo == 1) { - jQuery('#jform_php_before_delete').closest('.control-group').show(); + jQuery('#jform_php_after_publish').closest('.control-group').show(); if (jform_vvvvvxovxi_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_vvvvvxovxi_required = false; } } else { - jQuery('#jform_php_before_delete').closest('.control-group').hide(); + jQuery('#jform_php_after_publish').closest('.control-group').hide(); if (!jform_vvvvvxovxi_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_vvvvvxovxi_required = true; } } } // the vvvvvxp function -function vvvvvxp(add_php_after_delete_vvvvvxp) +function vvvvvxp(add_php_before_delete_vvvvvxp) { // set the function logic - if (add_php_after_delete_vvvvvxp == 1) + if (add_php_before_delete_vvvvvxp == 1) { - jQuery('#jform_php_after_delete').closest('.control-group').show(); + jQuery('#jform_php_before_delete').closest('.control-group').show(); if (jform_vvvvvxpvxj_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_vvvvvxpvxj_required = false; } } else { - jQuery('#jform_php_after_delete').closest('.control-group').hide(); + jQuery('#jform_php_before_delete').closest('.control-group').hide(); if (!jform_vvvvvxpvxj_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_vvvvvxpvxj_required = true; } } } // the vvvvvxq function -function vvvvvxq(add_php_document_vvvvvxq) +function vvvvvxq(add_php_after_delete_vvvvvxq) { // set the function logic - if (add_php_document_vvvvvxq == 1) + if (add_php_after_delete_vvvvvxq == 1) { - jQuery('#jform_php_document').closest('.control-group').show(); + jQuery('#jform_php_after_delete').closest('.control-group').show(); if (jform_vvvvvxqvxk_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_vvvvvxqvxk_required = false; } } else { - jQuery('#jform_php_document').closest('.control-group').hide(); + jQuery('#jform_php_after_delete').closest('.control-group').hide(); if (!jform_vvvvvxqvxk_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_vvvvvxqvxk_required = true; } } } // the vvvvvxr function -function vvvvvxr(add_sql_vvvvvxr) +function vvvvvxr(add_php_document_vvvvvxr) { // set the function logic - if (add_sql_vvvvvxr == 1) + if (add_php_document_vvvvvxr == 1) { - jQuery('#jform_source').closest('.control-group').show(); + jQuery('#jform_php_document').closest('.control-group').show(); if (jform_vvvvvxrvxl_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_vvvvvxrvxl_required = false; } } else { - jQuery('#jform_source').closest('.control-group').hide(); + jQuery('#jform_php_document').closest('.control-group').hide(); if (!jform_vvvvvxrvxl_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_vvvvvxrvxl_required = true; } } } // the vvvvvxs function -function vvvvvxs(source_vvvvvxs,add_sql_vvvvvxs) +function vvvvvxs(add_sql_vvvvvxs) { // set the function logic - if (source_vvvvvxs == 2 && add_sql_vvvvvxs == 1) + if (add_sql_vvvvvxs == 1) { - jQuery('#jform_sql').closest('.control-group').show(); + jQuery('#jform_source').closest('.control-group').show(); if (jform_vvvvvxsvxm_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_vvvvvxsvxm_required = false; } } else { - jQuery('#jform_sql').closest('.control-group').hide(); + jQuery('#jform_source').closest('.control-group').hide(); if (!jform_vvvvvxsvxm_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_vvvvvxsvxm_required = true; } } } -// the vvvvvxu function -function vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu) +// the vvvvvxt function +function vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt) { // set the function logic - if (source_vvvvvxu == 1 && add_sql_vvvvvxu == 1) + if (source_vvvvvxt == 2 && add_sql_vvvvvxt == 1) + { + jQuery('#jform_sql').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'); + jform_vvvvvxtvxn_required = false; + } + + } + else + { + jQuery('#jform_sql').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'); + jform_vvvvvxtvxn_required = true; + } + } +} + +// the vvvvvxv function +function vvvvvxv(source_vvvvvxv,add_sql_vvvvvxv) +{ + // set the function logic + if (source_vvvvvxv == 1 && add_sql_vvvvvxv == 1) { jQuery('#jform_addtables').closest('.control-group').show(); } @@ -873,139 +908,139 @@ function vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu) } } -// the vvvvvxw function -function vvvvvxw(add_custom_import_vvvvvxw) +// the vvvvvxx function +function vvvvvxx(add_custom_import_vvvvvxx) { // set the function logic - if (add_custom_import_vvvvvxw == 1) + if (add_custom_import_vvvvvxx == 1) { jQuery('#jform_html_import_view').closest('.control-group').show(); - if (jform_vvvvvxwvxn_required) + if (jform_vvvvvxxvxo_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_vvvvvxwvxn_required = false; + jform_vvvvvxxvxo_required = false; } jQuery('.note_advanced_import').closest('.control-group').show(); jQuery('#jform_php_import_display').closest('.control-group').show(); - if (jform_vvvvvxwvxo_required) + if (jform_vvvvvxxvxp_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_vvvvvxwvxo_required = false; + jform_vvvvvxxvxp_required = false; } jQuery('#jform_php_import_ext').closest('.control-group').show(); - if (jform_vvvvvxwvxp_required) + if (jform_vvvvvxxvxq_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_vvvvvxwvxp_required = false; + jform_vvvvvxxvxq_required = false; } jQuery('#jform_php_import').closest('.control-group').show(); - if (jform_vvvvvxwvxq_required) + if (jform_vvvvvxxvxr_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_vvvvvxwvxq_required = false; + jform_vvvvvxxvxr_required = false; } jQuery('#jform_php_import_save').closest('.control-group').show(); - if (jform_vvvvvxwvxr_required) + if (jform_vvvvvxxvxs_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_vvvvvxwvxr_required = false; + jform_vvvvvxxvxs_required = false; } jQuery('#jform_php_import_setdata').closest('.control-group').show(); - if (jform_vvvvvxwvxs_required) + if (jform_vvvvvxxvxt_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_vvvvvxwvxs_required = false; + jform_vvvvvxxvxt_required = false; } } else { jQuery('#jform_html_import_view').closest('.control-group').hide(); - if (!jform_vvvvvxwvxn_required) + if (!jform_vvvvvxxvxo_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_vvvvvxwvxn_required = true; + jform_vvvvvxxvxo_required = true; } jQuery('.note_advanced_import').closest('.control-group').hide(); jQuery('#jform_php_import_display').closest('.control-group').hide(); - if (!jform_vvvvvxwvxo_required) + if (!jform_vvvvvxxvxp_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_vvvvvxwvxo_required = true; + jform_vvvvvxxvxp_required = true; } jQuery('#jform_php_import_ext').closest('.control-group').hide(); - if (!jform_vvvvvxwvxp_required) + if (!jform_vvvvvxxvxq_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_vvvvvxwvxp_required = true; + jform_vvvvvxxvxq_required = true; } jQuery('#jform_php_import').closest('.control-group').hide(); - if (!jform_vvvvvxwvxq_required) + if (!jform_vvvvvxxvxr_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_vvvvvxwvxq_required = true; + jform_vvvvvxxvxr_required = true; } jQuery('#jform_php_import_save').closest('.control-group').hide(); - if (!jform_vvvvvxwvxr_required) + if (!jform_vvvvvxxvxs_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_vvvvvxwvxr_required = true; + jform_vvvvvxxvxs_required = true; } jQuery('#jform_php_import_setdata').closest('.control-group').hide(); - if (!jform_vvvvvxwvxs_required) + if (!jform_vvvvvxxvxt_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_vvvvvxwvxs_required = true; + jform_vvvvvxxvxt_required = true; } } } -// 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 == 0) + if (add_custom_import_vvvvvxy == 0) { jQuery('.note_beginner_import').closest('.control-group').show(); } @@ -1015,51 +1050,51 @@ function vvvvvxx(add_custom_import_vvvvvxx) } } -// the vvvvvxy function -function vvvvvxy(add_custom_button_vvvvvxy) +// the vvvvvxz function +function vvvvvxz(add_custom_button_vvvvvxz) { // set the function logic - if (add_custom_button_vvvvvxy == 1) + if (add_custom_button_vvvvvxz == 1) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvxyvxt_required) + if (jform_vvvvvxzvxu_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_vvvvvxyvxt_required = false; + jform_vvvvvxzvxu_required = false; } jQuery('#jform_php_controller_list').closest('.control-group').show(); - if (jform_vvvvvxyvxu_required) + if (jform_vvvvvxzvxv_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_vvvvvxyvxu_required = false; + jform_vvvvvxzvxv_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvxyvxv_required) + if (jform_vvvvvxzvxw_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_vvvvvxyvxv_required = false; + jform_vvvvvxzvxw_required = false; } jQuery('#jform_php_model_list').closest('.control-group').show(); - if (jform_vvvvvxyvxw_required) + if (jform_vvvvvxzvxx_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_vvvvvxyvxw_required = false; + jform_vvvvvxzvxx_required = false; } } @@ -1067,40 +1102,40 @@ function vvvvvxy(add_custom_button_vvvvvxy) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvxyvxt_required) + if (!jform_vvvvvxzvxu_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_vvvvvxyvxt_required = true; + jform_vvvvvxzvxu_required = true; } jQuery('#jform_php_controller_list').closest('.control-group').hide(); - if (!jform_vvvvvxyvxu_required) + if (!jform_vvvvvxzvxv_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_vvvvvxyvxu_required = true; + jform_vvvvvxzvxv_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvxyvxv_required) + if (!jform_vvvvvxzvxw_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_vvvvvxyvxv_required = true; + jform_vvvvvxzvxw_required = true; } jQuery('#jform_php_model_list').closest('.control-group').hide(); - if (!jform_vvvvvxyvxw_required) + if (!jform_vvvvvxzvxx_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_vvvvvxyvxw_required = true; + jform_vvvvvxzvxx_required = true; } } } diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index 6a7b86c42..af259205a 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -149,30 +149,45 @@ message="Error! Please add some short description here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> - + - + + + + + + + @@ -187,6 +202,19 @@ filter="HTML" hint="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT" /> + + COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE + + + + + + - + + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP - - - - - + - - - + @@ -353,23 +407,21 @@ - - - - + + - + - + @@ -637,21 +689,6 @@ - - - - + + + + - + @@ -914,32 +966,6 @@ - - - - - - - - - - + + - + - + COM_COMPONENTBUILDER_ADMIN_VIEW_NO - - - - - - COM_COMPONENTBUILDER_ADMIN_VIEW_NO - + @@ -1177,11 +1176,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FILE_HINT" required="true" /> - + @@ -1205,11 +1204,11 @@ - + @@ -1232,11 +1231,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_HINT" required="true" /> - + @@ -1260,11 +1259,11 @@ - + @@ -1287,11 +1286,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FILE_HINT" required="true" /> - + @@ -1315,11 +1314,11 @@ - + @@ -1342,11 +1341,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FOOTER_HINT" required="true" /> - + @@ -1370,11 +1369,11 @@ - + @@ -1896,11 +1895,11 @@ - + @@ -1923,11 +1922,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_HINT" required="false" /> - + @@ -1950,6 +1949,33 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_HINT" required="false" /> + + + + + + + + - - - - + + + + + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_NO - - - - - - - - - + @@ -2223,6 +2223,33 @@ + + + + + + + + - + - - - - + type="editor" + name="readme" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL" + default="You can use all the normal markdown, including the place-holders." + width="100%" + height="1200px" + buttons="false" + editor="none" + filter="raw" + required="true" + /> COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -710,17 +722,17 @@ description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_DESCRIPTION" hide_default="true" /> - + @@ -731,30 +743,19 @@ description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION" directory="" /> - + - - COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OTHER - - - - - - - + @@ -820,21 +787,26 @@ + + + + - + - + - + - - - - + type="text" + name="export_key" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_LABEL" + size="150" + maxlength="265" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_DESCRIPTION" + class="text_area" + required="false" + filter="STRING" + message="Error! Please add export key here." + hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_HINT" + /> + + + + + + + + + + + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - + maximum="500" + filter="SAFEHTML"> - + @@ -2683,11 +2657,11 @@ - + @@ -2708,6 +2682,38 @@ max="40" step="1" /> + + + + + + + + + + + + + + + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - + + - - + + metadata = $registry->toArray(); } - // Get the basic encription. + // Get the basic encryption. $basickey = ComponentbuilderHelper::getCryptKey('basic'); - // Get the encription object. + // Get the encryption object. $basic = new FOFEncryptAes($basickey, 128); if (!empty($item->signature) && $basickey && !is_numeric($item->signature) && $item->signature === base64_encode(base64_decode($item->signature, true))) { - // basic decript data signature. + // basic decrypt data signature. $item->signature = rtrim($basic->decryptString($item->signature), "\0"); } @@ -122,7 +122,7 @@ class ComponentbuilderModelFtp extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWaclinked_components() + public function getWadlinked_components() { // Get the user object. $user = JFactory::getUser(); @@ -892,12 +892,12 @@ class ComponentbuilderModelFtp extends JModelAdmin $data['metadata'] = (string) $metadata; } - // Get the basic encription key. + // Get the basic encryption key. $basickey = ComponentbuilderHelper::getCryptKey('basic'); - // Get the encription object + // Get the encryption object $basic = new FOFEncryptAes($basickey, 128); - // Encript data signature. + // Encrypt data signature. if (isset($data['signature']) && $basickey) { $data['signature'] = $basic->encryptString($data['signature']); diff --git a/admin/models/ftps.php b/admin/models/ftps.php index 7c590624e..57057dcc0 100644 --- a/admin/models/ftps.php +++ b/admin/models/ftps.php @@ -241,9 +241,9 @@ class ComponentbuilderModelFtps extends JModelList { $items = $db->loadObjectList(); - // Get the basic encription key. + // Get the basic encryption key. $basickey = ComponentbuilderHelper::getCryptKey('basic'); - // Get the encription object. + // Get the encryption object. $basic = new FOFEncryptAes($basickey, 128); // set values to display correctly. diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 9d8d15a94..dae6e4e85 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 6 of this MVC - @build 18th October, 2016 + @build 17th October, 2016 @created 4th March, 2016 @package Component Builder @subpackage help_document.php diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 535c913a4..76cc18fdd 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 6 of this MVC - @build 18th October, 2016 + @build 17th October, 2016 @created 4th March, 2016 @package Component Builder @subpackage help_documents.php diff --git a/admin/models/import.php b/admin/models/import.php index c4e0f870c..69c455352 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index 449479db0..9190ba0c3 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index 605c52f35..e86533de5 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 361 of this MVC - @build 24th August, 2017 + @version @update number 366 of this MVC + @build 7th September, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php @@ -95,34 +95,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->php_postflight_update)) + if (!empty($item->readme)) { - // base64 Decode php_postflight_update. - $item->php_postflight_update = base64_decode($item->php_postflight_update); - } - - if (!empty($item->php_preflight_update)) - { - // base64 Decode php_preflight_update. - $item->php_preflight_update = base64_decode($item->php_preflight_update); - } - - if (!empty($item->sql)) - { - // base64 Decode sql. - $item->sql = base64_decode($item->sql); - } - - if (!empty($item->css)) - { - // base64 Decode css. - $item->css = base64_decode($item->css); - } - - if (!empty($item->php_preflight_install)) - { - // base64 Decode php_preflight_install. - $item->php_preflight_install = base64_decode($item->php_preflight_install); + // base64 Decode readme. + $item->readme = base64_decode($item->readme); } if (!empty($item->php_postflight_install)) @@ -131,16 +107,40 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->php_postflight_install = base64_decode($item->php_postflight_install); } + if (!empty($item->php_preflight_install)) + { + // base64 Decode php_preflight_install. + $item->php_preflight_install = base64_decode($item->php_preflight_install); + } + if (!empty($item->php_method_uninstall)) { // base64 Decode php_method_uninstall. $item->php_method_uninstall = base64_decode($item->php_method_uninstall); } - if (!empty($item->readme)) + if (!empty($item->css)) { - // base64 Decode readme. - $item->readme = base64_decode($item->readme); + // base64 Decode css. + $item->css = base64_decode($item->css); + } + + if (!empty($item->php_preflight_update)) + { + // base64 Decode php_preflight_update. + $item->php_preflight_update = base64_decode($item->php_preflight_update); + } + + if (!empty($item->php_postflight_update)) + { + // base64 Decode php_postflight_update. + $item->php_postflight_update = base64_decode($item->php_postflight_update); + } + + if (!empty($item->sql)) + { + // base64 Decode sql. + $item->sql = base64_decode($item->sql); } if (!empty($item->php_helper_both)) @@ -185,20 +185,20 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->buildcompsql = base64_decode($item->buildcompsql); } - // Get the basic encription. + // Get the basic encryption. $basickey = ComponentbuilderHelper::getCryptKey('basic'); - // Get the encription object. + // Get the encryption object. $basic = new FOFEncryptAes($basickey, 128); if (!empty($item->whmcs_key) && $basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true))) { - // basic decript data whmcs_key. + // basic decrypt data whmcs_key. $item->whmcs_key = rtrim($basic->decryptString($item->whmcs_key), "\0"); } if (!empty($item->export_key) && $basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true))) { - // basic decript data export_key. + // basic decrypt data export_key. $item->export_key = rtrim($basic->decryptString($item->export_key), "\0"); } @@ -703,6 +703,430 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin // Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } + // Modify the form based on Edit System Name access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.system_name', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.system_name', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('system_name', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('system_name', 'readonly', 'true'); + if (!$form->getValue('system_name')) + { + // Disable fields while saving. + $form->setFieldAttribute('system_name', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('system_name', 'required', 'false'); + } + } + // Modify the form based on Edit Name Code access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.name_code', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.name_code', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('name_code', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('name_code', 'readonly', 'true'); + if (!$form->getValue('name_code')) + { + // Disable fields while saving. + $form->setFieldAttribute('name_code', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('name_code', 'required', 'false'); + } + } + // Modify the form based on Edit Component Version access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.component_version', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.component_version', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('component_version', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('component_version', 'readonly', 'true'); + if (!$form->getValue('component_version')) + { + // Disable fields while saving. + $form->setFieldAttribute('component_version', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('component_version', 'required', 'false'); + } + } + // Modify the form based on Edit Short Description access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.short_description', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.short_description', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('short_description', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('short_description', 'readonly', 'true'); + if (!$form->getValue('short_description')) + { + // Disable fields while saving. + $form->setFieldAttribute('short_description', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('short_description', 'required', 'false'); + } + } + // Modify the form based on Edit Companyname access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.companyname', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.companyname', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('companyname', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('companyname', 'readonly', 'true'); + if (!$form->getValue('companyname')) + { + // Disable fields while saving. + $form->setFieldAttribute('companyname', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('companyname', 'required', 'false'); + } + } + // Modify the form based on Edit Author access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.author', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.author', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('author', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('author', 'readonly', 'true'); + if (!$form->getValue('author')) + { + // Disable fields while saving. + $form->setFieldAttribute('author', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('author', 'required', 'false'); + } + } + // Modify the form based on Edit Readme access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.readme', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.readme', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('readme', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('readme', 'readonly', 'true'); + if (!$form->getValue('readme')) + { + // Disable fields while saving. + $form->setFieldAttribute('readme', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('readme', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Dashboard Methods access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_php_dashboard_methods', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_php_dashboard_methods', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_dashboard_methods', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_dashboard_methods', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_dashboard_methods', 'class', ''); + $form->setFieldAttribute('add_php_dashboard_methods', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_dashboard_methods')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_dashboard_methods', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_dashboard_methods', 'required', 'false'); + } + } + // Modify the form based on Edit Description access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.description', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.description', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('description', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('description', 'readonly', 'true'); + if (!$form->getValue('description')) + { + // Disable fields while saving. + $form->setFieldAttribute('description', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('description', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Helper Admin access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_php_helper_admin', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_php_helper_admin', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_helper_admin', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_helper_admin', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_helper_admin', 'class', ''); + $form->setFieldAttribute('add_php_helper_admin', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_helper_admin')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_helper_admin', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_helper_admin', 'required', 'false'); + } + } + // Modify the form based on Edit Copyright access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.copyright', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.copyright', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('copyright', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('copyright', 'readonly', 'true'); + if (!$form->getValue('copyright')) + { + // Disable fields while saving. + $form->setFieldAttribute('copyright', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('copyright', 'required', 'false'); + } + } + // Modify the form based on Edit Php Postflight Install access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.php_postflight_install', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.php_postflight_install', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_postflight_install', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_postflight_install', 'readonly', 'true'); + if (!$form->getValue('php_postflight_install')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_postflight_install', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_postflight_install', 'required', 'false'); + } + } + // Modify the form based on Edit Debug Linenr access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.debug_linenr', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.debug_linenr', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('debug_linenr', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('debug_linenr', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('debug_linenr', 'class', ''); + $form->setFieldAttribute('debug_linenr', 'class', $class.' disabled no-click'); + if (!$form->getValue('debug_linenr')) + { + // Disable fields while saving. + $form->setFieldAttribute('debug_linenr', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('debug_linenr', 'required', 'false'); + } + } + // Modify the form based on Edit Mvc Versiondate access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.mvc_versiondate', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.mvc_versiondate', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('mvc_versiondate', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('mvc_versiondate', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('mvc_versiondate', 'class', ''); + $form->setFieldAttribute('mvc_versiondate', 'class', $class.' disabled no-click'); + if (!$form->getValue('mvc_versiondate')) + { + // Disable fields while saving. + $form->setFieldAttribute('mvc_versiondate', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('mvc_versiondate', 'required', 'false'); + } + } + // Modify the form based on Edit Update Server Ftp access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.update_server_ftp', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.update_server_ftp', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('update_server_ftp', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('update_server_ftp', 'readonly', 'true'); + if (!$form->getValue('update_server_ftp')) + { + // Disable fields while saving. + $form->setFieldAttribute('update_server_ftp', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('update_server_ftp', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Helper Site access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_php_helper_site', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_php_helper_site', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_helper_site', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_helper_site', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_helper_site', 'class', ''); + $form->setFieldAttribute('add_php_helper_site', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_helper_site')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_helper_site', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_helper_site', 'required', 'false'); + } + } + // Modify the form based on Edit Php Preflight Install access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.php_preflight_install', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.php_preflight_install', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_preflight_install', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_preflight_install', 'readonly', 'true'); + if (!$form->getValue('php_preflight_install')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_preflight_install', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_preflight_install', 'required', 'false'); + } + } + // Modify the form based on Edit Creatuserhelper access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.creatuserhelper', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.creatuserhelper', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('creatuserhelper', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('creatuserhelper', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('creatuserhelper', 'class', ''); + $form->setFieldAttribute('creatuserhelper', 'class', $class.' disabled no-click'); + if (!$form->getValue('creatuserhelper')) + { + // Disable fields while saving. + $form->setFieldAttribute('creatuserhelper', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('creatuserhelper', 'required', 'false'); + } + } + // Modify the form based on Edit Php Method Uninstall access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.php_method_uninstall', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.php_method_uninstall', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_method_uninstall', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_method_uninstall', 'readonly', 'true'); + if (!$form->getValue('php_method_uninstall')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_method_uninstall', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_method_uninstall', 'required', 'false'); + } + } + // Modify the form based on Edit Css access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.css', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.css', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('css', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('css', 'readonly', 'true'); + if (!$form->getValue('css')) + { + // Disable fields while saving. + $form->setFieldAttribute('css', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('css', 'required', 'false'); + } + } + // Modify the form based on Edit Version Update access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.version_update', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.version_update', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('version_update', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('version_update', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('version_update', 'class', ''); + $form->setFieldAttribute('version_update', 'class', $class.' disabled no-click'); + if (!$form->getValue('version_update')) + { + // Disable fields while saving. + $form->setFieldAttribute('version_update', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('version_update', 'required', 'false'); + } + } + // Modify the form based on Edit Email access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.email', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.email', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('email', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('email', 'readonly', 'true'); + if (!$form->getValue('email')) + { + // Disable fields while saving. + $form->setFieldAttribute('email', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('email', 'required', 'false'); + } + } + // Modify the form based on Edit Buildcomp access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.buildcomp', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.buildcomp', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('buildcomp', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('buildcomp', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('buildcomp', 'class', ''); + $form->setFieldAttribute('buildcomp', 'class', $class.' disabled no-click'); + if (!$form->getValue('buildcomp')) + { + // Disable fields while saving. + $form->setFieldAttribute('buildcomp', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('buildcomp', 'required', 'false'); + } + } + // Modify the form based on Edit Website access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.website', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.website', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('website', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('website', 'readonly', 'true'); + if (!$form->getValue('website')) + { + // Disable fields while saving. + $form->setFieldAttribute('website', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('website', 'required', 'false'); + } + } + // Modify the form based on Edit Export Package Link access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.export_package_link', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.export_package_link', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('export_package_link', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('export_package_link', 'readonly', 'true'); + if (!$form->getValue('export_package_link')) + { + // Disable fields while saving. + $form->setFieldAttribute('export_package_link', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('export_package_link', 'required', 'false'); + } + } // Modify the form based on Edit Add License access controls. if ($id != 0 && (!$user->authorise('joomla_component.edit.add_license', 'com_componentbuilder.joomla_component.' . (int) $id)) || ($id == 0 && !$user->authorise('joomla_component.edit.add_license', 'com_componentbuilder'))) @@ -722,6 +1146,25 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $form->setFieldAttribute('add_license', 'required', 'false'); } } + // Modify the form based on Edit Addfootable access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.addfootable', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.addfootable', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addfootable', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addfootable', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addfootable', 'class', ''); + $form->setFieldAttribute('addfootable', 'class', $class.' disabled no-click'); + if (!$form->getValue('addfootable')) + { + // Disable fields while saving. + $form->setFieldAttribute('addfootable', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addfootable', 'required', 'false'); + } + } // Modify the form based on Edit License Type access controls. if ($id != 0 && (!$user->authorise('joomla_component.edit.license_type', 'com_componentbuilder.joomla_component.' . (int) $id)) || ($id == 0 && !$user->authorise('joomla_component.edit.license_type', 'com_componentbuilder'))) @@ -738,6 +1181,871 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $form->setFieldAttribute('license_type', 'required', 'false'); } } + // Modify the form based on Edit Add Php Helper Both access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_php_helper_both', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_php_helper_both', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_helper_both', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_helper_both', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_helper_both', 'class', ''); + $form->setFieldAttribute('add_php_helper_both', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_helper_both')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_helper_both', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_helper_both', 'required', 'false'); + } + } + // Modify the form based on Edit Add Admin Event access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_admin_event', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_admin_event', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_admin_event', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_admin_event', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_admin_event', 'class', ''); + $form->setFieldAttribute('add_admin_event', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_admin_event')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_admin_event', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_admin_event', 'required', 'false'); + } + } + // Modify the form based on Edit Whmcs Key access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.whmcs_key', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.whmcs_key', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('whmcs_key', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('whmcs_key', 'readonly', 'true'); + if (!$form->getValue('whmcs_key')) + { + // Disable fields while saving. + $form->setFieldAttribute('whmcs_key', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('whmcs_key', 'required', 'false'); + } + } + // Modify the form based on Edit Add Site Event access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_site_event', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_site_event', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_site_event', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_site_event', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_site_event', 'class', ''); + $form->setFieldAttribute('add_site_event', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_site_event')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_site_event', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_site_event', 'required', 'false'); + } + } + // Modify the form based on Edit Whmcs Url access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.whmcs_url', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.whmcs_url', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('whmcs_url', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('whmcs_url', 'readonly', 'true'); + if (!$form->getValue('whmcs_url')) + { + // Disable fields while saving. + $form->setFieldAttribute('whmcs_url', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('whmcs_url', 'required', 'false'); + } + } + // Modify the form based on Edit Dashboard Tab access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.dashboard_tab', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.dashboard_tab', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('dashboard_tab', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('dashboard_tab', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('dashboard_tab', 'class', ''); + $form->setFieldAttribute('dashboard_tab', 'class', $class.' disabled no-click'); + if (!$form->getValue('dashboard_tab')) + { + // Disable fields while saving. + $form->setFieldAttribute('dashboard_tab', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('dashboard_tab', 'required', 'false'); + } + } + // Modify the form based on Edit License access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.license', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.license', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('license', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('license', 'readonly', 'true'); + if (!$form->getValue('license')) + { + // Disable fields while saving. + $form->setFieldAttribute('license', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('license', 'required', 'false'); + } + } + // Modify the form based on Edit Php Preflight Update access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.php_preflight_update', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.php_preflight_update', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_preflight_update', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_preflight_update', 'readonly', 'true'); + if (!$form->getValue('php_preflight_update')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_preflight_update', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_preflight_update', 'required', 'false'); + } + } + // Modify the form based on Edit Bom access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.bom', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.bom', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('bom', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('bom', 'readonly', 'true'); + if (!$form->getValue('bom')) + { + // Disable fields while saving. + $form->setFieldAttribute('bom', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('bom', 'required', 'false'); + } + } + // Modify the form based on Edit Php Postflight Update access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.php_postflight_update', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.php_postflight_update', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_postflight_update', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_postflight_update', 'readonly', 'true'); + if (!$form->getValue('php_postflight_update')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_postflight_update', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_postflight_update', 'required', 'false'); + } + } + // Modify the form based on Edit Image access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.image', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.image', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('image', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('image', 'readonly', 'true'); + if (!$form->getValue('image')) + { + // Disable fields while saving. + $form->setFieldAttribute('image', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('image', 'required', 'false'); + } + } + // Modify the form based on Edit Sql access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.sql', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.sql', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('sql', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('sql', 'readonly', 'true'); + if (!$form->getValue('sql')) + { + // Disable fields while saving. + $form->setFieldAttribute('sql', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('sql', 'required', 'false'); + } + } + // Modify the form based on Edit Update Server Target access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.update_server_target', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.update_server_target', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('update_server_target', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('update_server_target', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('update_server_target', 'class', ''); + $form->setFieldAttribute('update_server_target', 'class', $class.' disabled no-click'); + if (!$form->getValue('update_server_target')) + { + // Disable fields while saving. + $form->setFieldAttribute('update_server_target', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('update_server_target', 'required', 'false'); + } + } + // Modify the form based on Edit Add Update Server access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_update_server', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_update_server', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_update_server', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_update_server', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_update_server', 'class', ''); + $form->setFieldAttribute('add_update_server', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_update_server')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_update_server', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_update_server', 'required', 'false'); + } + } + // Modify the form based on Edit Sales Server Ftp access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.sales_server_ftp', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.sales_server_ftp', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('sales_server_ftp', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('sales_server_ftp', 'readonly', 'true'); + if (!$form->getValue('sales_server_ftp')) + { + // Disable fields while saving. + $form->setFieldAttribute('sales_server_ftp', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('sales_server_ftp', 'required', 'false'); + } + } + // Modify the form based on Edit Addadmin Views access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.addadmin_views', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.addadmin_views', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addadmin_views', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addadmin_views', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addadmin_views', 'class', ''); + $form->setFieldAttribute('addadmin_views', 'class', $class.' disabled no-click'); + if (!$form->getValue('addadmin_views')) + { + // Disable fields while saving. + $form->setFieldAttribute('addadmin_views', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addadmin_views', 'required', 'false'); + } + } + // Modify the form based on Edit Name access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.name', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.name', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('name', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('name', 'readonly', 'true'); + if (!$form->getValue('name')) + { + // Disable fields while saving. + $form->setFieldAttribute('name', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('name', 'required', 'false'); + } + } + // Modify the form based on Edit Addcustom Admin Views access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.addcustom_admin_views', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.addcustom_admin_views', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addcustom_admin_views', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addcustom_admin_views', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addcustom_admin_views', 'class', ''); + $form->setFieldAttribute('addcustom_admin_views', 'class', $class.' disabled no-click'); + if (!$form->getValue('addcustom_admin_views')) + { + // Disable fields while saving. + $form->setFieldAttribute('addcustom_admin_views', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addcustom_admin_views', 'required', 'false'); + } + } + // Modify the form based on Edit Export Key access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.export_key', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.export_key', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('export_key', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('export_key', 'readonly', 'true'); + if (!$form->getValue('export_key')) + { + // Disable fields while saving. + $form->setFieldAttribute('export_key', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('export_key', 'required', 'false'); + } + } + // Modify the form based on Edit Addsite Views access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.addsite_views', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.addsite_views', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addsite_views', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addsite_views', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addsite_views', 'class', ''); + $form->setFieldAttribute('addsite_views', 'class', $class.' disabled no-click'); + if (!$form->getValue('addsite_views')) + { + // Disable fields while saving. + $form->setFieldAttribute('addsite_views', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addsite_views', 'required', 'false'); + } + } + // Modify the form based on Edit Export Buy Link access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.export_buy_link', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.export_buy_link', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('export_buy_link', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('export_buy_link', 'readonly', 'true'); + if (!$form->getValue('export_buy_link')) + { + // Disable fields while saving. + $form->setFieldAttribute('export_buy_link', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('export_buy_link', 'required', 'false'); + } + } + // Modify the form based on Edit Adduikit access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.adduikit', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.adduikit', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('adduikit', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('adduikit', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('adduikit', 'class', ''); + $form->setFieldAttribute('adduikit', 'class', $class.' disabled no-click'); + if (!$form->getValue('adduikit')) + { + // Disable fields while saving. + $form->setFieldAttribute('adduikit', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('adduikit', 'required', 'false'); + } + } + // Modify the form based on Edit Add Css access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_css', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_css', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_css', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_css', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_css', 'class', ''); + $form->setFieldAttribute('add_css', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_css')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_css', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_css', 'required', 'false'); + } + } + // Modify the form based on Edit Sql Tweak access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.sql_tweak', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.sql_tweak', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('sql_tweak', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('sql_tweak', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('sql_tweak', 'class', ''); + $form->setFieldAttribute('sql_tweak', 'class', $class.' disabled no-click'); + if (!$form->getValue('sql_tweak')) + { + // Disable fields while saving. + $form->setFieldAttribute('sql_tweak', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('sql_tweak', 'required', 'false'); + } + } + // Modify the form based on Edit Add Email Helper access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_email_helper', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_email_helper', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_email_helper', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_email_helper', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_email_helper', 'class', ''); + $form->setFieldAttribute('add_email_helper', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_email_helper')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_email_helper', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_email_helper', 'required', 'false'); + } + } + // Modify the form based on Edit Php Helper Both access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.php_helper_both', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.php_helper_both', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_helper_both', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_helper_both', 'readonly', 'true'); + if (!$form->getValue('php_helper_both')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_helper_both', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_helper_both', 'required', 'false'); + } + } + // Modify the form based on Edit Php Helper Admin access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.php_helper_admin', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.php_helper_admin', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_helper_admin', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_helper_admin', 'readonly', 'true'); + if (!$form->getValue('php_helper_admin')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_helper_admin', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_helper_admin', 'required', 'false'); + } + } + // Modify the form based on Edit Addcustommenus access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.addcustommenus', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.addcustommenus', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addcustommenus', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addcustommenus', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addcustommenus', 'class', ''); + $form->setFieldAttribute('addcustommenus', 'class', $class.' disabled no-click'); + if (!$form->getValue('addcustommenus')) + { + // Disable fields while saving. + $form->setFieldAttribute('addcustommenus', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addcustommenus', 'required', 'false'); + } + } + // Modify the form based on Edit Php Admin Event access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.php_admin_event', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.php_admin_event', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_admin_event', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_admin_event', 'readonly', 'true'); + if (!$form->getValue('php_admin_event')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_admin_event', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_admin_event', 'required', 'false'); + } + } + // Modify the form based on Edit Php Helper Site access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.php_helper_site', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.php_helper_site', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_helper_site', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_helper_site', 'readonly', 'true'); + if (!$form->getValue('php_helper_site')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_helper_site', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_helper_site', 'required', 'false'); + } + } + // Modify the form based on Edit Php Site Event access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.php_site_event', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.php_site_event', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_site_event', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_site_event', 'readonly', 'true'); + if (!$form->getValue('php_site_event')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_site_event', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_site_event', 'required', 'false'); + } + } + // Modify the form based on Edit Addconfig access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.addconfig', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.addconfig', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addconfig', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addconfig', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addconfig', 'class', ''); + $form->setFieldAttribute('addconfig', 'class', $class.' disabled no-click'); + if (!$form->getValue('addconfig')) + { + // Disable fields while saving. + $form->setFieldAttribute('addconfig', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addconfig', 'required', 'false'); + } + } + // Modify the form based on Edit Php Dashboard Methods access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.php_dashboard_methods', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.php_dashboard_methods', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('php_dashboard_methods', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('php_dashboard_methods', 'readonly', 'true'); + if (!$form->getValue('php_dashboard_methods')) + { + // Disable fields while saving. + $form->setFieldAttribute('php_dashboard_methods', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('php_dashboard_methods', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Preflight Install access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_php_preflight_install', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_php_preflight_install', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_preflight_install', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_preflight_install', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_preflight_install', 'class', ''); + $form->setFieldAttribute('add_php_preflight_install', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_preflight_install')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_preflight_install', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_preflight_install', 'required', 'false'); + } + } + // Modify the form based on Edit Addcontributors access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.addcontributors', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.addcontributors', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addcontributors', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addcontributors', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addcontributors', 'class', ''); + $form->setFieldAttribute('addcontributors', 'class', $class.' disabled no-click'); + if (!$form->getValue('addcontributors')) + { + // Disable fields while saving. + $form->setFieldAttribute('addcontributors', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addcontributors', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Preflight Update access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_php_preflight_update', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_php_preflight_update', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_preflight_update', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_preflight_update', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_preflight_update', 'class', ''); + $form->setFieldAttribute('add_php_preflight_update', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_preflight_update')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_preflight_update', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_preflight_update', 'required', 'false'); + } + } + // Modify the form based on Edit Emptycontributors access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.emptycontributors', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.emptycontributors', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('emptycontributors', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('emptycontributors', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('emptycontributors', 'class', ''); + $form->setFieldAttribute('emptycontributors', 'class', $class.' disabled no-click'); + if (!$form->getValue('emptycontributors')) + { + // Disable fields while saving. + $form->setFieldAttribute('emptycontributors', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('emptycontributors', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Postflight Install access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_php_postflight_install', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_php_postflight_install', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_postflight_install', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_postflight_install', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_postflight_install', 'class', ''); + $form->setFieldAttribute('add_php_postflight_install', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_postflight_install')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_postflight_install', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_postflight_install', 'required', 'false'); + } + } + // Modify the form based on Edit Number access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.number', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.number', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('number', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('number', 'readonly', 'true'); + if (!$form->getValue('number')) + { + // Disable fields while saving. + $form->setFieldAttribute('number', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('number', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Postflight Update access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_php_postflight_update', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_php_postflight_update', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_postflight_update', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_postflight_update', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_postflight_update', 'class', ''); + $form->setFieldAttribute('add_php_postflight_update', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_postflight_update')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_postflight_update', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_postflight_update', 'required', 'false'); + } + } + // Modify the form based on Edit Add Php Method Uninstall access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_php_method_uninstall', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_php_method_uninstall', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_php_method_uninstall', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_php_method_uninstall', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_php_method_uninstall', 'class', ''); + $form->setFieldAttribute('add_php_method_uninstall', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_php_method_uninstall')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_php_method_uninstall', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_php_method_uninstall', 'required', 'false'); + } + } + // Modify the form based on Edit Add Sql access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_sql', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_sql', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_sql', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_sql', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_sql', 'class', ''); + $form->setFieldAttribute('add_sql', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_sql')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_sql', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_sql', 'required', 'false'); + } + } + // Modify the form based on Edit Addfiles access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.addfiles', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.addfiles', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addfiles', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addfiles', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addfiles', 'class', ''); + $form->setFieldAttribute('addfiles', 'class', $class.' disabled no-click'); + if (!$form->getValue('addfiles')) + { + // Disable fields while saving. + $form->setFieldAttribute('addfiles', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addfiles', 'required', 'false'); + } + } + // Modify the form based on Edit Addreadme access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.addreadme', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.addreadme', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addreadme', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addreadme', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addreadme', 'class', ''); + $form->setFieldAttribute('addreadme', 'class', $class.' disabled no-click'); + if (!$form->getValue('addreadme')) + { + // Disable fields while saving. + $form->setFieldAttribute('addreadme', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addreadme', 'required', 'false'); + } + } + // Modify the form based on Edit Update Server access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.update_server', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.update_server', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('update_server', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('update_server', 'readonly', 'true'); + if (!$form->getValue('update_server')) + { + // Disable fields while saving. + $form->setFieldAttribute('update_server', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('update_server', 'required', 'false'); + } + } + // Modify the form based on Edit Addfolders access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.addfolders', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.addfolders', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('addfolders', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('addfolders', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('addfolders', 'class', ''); + $form->setFieldAttribute('addfolders', 'class', $class.' disabled no-click'); + if (!$form->getValue('addfolders')) + { + // Disable fields while saving. + $form->setFieldAttribute('addfolders', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('addfolders', 'required', 'false'); + } + } + // Modify the form based on Edit Add Sales Server access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.add_sales_server', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.add_sales_server', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('add_sales_server', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('add_sales_server', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('add_sales_server', 'class', ''); + $form->setFieldAttribute('add_sales_server', 'class', $class.' disabled no-click'); + if (!$form->getValue('add_sales_server')) + { + // Disable fields while saving. + $form->setFieldAttribute('add_sales_server', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('add_sales_server', 'required', 'false'); + } + } + // Modify the form based on Edit Toignore access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.toignore', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.toignore', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('toignore', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('toignore', 'readonly', 'true'); + if (!$form->getValue('toignore')) + { + // Disable fields while saving. + $form->setFieldAttribute('toignore', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('toignore', 'required', 'false'); + } + } + // Modify the form based on Edit Buildcompsql access controls. + if ($id != 0 && (!$user->authorise('joomla_component.edit.buildcompsql', 'com_componentbuilder.joomla_component.' . (int) $id)) + || ($id == 0 && !$user->authorise('joomla_component.edit.buildcompsql', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('buildcompsql', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('buildcompsql', 'readonly', 'true'); + if (!$form->getValue('buildcompsql')) + { + // Disable fields while saving. + $form->setFieldAttribute('buildcompsql', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('buildcompsql', 'required', 'false'); + } + } // Only load these values if no id is found if (0 == $id) { @@ -1379,34 +2687,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['metadata'] = (string) $metadata; } - // Set the php_postflight_update string to base64 string. - if (isset($data['php_postflight_update'])) + // Set the readme string to base64 string. + if (isset($data['readme'])) { - $data['php_postflight_update'] = base64_encode($data['php_postflight_update']); - } - - // Set the php_preflight_update string to base64 string. - if (isset($data['php_preflight_update'])) - { - $data['php_preflight_update'] = base64_encode($data['php_preflight_update']); - } - - // Set the sql string to base64 string. - if (isset($data['sql'])) - { - $data['sql'] = base64_encode($data['sql']); - } - - // Set the css string to base64 string. - if (isset($data['css'])) - { - $data['css'] = base64_encode($data['css']); - } - - // Set the php_preflight_install string to base64 string. - if (isset($data['php_preflight_install'])) - { - $data['php_preflight_install'] = base64_encode($data['php_preflight_install']); + $data['readme'] = base64_encode($data['readme']); } // Set the php_postflight_install string to base64 string. @@ -1415,16 +2699,40 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['php_postflight_install'] = base64_encode($data['php_postflight_install']); } + // Set the php_preflight_install string to base64 string. + if (isset($data['php_preflight_install'])) + { + $data['php_preflight_install'] = base64_encode($data['php_preflight_install']); + } + // Set the php_method_uninstall string to base64 string. if (isset($data['php_method_uninstall'])) { $data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']); } - // Set the readme string to base64 string. - if (isset($data['readme'])) + // Set the css string to base64 string. + if (isset($data['css'])) { - $data['readme'] = base64_encode($data['readme']); + $data['css'] = base64_encode($data['css']); + } + + // Set the php_preflight_update string to base64 string. + if (isset($data['php_preflight_update'])) + { + $data['php_preflight_update'] = base64_encode($data['php_preflight_update']); + } + + // Set the php_postflight_update string to base64 string. + if (isset($data['php_postflight_update'])) + { + $data['php_postflight_update'] = base64_encode($data['php_postflight_update']); + } + + // Set the sql string to base64 string. + if (isset($data['sql'])) + { + $data['sql'] = base64_encode($data['sql']); } // Set the php_helper_both string to base64 string. @@ -1469,18 +2777,18 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['buildcompsql'] = base64_encode($data['buildcompsql']); } - // Get the basic encription key. + // Get the basic encryption key. $basickey = ComponentbuilderHelper::getCryptKey('basic'); - // Get the encription object + // Get the encryption object $basic = new FOFEncryptAes($basickey, 128); - // Encript data whmcs_key. + // Encrypt data whmcs_key. if (isset($data['whmcs_key']) && $basickey) { $data['whmcs_key'] = $basic->encryptString($data['whmcs_key']); } - // Encript data export_key. + // Encrypt data export_key. if (isset($data['export_key']) && $basickey) { $data['export_key'] = $basic->encryptString($data['export_key']); diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index c5d588da7..479278527 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 361 of this MVC - @build 24th August, 2017 + @version @update number 366 of this MVC + @build 7th September, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php @@ -1309,9 +1309,9 @@ class ComponentbuilderModelJoomla_components extends JModelList { $items = $db->loadObjectList(); - // Get the basic encription key. + // Get the basic encryption key. $basickey = ComponentbuilderHelper::getCryptKey('basic'); - // Get the encription object. + // Get the encryption object. $basic = new FOFEncryptAes($basickey, 128); // set values to display correctly. @@ -1319,12 +1319,14 @@ class ComponentbuilderModelJoomla_components extends JModelList { foreach ($items as $nr => &$item) { - // decode php_postflight_update - $item->php_postflight_update = base64_decode($item->php_postflight_update); - // decode php_preflight_update - $item->php_preflight_update = base64_decode($item->php_preflight_update); - // decode sql - $item->sql = base64_decode($item->sql); + // decode readme + $item->readme = base64_decode($item->readme); + // decode php_postflight_install + $item->php_postflight_install = base64_decode($item->php_postflight_install); + // decode php_preflight_install + $item->php_preflight_install = base64_decode($item->php_preflight_install); + // decode php_method_uninstall + $item->php_method_uninstall = base64_decode($item->php_method_uninstall); // decode css $item->css = base64_decode($item->css); if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true))) @@ -1332,14 +1334,12 @@ class ComponentbuilderModelJoomla_components extends JModelList // decrypt whmcs_key $item->whmcs_key = $basic->decryptString($item->whmcs_key); } - // decode php_preflight_install - $item->php_preflight_install = base64_decode($item->php_preflight_install); - // decode php_postflight_install - $item->php_postflight_install = base64_decode($item->php_postflight_install); - // decode php_method_uninstall - $item->php_method_uninstall = base64_decode($item->php_method_uninstall); - // decode readme - $item->readme = base64_decode($item->readme); + // decode php_preflight_update + $item->php_preflight_update = base64_decode($item->php_preflight_update); + // decode php_postflight_update + $item->php_postflight_update = base64_decode($item->php_postflight_update); + // decode sql + $item->sql = base64_decode($item->sql); if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true))) { // decrypt export_key diff --git a/admin/models/site_view.php b/admin/models/site_view.php index e3b968a48..7a70314f9 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -185,7 +185,7 @@ class ComponentbuilderModelSite_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVytlinked_components() + public function getVyulinked_components() { // Get the user object. $user = JFactory::getUser(); diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 7132fbc39..29716ef86 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -72,6 +72,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( `sql` MEDIUMTEXT NOT NULL, `sql_tweak` TEXT NOT NULL, `system_name` VARCHAR(255) NOT NULL DEFAULT '', + `toignore` TEXT NOT NULL, `update_server` VARCHAR(255) NOT NULL DEFAULT '', `update_server_ftp` INT(11) NOT NULL DEFAULT 0, `update_server_target` TINYINT(1) NOT NULL DEFAULT 0, @@ -98,30 +99,30 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( KEY `idx_modifiedby` (`modified_by`), KEY `idx_state` (`published`), KEY `idx_name_code` (`name_code`), - KEY `idx_add_update_server` (`add_update_server`), KEY `idx_add_placeholders` (`add_placeholders`), - KEY `idx_add_admin_event` (`add_admin_event`), + KEY `idx_add_php_dashboard_methods` (`add_php_dashboard_methods`), + KEY `idx_add_php_helper_admin` (`add_php_helper_admin`), KEY `idx_debug_linenr` (`debug_linenr`), KEY `idx_mvc_versiondate` (`mvc_versiondate`), - KEY `idx_add_site_event` (`add_site_event`), - KEY `idx_addfootable` (`addfootable`), - KEY `idx_add_php_helper_both` (`add_php_helper_both`), + KEY `idx_add_php_helper_site` (`add_php_helper_site`), KEY `idx_creatuserhelper` (`creatuserhelper`), KEY `idx_add_license` (`add_license`), + KEY `idx_addfootable` (`addfootable`), KEY `idx_license_type` (`license_type`), - KEY `idx_add_php_helper_admin` (`add_php_helper_admin`), - KEY `idx_add_php_helper_site` (`add_php_helper_site`), - KEY `idx_add_php_dashboard_methods` (`add_php_dashboard_methods`), + KEY `idx_add_php_helper_both` (`add_php_helper_both`), + KEY `idx_add_admin_event` (`add_admin_event`), + KEY `idx_add_site_event` (`add_site_event`), KEY `idx_update_server_target` (`update_server_target`), + KEY `idx_add_update_server` (`add_update_server`), KEY `idx_name` (`name`), KEY `idx_adduikit` (`adduikit`), KEY `idx_add_css` (`add_css`), KEY `idx_add_email_helper` (`add_email_helper`), KEY `idx_add_php_preflight_install` (`add_php_preflight_install`), KEY `idx_add_php_preflight_update` (`add_php_preflight_update`), + KEY `idx_emptycontributors` (`emptycontributors`), KEY `idx_add_php_postflight_install` (`add_php_postflight_install`), KEY `idx_add_php_postflight_update` (`add_php_postflight_update`), - KEY `idx_emptycontributors` (`emptycontributors`), KEY `idx_add_php_method_uninstall` (`add_php_method_uninstall`), KEY `idx_add_sql` (`add_sql`), KEY `idx_addreadme` (`addreadme`), @@ -148,6 +149,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `add_php_batchmove` TINYINT(1) NOT NULL DEFAULT 0, `add_php_before_delete` TINYINT(1) NOT NULL DEFAULT 0, `add_php_before_publish` TINYINT(1) NOT NULL DEFAULT 0, + `add_php_before_save` TINYINT(1) NOT NULL DEFAULT 0, `add_php_document` TINYINT(1) NOT NULL DEFAULT 0, `add_php_getitem` TINYINT(1) NOT NULL DEFAULT 0, `add_php_getitems` TINYINT(1) NOT NULL DEFAULT 0, @@ -186,6 +188,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `php_batchmove` MEDIUMTEXT NOT NULL, `php_before_delete` MEDIUMTEXT NOT NULL, `php_before_publish` MEDIUMTEXT NOT NULL, + `php_before_save` MEDIUMTEXT NOT NULL, `php_controller` MEDIUMTEXT NOT NULL, `php_controller_list` MEDIUMTEXT NOT NULL, `php_document` MEDIUMTEXT NOT NULL, @@ -227,33 +230,34 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( KEY `idx_state` (`published`), KEY `idx_name_single` (`name_single`), KEY `idx_name_list` (`name_list`), + KEY `idx_type` (`type`), KEY `idx_add_fadein` (`add_fadein`), KEY `idx_source` (`source`), - KEY `idx_type` (`type`), KEY `idx_add_css_view` (`add_css_view`), - KEY `idx_add_php_getitem` (`add_php_getitem`), KEY `idx_add_php_getitems` (`add_php_getitems`), KEY `idx_add_css_views` (`add_css_views`), KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`), KEY `idx_add_php_getlistquery` (`add_php_getlistquery`), KEY `idx_add_javascript_view_file` (`add_javascript_view_file`), + KEY `idx_add_php_before_save` (`add_php_before_save`), KEY `idx_add_php_save` (`add_php_save`), - KEY `idx_add_php_postsavehook` (`add_php_postsavehook`), KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`), + KEY `idx_add_php_postsavehook` (`add_php_postsavehook`), KEY `idx_add_php_allowedit` (`add_php_allowedit`), - KEY `idx_add_php_batchcopy` (`add_php_batchcopy`), KEY `idx_add_javascript_views_file` (`add_javascript_views_file`), + KEY `idx_add_php_batchcopy` (`add_php_batchcopy`), KEY `idx_add_php_batchmove` (`add_php_batchmove`), - KEY `idx_add_php_before_publish` (`add_php_before_publish`), KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`), + KEY `idx_add_php_before_publish` (`add_php_before_publish`), KEY `idx_add_php_after_publish` (`add_php_after_publish`), - KEY `idx_add_php_before_delete` (`add_php_before_delete`), KEY `idx_add_custom_button` (`add_custom_button`), + KEY `idx_add_php_before_delete` (`add_php_before_delete`), KEY `idx_add_php_after_delete` (`add_php_after_delete`), KEY `idx_add_php_document` (`add_php_document`), KEY `idx_add_sql` (`add_sql`), + KEY `idx_add_php_ajax` (`add_php_ajax`), KEY `idx_add_custom_import` (`add_custom_import`), - KEY `idx_add_php_ajax` (`add_php_ajax`) + KEY `idx_add_php_getitem` (`add_php_getitem`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` ( diff --git a/admin/sql/updates/mysql/2.5.2.sql b/admin/sql/updates/mysql/2.5.2.sql new file mode 100644 index 000000000..47b9ba166 --- /dev/null +++ b/admin/sql/updates/mysql/2.5.2.sql @@ -0,0 +1,3 @@ +ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_before_save` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_before_publish`; + +ALTER TABLE `#__componentbuilder_admin_view` ADD `php_before_save` MEDIUMTEXT NOT NULL AFTER `php_before_publish`; diff --git a/admin/sql/updates/mysql/2.5.3.sql b/admin/sql/updates/mysql/2.5.3.sql new file mode 100644 index 000000000..e7873cf2b --- /dev/null +++ b/admin/sql/updates/mysql/2.5.3.sql @@ -0,0 +1 @@ +ALTER TABLE `#__componentbuilder_joomla_component` ADD `toignore` TEXT NOT NULL AFTER `system_name`; diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index cb705589b..7d9de93aa 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 5c4b29858..45217b177 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version @update number 6 of this MVC - @build 18th October, 2016 + @build 17th October, 2016 @created 4th March, 2016 @package Component Builder @subpackage help_document.php diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php index 7777bc510..beb29a17c 100644 --- a/admin/tables/joomla_component.php +++ b/admin/tables/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 361 of this MVC - @build 24th August, 2017 + @version @update number 366 of this MVC + @build 7th September, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index 7661492e4..34a28cb67 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index 66e84c6a4..f0f32c3ba 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -377,251 +377,251 @@ jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e) }); -// #jform_add_php_save listeners for add_php_save_vvvvvxh function +// #jform_add_php_before_save listeners for add_php_before_save_vvvvvxh function +jQuery('#jform_add_php_before_save').on('keyup',function() +{ + var add_php_before_save_vvvvvxh = jQuery("#jform_add_php_before_save input[type='radio']:checked").val(); + vvvvvxh(add_php_before_save_vvvvvxh); + +}); +jQuery('#adminForm').on('change', '#jform_add_php_before_save',function (e) +{ + e.preventDefault(); + var add_php_before_save_vvvvvxh = jQuery("#jform_add_php_before_save input[type='radio']:checked").val(); + vvvvvxh(add_php_before_save_vvvvvxh); + +}); + +// #jform_add_php_save listeners for add_php_save_vvvvvxi function jQuery('#jform_add_php_save').on('keyup',function() { - var add_php_save_vvvvvxh = jQuery("#jform_add_php_save input[type='radio']:checked").val(); - vvvvvxh(add_php_save_vvvvvxh); + var add_php_save_vvvvvxi = jQuery("#jform_add_php_save input[type='radio']:checked").val(); + vvvvvxi(add_php_save_vvvvvxi); }); jQuery('#adminForm').on('change', '#jform_add_php_save',function (e) { e.preventDefault(); - var add_php_save_vvvvvxh = jQuery("#jform_add_php_save input[type='radio']:checked").val(); - vvvvvxh(add_php_save_vvvvvxh); + var add_php_save_vvvvvxi = jQuery("#jform_add_php_save input[type='radio']:checked").val(); + vvvvvxi(add_php_save_vvvvvxi); }); -// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvxi function +// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvxj function jQuery('#jform_add_php_postsavehook').on('keyup',function() { - var add_php_postsavehook_vvvvvxi = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); - vvvvvxi(add_php_postsavehook_vvvvvxi); + var add_php_postsavehook_vvvvvxj = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); + vvvvvxj(add_php_postsavehook_vvvvvxj); }); jQuery('#adminForm').on('change', '#jform_add_php_postsavehook',function (e) { e.preventDefault(); - var add_php_postsavehook_vvvvvxi = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); - vvvvvxi(add_php_postsavehook_vvvvvxi); + var add_php_postsavehook_vvvvvxj = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); + vvvvvxj(add_php_postsavehook_vvvvvxj); }); -// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxj function +// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxk function jQuery('#jform_add_php_allowedit').on('keyup',function() { - var add_php_allowedit_vvvvvxj = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); - vvvvvxj(add_php_allowedit_vvvvvxj); + var add_php_allowedit_vvvvvxk = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); + vvvvvxk(add_php_allowedit_vvvvvxk); }); jQuery('#adminForm').on('change', '#jform_add_php_allowedit',function (e) { e.preventDefault(); - var add_php_allowedit_vvvvvxj = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); - vvvvvxj(add_php_allowedit_vvvvvxj); + var add_php_allowedit_vvvvvxk = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); + vvvvvxk(add_php_allowedit_vvvvvxk); }); -// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxk function +// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxl function jQuery('#jform_add_php_batchcopy').on('keyup',function() { - var add_php_batchcopy_vvvvvxk = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); - vvvvvxk(add_php_batchcopy_vvvvvxk); + var add_php_batchcopy_vvvvvxl = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); + vvvvvxl(add_php_batchcopy_vvvvvxl); }); jQuery('#adminForm').on('change', '#jform_add_php_batchcopy',function (e) { e.preventDefault(); - var add_php_batchcopy_vvvvvxk = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); - vvvvvxk(add_php_batchcopy_vvvvvxk); + var add_php_batchcopy_vvvvvxl = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); + vvvvvxl(add_php_batchcopy_vvvvvxl); }); -// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxl function +// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxm function jQuery('#jform_add_php_batchmove').on('keyup',function() { - var add_php_batchmove_vvvvvxl = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); - vvvvvxl(add_php_batchmove_vvvvvxl); + var add_php_batchmove_vvvvvxm = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); + vvvvvxm(add_php_batchmove_vvvvvxm); }); jQuery('#adminForm').on('change', '#jform_add_php_batchmove',function (e) { e.preventDefault(); - var add_php_batchmove_vvvvvxl = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); - vvvvvxl(add_php_batchmove_vvvvvxl); + var add_php_batchmove_vvvvvxm = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); + vvvvvxm(add_php_batchmove_vvvvvxm); }); -// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxm function +// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxn function jQuery('#jform_add_php_before_publish').on('keyup',function() { - var add_php_before_publish_vvvvvxm = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); - vvvvvxm(add_php_before_publish_vvvvvxm); + var add_php_before_publish_vvvvvxn = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); + vvvvvxn(add_php_before_publish_vvvvvxn); }); jQuery('#adminForm').on('change', '#jform_add_php_before_publish',function (e) { e.preventDefault(); - var add_php_before_publish_vvvvvxm = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); - vvvvvxm(add_php_before_publish_vvvvvxm); + var add_php_before_publish_vvvvvxn = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); + vvvvvxn(add_php_before_publish_vvvvvxn); }); -// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxn function +// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxo function jQuery('#jform_add_php_after_publish').on('keyup',function() { - var add_php_after_publish_vvvvvxn = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); - vvvvvxn(add_php_after_publish_vvvvvxn); + var add_php_after_publish_vvvvvxo = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); + vvvvvxo(add_php_after_publish_vvvvvxo); }); jQuery('#adminForm').on('change', '#jform_add_php_after_publish',function (e) { e.preventDefault(); - var add_php_after_publish_vvvvvxn = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); - vvvvvxn(add_php_after_publish_vvvvvxn); + var add_php_after_publish_vvvvvxo = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); + vvvvvxo(add_php_after_publish_vvvvvxo); }); -// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxo function +// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxp function jQuery('#jform_add_php_before_delete').on('keyup',function() { - var add_php_before_delete_vvvvvxo = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); - vvvvvxo(add_php_before_delete_vvvvvxo); + var add_php_before_delete_vvvvvxp = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); + vvvvvxp(add_php_before_delete_vvvvvxp); }); jQuery('#adminForm').on('change', '#jform_add_php_before_delete',function (e) { e.preventDefault(); - var add_php_before_delete_vvvvvxo = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); - vvvvvxo(add_php_before_delete_vvvvvxo); + var add_php_before_delete_vvvvvxp = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); + vvvvvxp(add_php_before_delete_vvvvvxp); }); -// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxp function +// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxq function jQuery('#jform_add_php_after_delete').on('keyup',function() { - var add_php_after_delete_vvvvvxp = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); - vvvvvxp(add_php_after_delete_vvvvvxp); + var add_php_after_delete_vvvvvxq = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); + vvvvvxq(add_php_after_delete_vvvvvxq); }); jQuery('#adminForm').on('change', '#jform_add_php_after_delete',function (e) { e.preventDefault(); - var add_php_after_delete_vvvvvxp = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); - vvvvvxp(add_php_after_delete_vvvvvxp); + var add_php_after_delete_vvvvvxq = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); + vvvvvxq(add_php_after_delete_vvvvvxq); }); -// #jform_add_php_document listeners for add_php_document_vvvvvxq function +// #jform_add_php_document listeners for add_php_document_vvvvvxr function jQuery('#jform_add_php_document').on('keyup',function() { - var add_php_document_vvvvvxq = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvxq(add_php_document_vvvvvxq); + var add_php_document_vvvvvxr = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvxr(add_php_document_vvvvvxr); }); jQuery('#adminForm').on('change', '#jform_add_php_document',function (e) { e.preventDefault(); - var add_php_document_vvvvvxq = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvxq(add_php_document_vvvvvxq); - -}); - -// #jform_add_sql listeners for add_sql_vvvvvxr function -jQuery('#jform_add_sql').on('keyup',function() -{ - var add_sql_vvvvvxr = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxr(add_sql_vvvvvxr); - -}); -jQuery('#adminForm').on('change', '#jform_add_sql',function (e) -{ - e.preventDefault(); - var add_sql_vvvvvxr = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxr(add_sql_vvvvvxr); - -}); - -// #jform_source listeners for source_vvvvvxs function -jQuery('#jform_source').on('keyup',function() -{ - var source_vvvvvxs = jQuery("#jform_source input[type='radio']:checked").val(); - var add_sql_vvvvvxs = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxs(source_vvvvvxs,add_sql_vvvvvxs); - -}); -jQuery('#adminForm').on('change', '#jform_source',function (e) -{ - e.preventDefault(); - var source_vvvvvxs = jQuery("#jform_source input[type='radio']:checked").val(); - var add_sql_vvvvvxs = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxs(source_vvvvvxs,add_sql_vvvvvxs); + var add_php_document_vvvvvxr = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvxr(add_php_document_vvvvvxr); }); // #jform_add_sql listeners for add_sql_vvvvvxs function jQuery('#jform_add_sql').on('keyup',function() { - var source_vvvvvxs = jQuery("#jform_source input[type='radio']:checked").val(); var add_sql_vvvvvxs = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxs(source_vvvvvxs,add_sql_vvvvvxs); + vvvvvxs(add_sql_vvvvvxs); }); jQuery('#adminForm').on('change', '#jform_add_sql',function (e) { e.preventDefault(); - var source_vvvvvxs = jQuery("#jform_source input[type='radio']:checked").val(); var add_sql_vvvvvxs = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxs(source_vvvvvxs,add_sql_vvvvvxs); + vvvvvxs(add_sql_vvvvvxs); }); -// #jform_source listeners for source_vvvvvxu function +// #jform_source listeners for source_vvvvvxt function jQuery('#jform_source').on('keyup',function() { - 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 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); }); jQuery('#adminForm').on('change', '#jform_source',function (e) { e.preventDefault(); - 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 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); }); -// #jform_add_sql listeners for add_sql_vvvvvxu function +// #jform_add_sql listeners for add_sql_vvvvvxt function jQuery('#jform_add_sql').on('keyup',function() { - 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 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); }); jQuery('#adminForm').on('change', '#jform_add_sql',function (e) { e.preventDefault(); - 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 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); }); -// #jform_add_custom_import listeners for add_custom_import_vvvvvxw function -jQuery('#jform_add_custom_import').on('keyup',function() +// #jform_source listeners for source_vvvvvxv function +jQuery('#jform_source').on('keyup',function() { - var add_custom_import_vvvvvxw = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); - vvvvvxw(add_custom_import_vvvvvxw); + 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); }); -jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e) +jQuery('#adminForm').on('change', '#jform_source',function (e) { e.preventDefault(); - var add_custom_import_vvvvvxw = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); - vvvvvxw(add_custom_import_vvvvvxw); + 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); + +}); + +// #jform_add_sql listeners for add_sql_vvvvvxv function +jQuery('#jform_add_sql').on('keyup',function() +{ + 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); + +}); +jQuery('#adminForm').on('change', '#jform_add_sql',function (e) +{ + e.preventDefault(); + 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); }); @@ -640,18 +640,33 @@ jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e) }); -// #jform_add_custom_button listeners for add_custom_button_vvvvvxy function +// #jform_add_custom_import listeners for add_custom_import_vvvvvxy function +jQuery('#jform_add_custom_import').on('keyup',function() +{ + var add_custom_import_vvvvvxy = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvxy(add_custom_import_vvvvvxy); + +}); +jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e) +{ + e.preventDefault(); + var add_custom_import_vvvvvxy = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvxy(add_custom_import_vvvvvxy); + +}); + +// #jform_add_custom_button listeners for add_custom_button_vvvvvxz function jQuery('#jform_add_custom_button').on('keyup',function() { - var add_custom_button_vvvvvxy = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvxy(add_custom_button_vvvvvxy); + var add_custom_button_vvvvvxz = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvxz(add_custom_button_vvvvvxz); }); jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e) { e.preventDefault(); - var add_custom_button_vvvvvxy = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvxy(add_custom_button_vvvvvxy); + var add_custom_button_vvvvvxz = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvxz(add_custom_button_vvvvvxz); }); diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index 8e33b9edf..6f202afdd 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -71,10 +71,10 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy } // Get Linked view data - $this->vxxfields = $this->get('Vxxfields'); + $this->vxyfields = $this->get('Vxyfields'); // Get Linked view data - $this->vxylinked_components = $this->get('Vxylinked_components'); + $this->vxzlinked_components = $this->get('Vxzlinked_components'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 63e0db868..408967ef0 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index 5738211a5..69992cf3e 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index 0be653349..25e021063 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 9a576b89d..a00b695bf 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index b82ebf348..40911c695 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index 23cdf2d40..a6fb7598e 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index 055c7f58b..8aeeab357 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index cf8c2a0c2..d469a1cfa 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 111 of this MVC - @build 17th July, 2017 + @version @update number 114 of this MVC + @build 28th August, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index cbc027c95..c9b3137ed 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php index cf7d766e6..e1b8082f6 100644 --- a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_closed_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index 41abe3e43..0e6954648 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php index f5b51860b..3c1a7a554 100644 --- a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_open_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index bc676fbe2..a675825eb 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_releases_information.php b/admin/views/componentbuilder/tmpl/default_releases_information.php index 9fe732649..e47758a98 100644 --- a/admin/views/componentbuilder/tmpl/default_releases_information.php +++ b/admin/views/componentbuilder/tmpl/default_releases_information.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_releases_information.php diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index 778af599b..dc4b5ea43 100644 --- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index fdd88598d..817d08a10 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 57598d41f..bca05445c 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.5.2 - @build 25th August, 2017 + @version 2.5.4 + @build 13th September, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php index 4d597e0d3..8b5d118bf 100644 --- a/admin/views/custom_admin_view/tmpl/edit.php +++ b/admin/views/custom_admin_view/tmpl/edit.php @@ -165,123 +165,123 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');