From 829384a56b2b354d7e843cd99fb25484931bca0e Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Thu, 22 Dec 2016 23:32:13 +0200 Subject: [PATCH] added dynamic email helper fields to the global settings of all components that use the email helper class --- README.md | 20 +- admin/README.txt | 20 +- admin/assets/css/admin.css | 6 +- admin/assets/css/admin_view.css | 6 +- admin/assets/css/admin_views.css | 6 +- admin/assets/css/component.css | 6 +- admin/assets/css/components.css | 6 +- admin/assets/css/custom_admin_view.css | 6 +- admin/assets/css/custom_admin_views.css | 6 +- admin/assets/css/dashboard.css | 6 +- admin/assets/css/dynamic_get.css | 6 +- admin/assets/css/dynamic_gets.css | 6 +- admin/assets/css/field.css | 6 +- admin/assets/css/fields.css | 6 +- admin/assets/css/fieldtype.css | 6 +- admin/assets/css/fieldtypes.css | 6 +- admin/assets/css/help_document.css | 6 +- admin/assets/css/help_documents.css | 6 +- admin/assets/css/layout.css | 6 +- admin/assets/css/layouts.css | 6 +- admin/assets/css/site_view.css | 6 +- admin/assets/css/site_views.css | 6 +- admin/assets/css/snippet.css | 6 +- admin/assets/css/snippets.css | 6 +- admin/assets/css/template.css | 6 +- admin/assets/css/templates.css | 6 +- admin/compiler/joomla_3/Helper.php | 16 +- admin/compiler/joomla_3/Helper_site.php | 16 +- admin/compiler/joomla_3/router.php | 14 +- admin/componentbuilder.php | 6 +- admin/controller.php | 6 +- admin/controllers/admin_view.php | 8 +- admin/controllers/admin_views.php | 6 +- admin/controllers/ajax.json.php | 6 +- admin/controllers/compiler.php | 6 +- admin/controllers/component.php | 8 +- admin/controllers/componentbuilder.php | 6 +- admin/controllers/components.php | 6 +- admin/controllers/custom_admin_view.php | 8 +- admin/controllers/custom_admin_views.php | 6 +- admin/controllers/dynamic_get.php | 8 +- admin/controllers/dynamic_gets.php | 6 +- admin/controllers/field.php | 8 +- admin/controllers/fields.php | 6 +- admin/controllers/fieldtype.php | 8 +- admin/controllers/fieldtypes.php | 6 +- admin/controllers/help.php | 6 +- admin/controllers/help_document.php | 8 +- admin/controllers/help_documents.php | 6 +- admin/controllers/import.php | 6 +- admin/controllers/layout.php | 8 +- admin/controllers/layouts.php | 6 +- admin/controllers/site_view.php | 8 +- admin/controllers/site_views.php | 6 +- admin/controllers/snippet.php | 8 +- admin/controllers/snippets.php | 6 +- admin/controllers/template.php | 8 +- admin/controllers/templates.php | 6 +- admin/custom/dropbox.php | 46 +- admin/custom/dropboxupdater.php | 23 +- admin/helpers/compiler/e_Interpretation.php | 559 ++++++++++++++++-- admin/helpers/compiler/f_Infusion.php | 10 +- admin/helpers/componentbuilder.php | 22 +- admin/helpers/html/batch_.php | 6 +- admin/helpers/indenter.php | 6 +- admin/helpers/js.php | 6 +- admin/helpers/minify.php | 6 +- .../en-GB/en-GB.com_componentbuilder.ini | 4 +- admin/layouts/admin_view/css_fullwidth.php | 6 +- .../admin_view/custom_buttons_fullwidth.php | 6 +- .../admin_view/custom_buttons_left.php | 6 +- .../admin_view/custom_import_fullwidth.php | 6 +- admin/layouts/admin_view/fields_fullwidth.php | 6 +- .../admin_view/javascript_fullwidth.php | 6 +- admin/layouts/admin_view/mysql_fullwidth.php | 6 +- admin/layouts/admin_view/mysql_left.php | 6 +- admin/layouts/admin_view/php_fullwidth.php | 6 +- admin/layouts/admin_view/publishing.php | 6 +- admin/layouts/admin_view/publlshing.php | 6 +- admin/layouts/admin_view/settings_above.php | 6 +- admin/layouts/admin_view/settings_left.php | 6 +- admin/layouts/admin_view/settings_right.php | 6 +- admin/layouts/admin_view/settings_under.php | 6 +- admin/layouts/batchselection.php | 6 +- .../component/admin_views_fullwidth.php | 6 +- admin/layouts/component/details_above.php | 6 +- admin/layouts/component/details_left.php | 6 +- admin/layouts/component/details_right.php | 6 +- admin/layouts/component/details_under.php | 6 +- .../dynamic_integration_fullwidth.php | 6 +- .../component/libs_helpers_fullwidth.php | 6 +- admin/layouts/component/mysql_fullwidth.php | 6 +- admin/layouts/component/php_fullwidth.php | 6 +- admin/layouts/component/publishing.php | 6 +- admin/layouts/component/publlshing.php | 6 +- admin/layouts/component/readme_left.php | 6 +- admin/layouts/component/readme_right.php | 6 +- admin/layouts/component/settings_left.php | 6 +- admin/layouts/component/settings_right.php | 6 +- .../component/site_views_fullwidth.php | 6 +- .../custom_buttons_fullwidth.php | 6 +- .../custom_admin_view/custom_buttons_left.php | 6 +- .../custom_script_fullwidth.php | 6 +- .../custom_admin_view/details_above.php | 6 +- .../custom_admin_view/details_fullwidth.php | 6 +- .../custom_admin_view/details_left.php | 6 +- .../custom_admin_view/details_right.php | 6 +- .../custom_admin_view/details_rightside.php | 6 +- .../custom_admin_view/details_under.php | 6 +- .../layouts/custom_admin_view/publishing.php | 6 +- .../layouts/custom_admin_view/publlshing.php | 6 +- .../layouts/dynamic_get/abacus_fullwidth.php | 6 +- admin/layouts/dynamic_get/abacus_left.php | 6 +- .../dynamic_get/custom_script_fullwidth.php | 6 +- admin/layouts/dynamic_get/gettable_above.php | 6 +- .../dynamic_get/gettable_fullwidth.php | 6 +- admin/layouts/dynamic_get/gettable_left.php | 6 +- admin/layouts/dynamic_get/gettable_right.php | 6 +- admin/layouts/dynamic_get/gettable_under.php | 6 +- admin/layouts/dynamic_get/publishing.php | 6 +- admin/layouts/dynamic_get/publlshing.php | 6 +- admin/layouts/field/details_fullwidth.php | 6 +- admin/layouts/field/details_left.php | 6 +- admin/layouts/field/details_right.php | 6 +- admin/layouts/field/details_under.php | 6 +- admin/layouts/field/publishing.php | 6 +- admin/layouts/field/publlshing.php | 6 +- admin/layouts/field/scripts_left.php | 6 +- admin/layouts/field/scripts_right.php | 6 +- admin/layouts/fieldtype/details_left.php | 6 +- admin/layouts/fieldtype/details_right.php | 6 +- admin/layouts/fieldtype/fields_fullwidth.php | 6 +- admin/layouts/fieldtype/publishing.php | 6 +- admin/layouts/fieldtype/publlshing.php | 6 +- admin/layouts/help_document/details_above.php | 6 +- .../help_document/details_fullwidth.php | 6 +- admin/layouts/help_document/details_left.php | 6 +- admin/layouts/help_document/details_right.php | 6 +- admin/layouts/help_document/details_under.php | 6 +- admin/layouts/help_document/publishing.php | 6 +- admin/layouts/help_document/publlshing.php | 6 +- .../layout/custom_script_fullwidth.php | 6 +- admin/layouts/layout/details_fullwidth.php | 6 +- admin/layouts/layout/details_left.php | 6 +- admin/layouts/layout/details_right.php | 6 +- admin/layouts/layout/details_rightside.php | 6 +- admin/layouts/layout/details_under.php | 6 +- admin/layouts/layout/publishing.php | 6 +- admin/layouts/layout/publlshing.php | 6 +- .../site_view/custom_buttons_fullwidth.php | 6 +- admin/layouts/site_view/details_above.php | 6 +- admin/layouts/site_view/details_fullwidth.php | 6 +- admin/layouts/site_view/details_left.php | 6 +- admin/layouts/site_view/details_right.php | 6 +- admin/layouts/site_view/details_rightside.php | 6 +- admin/layouts/site_view/details_under.php | 6 +- .../site_view/javascript_css_fullwidth.php | 6 +- admin/layouts/site_view/php_fullwidth.php | 6 +- admin/layouts/site_view/publishing.php | 6 +- admin/layouts/site_view/publlshing.php | 6 +- admin/layouts/snippet/details_above.php | 6 +- admin/layouts/snippet/details_left.php | 6 +- admin/layouts/snippet/details_right.php | 6 +- admin/layouts/snippet/publishing.php | 6 +- admin/layouts/snippet/publlshing.php | 6 +- .../template/custom_script_fullwidth.php | 6 +- admin/layouts/template/details_fullwidth.php | 6 +- admin/layouts/template/details_left.php | 6 +- admin/layouts/template/details_right.php | 6 +- admin/layouts/template/details_rightside.php | 6 +- admin/layouts/template/details_under.php | 6 +- admin/layouts/template/publishing.php | 6 +- admin/layouts/template/publlshing.php | 6 +- admin/models/admin_view.php | 6 +- admin/models/admin_views.php | 6 +- admin/models/ajax.php | 6 +- admin/models/compiler.php | 6 +- admin/models/component.php | 6 +- admin/models/componentbuilder.php | 6 +- admin/models/components.php | 6 +- admin/models/custom_admin_view.php | 6 +- admin/models/custom_admin_views.php | 6 +- admin/models/dynamic_get.php | 6 +- admin/models/dynamic_gets.php | 6 +- admin/models/field.php | 6 +- admin/models/fields.php | 6 +- admin/models/fields/adminviewfolderlist.php | 13 +- admin/models/fields/adminviews.php | 13 +- admin/models/fields/articles.php | 13 +- admin/models/fields/customadminviews.php | 13 +- admin/models/fields/customfilelist.php | 13 +- admin/models/fields/customfolderlist.php | 13 +- admin/models/fields/customgets.php | 13 +- admin/models/fields/dbtables.php | 13 +- admin/models/fields/dynamicgets.php | 13 +- admin/models/fields/fields.php | 13 +- admin/models/fields/fieldsmulti.php | 13 +- admin/models/fields/fieldtypes.php | 13 +- admin/models/fields/maingets.php | 13 +- admin/models/fields/siteviewfolderlist.php | 13 +- admin/models/fields/siteviews.php | 13 +- admin/models/fields/snippets.php | 13 +- admin/models/fieldtype.php | 6 +- admin/models/fieldtypes.php | 6 +- admin/models/forms/admin_view.js | 6 +- admin/models/forms/component.js | 6 +- admin/models/forms/custom_admin_view.js | 6 +- admin/models/forms/dynamic_get.js | 6 +- admin/models/forms/field.js | 6 +- admin/models/forms/fieldtype.js | 6 +- admin/models/forms/help_document.js | 6 +- admin/models/forms/layout.js | 6 +- admin/models/forms/site_view.js | 6 +- admin/models/forms/snippet.js | 6 +- admin/models/forms/template.js | 6 +- admin/models/help_document.php | 6 +- admin/models/help_documents.php | 6 +- admin/models/import.php | 6 +- admin/models/layout.php | 6 +- admin/models/layouts.php | 6 +- admin/models/site_view.php | 6 +- admin/models/site_views.php | 6 +- admin/models/snippet.php | 6 +- admin/models/snippets.php | 6 +- admin/models/template.php | 6 +- admin/models/templates.php | 6 +- admin/sql/updates/mysql/2.2.4.sql | 1 + admin/tables/admin_view.php | 6 +- admin/tables/component.php | 6 +- admin/tables/custom_admin_view.php | 6 +- admin/tables/dynamic_get.php | 6 +- admin/tables/field.php | 6 +- admin/tables/fieldtype.php | 6 +- admin/tables/help_document.php | 6 +- admin/tables/layout.php | 6 +- admin/tables/site_view.php | 6 +- admin/tables/snippet.php | 6 +- admin/tables/template.php | 6 +- admin/views/admin_view/submitbutton.js | 6 +- admin/views/admin_view/tmpl/edit.php | 6 +- admin/views/admin_view/view.html.php | 6 +- admin/views/admin_views/tmpl/default.php | 6 +- .../admin_views/tmpl/default_batch_body.php | 6 +- .../admin_views/tmpl/default_batch_footer.php | 6 +- admin/views/admin_views/tmpl/default_body.php | 6 +- admin/views/admin_views/tmpl/default_foot.php | 6 +- admin/views/admin_views/tmpl/default_head.php | 6 +- .../admin_views/tmpl/default_toolbar.php | 6 +- admin/views/admin_views/view.html.php | 6 +- admin/views/compiler/tmpl/default.php | 6 +- admin/views/compiler/view.html.php | 6 +- admin/views/component/submitbutton.js | 6 +- admin/views/component/tmpl/edit.php | 6 +- admin/views/component/view.html.php | 6 +- admin/views/componentbuilder/tmpl/default.php | 6 +- ...sed_issues_the_closed_issues_on_github.php | 6 +- .../componentbuilder/tmpl/default_main.php | 6 +- ..._open_issues_the_open_issues_on_github.php | 6 +- .../tmpl/default_readme_information.php | 6 +- ...t_vast_development_method_notice_board.php | 6 +- .../componentbuilder/tmpl/default_vdm.php | 6 +- admin/views/componentbuilder/view.html.php | 6 +- admin/views/components/tmpl/default.php | 6 +- .../components/tmpl/default_batch_body.php | 6 +- .../components/tmpl/default_batch_footer.php | 6 +- admin/views/components/tmpl/default_body.php | 6 +- admin/views/components/tmpl/default_foot.php | 6 +- admin/views/components/tmpl/default_head.php | 6 +- .../views/components/tmpl/default_toolbar.php | 6 +- admin/views/components/view.html.php | 6 +- admin/views/custom_admin_view/submitbutton.js | 6 +- admin/views/custom_admin_view/tmpl/edit.php | 6 +- admin/views/custom_admin_view/view.html.php | 6 +- .../views/custom_admin_views/tmpl/default.php | 6 +- .../tmpl/default_batch_body.php | 6 +- .../tmpl/default_batch_footer.php | 6 +- .../custom_admin_views/tmpl/default_body.php | 6 +- .../custom_admin_views/tmpl/default_foot.php | 6 +- .../custom_admin_views/tmpl/default_head.php | 6 +- .../tmpl/default_toolbar.php | 6 +- admin/views/custom_admin_views/view.html.php | 6 +- admin/views/dynamic_get/submitbutton.js | 6 +- admin/views/dynamic_get/tmpl/edit.php | 6 +- admin/views/dynamic_get/view.html.php | 6 +- admin/views/dynamic_gets/tmpl/default.php | 6 +- .../dynamic_gets/tmpl/default_batch_body.php | 6 +- .../tmpl/default_batch_footer.php | 6 +- .../views/dynamic_gets/tmpl/default_body.php | 6 +- .../views/dynamic_gets/tmpl/default_foot.php | 6 +- .../views/dynamic_gets/tmpl/default_head.php | 6 +- .../dynamic_gets/tmpl/default_toolbar.php | 6 +- admin/views/dynamic_gets/view.html.php | 6 +- admin/views/field/submitbutton.js | 6 +- admin/views/field/tmpl/edit.php | 6 +- admin/views/field/view.html.php | 6 +- admin/views/fields/tmpl/default.php | 6 +- .../views/fields/tmpl/default_batch_body.php | 6 +- .../fields/tmpl/default_batch_footer.php | 6 +- admin/views/fields/tmpl/default_body.php | 6 +- admin/views/fields/tmpl/default_foot.php | 6 +- admin/views/fields/tmpl/default_head.php | 6 +- admin/views/fields/tmpl/default_toolbar.php | 6 +- admin/views/fields/view.html.php | 6 +- admin/views/fieldtype/submitbutton.js | 6 +- admin/views/fieldtype/tmpl/edit.php | 6 +- admin/views/fieldtype/view.html.php | 6 +- admin/views/fieldtypes/tmpl/default.php | 6 +- .../fieldtypes/tmpl/default_batch_body.php | 6 +- .../fieldtypes/tmpl/default_batch_footer.php | 6 +- admin/views/fieldtypes/tmpl/default_body.php | 6 +- admin/views/fieldtypes/tmpl/default_foot.php | 6 +- admin/views/fieldtypes/tmpl/default_head.php | 6 +- .../views/fieldtypes/tmpl/default_toolbar.php | 6 +- admin/views/fieldtypes/view.html.php | 6 +- admin/views/help_document/submitbutton.js | 6 +- admin/views/help_document/tmpl/edit.php | 6 +- admin/views/help_document/view.html.php | 6 +- admin/views/help_documents/tmpl/default.php | 6 +- .../tmpl/default_batch_body.php | 6 +- .../tmpl/default_batch_footer.php | 6 +- .../help_documents/tmpl/default_body.php | 6 +- .../help_documents/tmpl/default_foot.php | 6 +- .../help_documents/tmpl/default_head.php | 6 +- .../help_documents/tmpl/default_toolbar.php | 6 +- admin/views/help_documents/view.html.php | 6 +- admin/views/import/tmpl/default.php | 6 +- admin/views/import/view.html.php | 6 +- admin/views/layout/submitbutton.js | 6 +- admin/views/layout/tmpl/edit.php | 6 +- admin/views/layout/view.html.php | 6 +- admin/views/layouts/tmpl/default.php | 6 +- .../views/layouts/tmpl/default_batch_body.php | 6 +- .../layouts/tmpl/default_batch_footer.php | 6 +- admin/views/layouts/tmpl/default_body.php | 6 +- admin/views/layouts/tmpl/default_foot.php | 6 +- admin/views/layouts/tmpl/default_head.php | 6 +- admin/views/layouts/tmpl/default_toolbar.php | 6 +- admin/views/layouts/view.html.php | 6 +- admin/views/site_view/submitbutton.js | 6 +- admin/views/site_view/tmpl/edit.php | 6 +- admin/views/site_view/view.html.php | 6 +- admin/views/site_views/tmpl/default.php | 6 +- .../site_views/tmpl/default_batch_body.php | 6 +- .../site_views/tmpl/default_batch_footer.php | 6 +- admin/views/site_views/tmpl/default_body.php | 6 +- admin/views/site_views/tmpl/default_foot.php | 6 +- admin/views/site_views/tmpl/default_head.php | 6 +- .../views/site_views/tmpl/default_toolbar.php | 6 +- admin/views/site_views/view.html.php | 6 +- admin/views/snippet/submitbutton.js | 6 +- admin/views/snippet/tmpl/edit.php | 6 +- admin/views/snippet/view.html.php | 6 +- admin/views/snippets/tmpl/default.php | 6 +- .../snippets/tmpl/default_batch_body.php | 6 +- .../snippets/tmpl/default_batch_footer.php | 6 +- admin/views/snippets/tmpl/default_body.php | 6 +- admin/views/snippets/tmpl/default_foot.php | 6 +- admin/views/snippets/tmpl/default_head.php | 6 +- admin/views/snippets/tmpl/default_toolbar.php | 6 +- admin/views/snippets/view.html.php | 6 +- admin/views/template/submitbutton.js | 6 +- admin/views/template/tmpl/edit.php | 6 +- admin/views/template/view.html.php | 6 +- admin/views/templates/tmpl/default.php | 6 +- .../templates/tmpl/default_batch_body.php | 6 +- .../templates/tmpl/default_batch_footer.php | 6 +- admin/views/templates/tmpl/default_body.php | 6 +- admin/views/templates/tmpl/default_foot.php | 6 +- admin/views/templates/tmpl/default_head.php | 6 +- .../views/templates/tmpl/default_toolbar.php | 6 +- admin/views/templates/view.html.php | 6 +- componentbuilder.xml | 10 +- componentbuilder_update_server.xml | 125 ++-- script.php | 14 +- site/assets/css/site.css | 6 +- site/componentbuilder.php | 6 +- site/controller.php | 6 +- site/controllers/help.php | 6 +- site/helpers/componentbuilder.php | 22 +- site/helpers/headercheck.php | 6 +- site/helpers/route.php | 6 +- site/router.php | 20 +- 382 files changed, 1919 insertions(+), 1347 deletions(-) create mode 100644 admin/sql/updates/mysql/2.2.4.sql diff --git a/README.md b/README.md index 1cf228207..cd4c6a1f3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Component Builder (2.2.4) +# Component Builder (2.2.5) This is a [Joomla 3.x](http://www.joomla.org/) component. @@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.4) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.5) 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. @@ -100,23 +100,23 @@ Component Builder is mapped as a component in itself on my local development env # Build Details -+ *Company*: [Vast Development Method](https://www.vdm.io/joomla-component-builder) ++ *Company*: [Vast Development Method](http://vdm.bz/component-builder) + *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io) -+ *Name*: [Component Builder](https://www.vdm.io/joomla-component-builder) ++ *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 25th November, 2016 -+ *Version*: 2.2.4 ++ *Last Build*: 22nd December, 2016 ++ *Version*: 2.2.5 + *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*: **86638** -+ *File count*: **541** ++ *Line count*: **86690** ++ *File count*: **542** + *Folder count*: **99** -> This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder). +> 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) ## Donations - If you want to support this project, please consider donating: +Come on buy me a coffee :) * PayPal: pay@vdm.io * Bitcoin: 3H35PYwikEosvcjxHXGPLS1GufZ4b4iFu3 \ No newline at end of file diff --git a/admin/README.txt b/admin/README.txt index 1cf228207..cd4c6a1f3 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Component Builder (2.2.4) +# Component Builder (2.2.5) This is a [Joomla 3.x](http://www.joomla.org/) component. @@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.4) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.5) 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. @@ -100,23 +100,23 @@ Component Builder is mapped as a component in itself on my local development env # Build Details -+ *Company*: [Vast Development Method](https://www.vdm.io/joomla-component-builder) ++ *Company*: [Vast Development Method](http://vdm.bz/component-builder) + *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io) -+ *Name*: [Component Builder](https://www.vdm.io/joomla-component-builder) ++ *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 25th November, 2016 -+ *Version*: 2.2.4 ++ *Last Build*: 22nd December, 2016 ++ *Version*: 2.2.5 + *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*: **86638** -+ *File count*: **541** ++ *Line count*: **86690** ++ *File count*: **542** + *Folder count*: **99** -> This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder). +> 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) ## Donations - If you want to support this project, please consider donating: +Come on buy me a coffee :) * PayPal: pay@vdm.io * Bitcoin: 3H35PYwikEosvcjxHXGPLS1GufZ4b4iFu3 \ No newline at end of file diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 445b6486f..9cac24401 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index a7060f7ef..d6863d7b0 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index 66947e1c1..1051b175e 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/component.css b/admin/assets/css/component.css index 603732768..7f75ab83f 100644 --- a/admin/assets/css/component.css +++ b/admin/assets/css/component.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/components.css b/admin/assets/css/components.css index ec925b71e..078f53030 100644 --- a/admin/assets/css/components.css +++ b/admin/assets/css/components.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index 6a4e1992a..ac5c7109f 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/custom_admin_views.css b/admin/assets/css/custom_admin_views.css index dbb625852..150251b84 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 85c1c5476..1ccc68dc3 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/dynamic_get.css b/admin/assets/css/dynamic_get.css index 4787b56bb..ae6742a93 100644 --- a/admin/assets/css/dynamic_get.css +++ b/admin/assets/css/dynamic_get.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/dynamic_gets.css b/admin/assets/css/dynamic_gets.css index 5f2f5bb37..43dffd107 100644 --- a/admin/assets/css/dynamic_gets.css +++ b/admin/assets/css/dynamic_gets.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/field.css b/admin/assets/css/field.css index 049c4b9ec..39bcd4d3a 100644 --- a/admin/assets/css/field.css +++ b/admin/assets/css/field.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/fields.css b/admin/assets/css/fields.css index 5a22a8aab..ebe786541 100644 --- a/admin/assets/css/fields.css +++ b/admin/assets/css/fields.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/fieldtype.css b/admin/assets/css/fieldtype.css index aebeeccfd..203a04c3d 100644 --- a/admin/assets/css/fieldtype.css +++ b/admin/assets/css/fieldtype.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/fieldtypes.css b/admin/assets/css/fieldtypes.css index c8bb4f7e7..eef6da1e0 100644 --- a/admin/assets/css/fieldtypes.css +++ b/admin/assets/css/fieldtypes.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 646902e08..88db61b71 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index e6e67559d..9f94a5f39 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/layout.css b/admin/assets/css/layout.css index 6f4a5d6d6..f6727919b 100644 --- a/admin/assets/css/layout.css +++ b/admin/assets/css/layout.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/layouts.css b/admin/assets/css/layouts.css index e9879f4d7..0b0e6ac6f 100644 --- a/admin/assets/css/layouts.css +++ b/admin/assets/css/layouts.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage layouts.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index 4a4281e63..83fc46368 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/site_views.css b/admin/assets/css/site_views.css index 4055c0a75..4d1eb99d4 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/snippet.css b/admin/assets/css/snippet.css index a4240de7a..55af7e81d 100644 --- a/admin/assets/css/snippet.css +++ b/admin/assets/css/snippet.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/snippets.css b/admin/assets/css/snippets.css index 9fd2a1999..2744e5d90 100644 --- a/admin/assets/css/snippets.css +++ b/admin/assets/css/snippets.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/template.css b/admin/assets/css/template.css index 43bcf842c..a54deddbf 100644 --- a/admin/assets/css/template.css +++ b/admin/assets/css/template.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/templates.css b/admin/assets/css/templates.css index 7f744939b..6a4956a4e 100644 --- a/admin/assets/css/templates.css +++ b/admin/assets/css/templates.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/compiler/joomla_3/Helper.php b/admin/compiler/joomla_3/Helper.php index b0c1bfa9f..aa6de8d60 100644 --- a/admin/compiler/joomla_3/Helper.php +++ b/admin/compiler/joomla_3/Helper.php @@ -265,7 +265,7 @@ abstract class ###Component###Helper { // The record has been set. Check the record permissions. $permission = $user->authorise($action->name, 'com_###component###.'.$view.'.' . (int) $record->id); - if (!$permission && !is_null($permission)) + if (!$permission) // TODO removed && !is_null($permission) { if ($action->name == 'core.edit' || $action->name == $view.'.edit') { @@ -600,10 +600,22 @@ abstract class ###Component###Helper return false; } - public static function checkArray($array) + public static function checkArray($array, $removeEmptyString = false) { if (isset($array) && is_array($array) && count($array) > 0) { + // also make sure the empty strings are removed + if ($removeEmptyString) + { + foreach ($array as $key => $string) + { + if (empty($string)) + { + unset($array[$key]); + } + } + return self::checkArray($array, false); + } return true; } return false; diff --git a/admin/compiler/joomla_3/Helper_site.php b/admin/compiler/joomla_3/Helper_site.php index 8e45401ba..b700b2e32 100644 --- a/admin/compiler/joomla_3/Helper_site.php +++ b/admin/compiler/joomla_3/Helper_site.php @@ -408,7 +408,7 @@ abstract class ###Component###Helper { // The record has been set. Check the record permissions. $permission = $user->authorise($action->name, 'com_###component###.'.$view.'.' . (int) $record->id); - if (!$permission && !is_null($permission)) + if (!$permission) // TODO removed && !is_null($permission) { if ($action->name == 'core.edit' || $action->name == $view.'.edit') { @@ -592,10 +592,22 @@ abstract class ###Component###Helper return false; } - public static function checkArray($array) + public static function checkArray($array, $removeEmptyString = false) { if (isset($array) && is_array($array) && count($array) > 0) { + // also make sure the empty strings are removed + if ($removeEmptyString) + { + foreach ($array as $key => $string) + { + if (empty($string)) + { + unset($array[$key]); + } + } + return self::checkArray($array, false); + } return true; } return false; diff --git a/admin/compiler/joomla_3/router.php b/admin/compiler/joomla_3/router.php index d2fee4233..b5d1ecd3d 100644 --- a/admin/compiler/joomla_3/router.php +++ b/admin/compiler/joomla_3/router.php @@ -127,16 +127,10 @@ class ###Component###Router extends JComponentRouterBase * @since 3.3 */ public function parse(&$segments) - { - //var_dump($segments); - //$app = JFactory::getApplication(); - //$menu = $app->getMenu(); - //$item = $menu->getActive(); - + { $count = count($segments); $vars = array(); - - //var_dump($item->query['view']); + //Handle View and Identifier switch($segments[0]) {###ROUTER_PARSE_SWITCH### @@ -145,7 +139,7 @@ class ###Component###Router extends JComponentRouterBase return $vars; } - protected function getVar($table, $where = null, $whereString = 'user', $what = 'id', $operator = '=', $main = '###component###') + protected function getVar($table, $where = null, $whereString = 'user', $what = 'id', $category = false, $operator = '=', $main = '###component###') { if(!$where) { @@ -157,7 +151,7 @@ class ###Component###Router extends JComponentRouterBase $query = $db->getQuery(true); $query->select($db->quoteName(array($what))); - if ('categories' == $table || 'category' == $table) + if ('categories' == $table || 'category' == $table || $category) { $query->from($db->quoteName('#__categories')); } diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 822e6b1f9..8ade21f07 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controller.php b/admin/controller.php index f9cc981f8..0de8abef5 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage controller.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index c37cca0f9..0ff673094 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php - @author Llewellyn van der Merwe + @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 @@ -99,7 +99,7 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm { // The record has been set. Check the record permissions. $permission = $user->authorise('core.edit', 'com_componentbuilder.admin_view.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('core.edit.own', 'com_componentbuilder.admin_view.' . $recordId)) { diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 00bc20773..c926afd2f 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index c5913970b..c9331424d 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 52797f6b4..c1e517a11 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage compiler.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/component.php b/admin/controllers/component.php index 426cb8333..42a7ce1b8 100644 --- a/admin/controllers/component.php +++ b/admin/controllers/component.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.php - @author Llewellyn van der Merwe + @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 @@ -85,7 +85,7 @@ class ComponentbuilderControllerComponent extends JControllerForm { // The record has been set. Check the record permissions. $permission = $user->authorise('core.edit', 'com_componentbuilder.component.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('core.edit.own', 'com_componentbuilder.component.' . $recordId)) { diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 43cc14757..e8b6c4052 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/components.php b/admin/controllers/components.php index 2c1e67e8a..7f8b7a6f2 100644 --- a/admin/controllers/components.php +++ b/admin/controllers/components.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index 86f66d4b0..5a509dffd 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php - @author Llewellyn van der Merwe + @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 @@ -99,7 +99,7 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm { // The record has been set. Check the record permissions. $permission = $user->authorise('core.edit', 'com_componentbuilder.custom_admin_view.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('core.edit.own', 'com_componentbuilder.custom_admin_view.' . $recordId)) { diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index 295003457..1bc282452 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index d6ebee482..d90d775d3 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php - @author Llewellyn van der Merwe + @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 @@ -99,7 +99,7 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm { // The record has been set. Check the record permissions. $permission = $user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('dynamic_get.edit.own', 'com_componentbuilder.dynamic_get.' . $recordId)) { diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index b99b306e0..074eac144 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/field.php b/admin/controllers/field.php index 8891569b5..98701ee42 100644 --- a/admin/controllers/field.php +++ b/admin/controllers/field.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php - @author Llewellyn van der Merwe + @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 @@ -117,7 +117,7 @@ class ComponentbuilderControllerField extends JControllerForm { // The record has been set. Check the record permissions. $permission = $user->authorise('field.edit', 'com_componentbuilder.field.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('field.edit.own', 'com_componentbuilder.field.' . $recordId)) { diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index 8fc7088d8..10ec18f69 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php index c7233d8cb..ed60d9502 100644 --- a/admin/controllers/fieldtype.php +++ b/admin/controllers/fieldtype.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php - @author Llewellyn van der Merwe + @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 @@ -117,7 +117,7 @@ class ComponentbuilderControllerFieldtype extends JControllerForm { // The record has been set. Check the record permissions. $permission = $user->authorise('fieldtype.edit', 'com_componentbuilder.fieldtype.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('fieldtype.edit.own', 'com_componentbuilder.fieldtype.' . $recordId)) { diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php index 5e2e8c46d..bc36b5ce8 100644 --- a/admin/controllers/fieldtypes.php +++ b/admin/controllers/fieldtypes.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 6f04b7182..65ab15911 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 4b3cda161..8647e5678 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.php - @author Llewellyn van der Merwe + @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 @@ -99,7 +99,7 @@ class ComponentbuilderControllerHelp_document extends JControllerForm { // The record has been set. Check the record permissions. $permission = $user->authorise('help_document.edit', 'com_componentbuilder.help_document.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('help_document.edit.own', 'com_componentbuilder.help_document.' . $recordId)) { diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 10bd1c3d6..98674a74c 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 33c1f8c2f..78b172115 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage import.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php index 6bd3253e8..c59d8c3fb 100644 --- a/admin/controllers/layout.php +++ b/admin/controllers/layout.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.php - @author Llewellyn van der Merwe + @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 @@ -99,7 +99,7 @@ class ComponentbuilderControllerLayout extends JControllerForm { // The record has been set. Check the record permissions. $permission = $user->authorise('core.edit', 'com_componentbuilder.layout.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('core.edit.own', 'com_componentbuilder.layout.' . $recordId)) { diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php index 80fbece34..d5ff2e5fd 100644 --- a/admin/controllers/layouts.php +++ b/admin/controllers/layouts.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage layouts.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index cd7d9cf54..3c7a5d29a 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.php - @author Llewellyn van der Merwe + @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 @@ -99,7 +99,7 @@ class ComponentbuilderControllerSite_view extends JControllerForm { // The record has been set. Check the record permissions. $permission = $user->authorise('core.edit', 'com_componentbuilder.site_view.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('core.edit.own', 'com_componentbuilder.site_view.' . $recordId)) { diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index d6be61603..c284635de 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php index d93a9ae3d..32367435e 100644 --- a/admin/controllers/snippet.php +++ b/admin/controllers/snippet.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.php - @author Llewellyn van der Merwe + @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 @@ -99,7 +99,7 @@ class ComponentbuilderControllerSnippet extends JControllerForm { // The record has been set. Check the record permissions. $permission = $user->authorise('core.edit', 'com_componentbuilder.snippet.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('core.edit.own', 'com_componentbuilder.snippet.' . $recordId)) { diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php index 719f20b08..672e72f2b 100644 --- a/admin/controllers/snippets.php +++ b/admin/controllers/snippets.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/template.php b/admin/controllers/template.php index e1218715f..e17e73b94 100644 --- a/admin/controllers/template.php +++ b/admin/controllers/template.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.php - @author Llewellyn van der Merwe + @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 @@ -99,7 +99,7 @@ class ComponentbuilderControllerTemplate extends JControllerForm { // The record has been set. Check the record permissions. $permission = $user->authorise('core.edit', 'com_componentbuilder.template.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('core.edit.own', 'com_componentbuilder.template.' . $recordId)) { diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php index acbdc48c1..df32ae08d 100644 --- a/admin/controllers/templates.php +++ b/admin/controllers/templates.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/custom/dropbox.php b/admin/custom/dropbox.php index afaa13787..7bee933d6 100644 --- a/admin/custom/dropbox.php +++ b/admin/custom/dropbox.php @@ -96,6 +96,11 @@ class Dropbox * the error messages */ public $error_summary = array(); + + /** + * force the update to reset + **/ + public $forceReset = false; /** * Constructor @@ -116,6 +121,7 @@ class Dropbox * ============= * $details * ============= + * sourceID * dropboxOption * dropboxTarget * addTypes @@ -217,16 +223,20 @@ class Dropbox protected function makeGetCall() { - $query = json_encode($this->query); $options = array( 'http' => array( 'header' => "Content-Type: application/json\r\n". "Authorization: Bearer ".$this->oauthToken, - 'method' => "POST", - 'content' => $query - ), - ); + 'method' => "POST" + ), + ); + + if ($this->checkArray($this->query)) + { + $this->query = json_encode($this->query); + } + $options['http']['content'] = $this->query; $context = stream_context_create($options); $response = file_get_contents($this->url.$this->domainpath[$this->type], false, $context); @@ -246,8 +256,6 @@ class Dropbox protected function makeCurlCall() { - $query = json_encode($this->query); - $headers = array('Authorization: Bearer '. $this->oauthToken, 'Content-Type: application/json' ); @@ -255,7 +263,12 @@ class Dropbox $ch = curl_init($this->url.$this->domainpath[$this->type]); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); - curl_setopt($ch, CURLOPT_POSTFIELDS, $query); + // check if query is set + if ($this->checkArray($this->query)) + { + $this->query = json_encode($this->query); + } + curl_setopt($ch, CURLOPT_POSTFIELDS, $this->query); curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // curl_setopt($ch, CURLOPT_VERBOSE, 1); // debug @@ -278,6 +291,7 @@ class Dropbox if (isset($data->error_summary)) { $this->error_summary[] = $data->error_summary; + $this->forceReset = true; return false; } @@ -330,6 +344,7 @@ class Dropbox $this->error_summary[] = $this->type.'_error'; break; } + $this->forceReset = true; return false; } @@ -338,13 +353,14 @@ class Dropbox // we need to store the url to DB if (isset($this->mediaData[$path])) { - $localListing = array(); - $localListing['id'] = 0; - $localListing['name'] = $this->mediaData[$path]['name']; - $localListing['size'] = $this->mediaData[$path]['size']; - $localListing['key'] = $path; - $localListing['url'] = $url; - $localListing['build'] = $this->build; + $localListing = array(); + $localListing['id'] = 0; + $localListing['name'] = $this->mediaData[$path]['name']; + $localListing['size'] = $this->mediaData[$path]['size']; + $localListing['key'] = $path; + $localListing['url'] = $url; + $localListing['build'] = $this->build; + $localListing['external_source'] = (int) $this->sourceID; // free some memory unset($this->mediaData[$path]); // check if item already set diff --git a/admin/custom/dropboxupdater.php b/admin/custom/dropboxupdater.php index 29c9e3932..919b4897b 100644 --- a/admin/custom/dropboxupdater.php +++ b/admin/custom/dropboxupdater.php @@ -69,11 +69,6 @@ class Dropboxupdater protected $updateInfo; protected $infoFilePath; - /** - * get the localkey - **/ - protected $localkey = false; - /** * Main dropbox class **/ @@ -302,6 +297,8 @@ class Dropboxupdater { // reset config $this->detailsConfig = array(); + // the source ID + $this->detailsConfig['sourceID'] = $this->data->id; // get the legal files set $this->detailsConfig['addTypes'] = $this->data->filetypes; // set other config settings @@ -348,7 +345,7 @@ class Dropboxupdater protected function setUpdateInfoData() { // set the info file name - $fileName = md5($this->fileKey.'info'.$this->localkey); + $fileName = md5($this->fileKey.'info'); // set file path $this->infoFilePath = JPATH_COMPONENT_SITE.'/helpers/'.$fileName.'.json'; @@ -402,7 +399,7 @@ class Dropboxupdater protected function doUpdate() { // we need more then the normal time to run this script 5 minutes at least. - ini_set('max_execution_time', 500); + ini_set('max_execution_time', $this->app_params->get('max_execution_time', 500)); // get data of all the shared links of all target items if (!$this->dropbox->getFiles($this->data->oauthtoken, $this->data->permissiontype, $this->detailsConfig)) { @@ -412,23 +409,23 @@ class Dropboxupdater // if this is a manual update, then revoke the token if ($this->forceUpdate) { - $this->dropbox->revokeToken($this->data->oauthtoken); + $this->dropbox->revokeToken(); } return true; } - protected function resetUpdate() + public function resetUpdate() { - if ($this->okay) + if ($this->okay || (isset($this->dropbox->forceReset) && $this->dropbox->forceReset)) { // make sure the update reset $this->updateInfo->nextupdate = $this->next; $this->updateInfo->updateactive = false; $this->updateInfo->updatenow = false; - - return $this->saveUpdateInfo(); + // store final update + $this->saveUpdateInfo(); } - return false; + return $this->okay; } protected function saveJson($data,$filename) diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index c19317f41..bf5a9a083 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -118,12 +118,15 @@ class Interpretation extends Fields { if ($this->componentData->add_license && $this->componentData->license_type == 3) { - $_VDM = '_'.ComponentbuilderHelper::safeString($this->uniquekey(10),'U'); - // add it to the system - $this->fileContentStatic['###HELPER_SITE_LICENSE_LOCK###'] = $this->setHelperLincenseLock($_VDM,'site'); - $this->fileContentStatic['###HELPER_LICENSE_LOCK###'] = $this->setHelperLincenseLock($_VDM,'admin'); - $this->fileContentStatic['###LICENSE_LOCKED_INT###'] = $this->setInitLincenseLock($_VDM); - $this->fileContentStatic['###LICENSE_LOCKED_DEFINED###'] = "\n\n".'defined(\''.$_VDM.'\') or die(JText::_(\'NIE_REG_NIE\'));'; + if (!isset($this->fileContentStatic['###HELPER_SITE_LICENSE_LOCK###'])) + { + $_VDM = '_'.ComponentbuilderHelper::safeString($this->uniquekey(10),'U'); + // add it to the system + $this->fileContentStatic['###HELPER_SITE_LICENSE_LOCK###'] = $this->setHelperLincenseLock($_VDM,'site'); + $this->fileContentStatic['###HELPER_LICENSE_LOCK###'] = $this->setHelperLincenseLock($_VDM,'admin'); + $this->fileContentStatic['###LICENSE_LOCKED_INT###'] = $this->setInitLincenseLock($_VDM); + $this->fileContentStatic['###LICENSE_LOCKED_DEFINED###'] = "\n\n".'defined(\''.$_VDM.'\') or die(JText::_(\'NIE_REG_NIE\'));'; + } } else { @@ -138,17 +141,20 @@ class Interpretation extends Fields /** * @param $view */ - public function setLockLicensePer(&$view) + public function setLockLicensePer(&$view, $target) { if ($this->componentData->add_license && $this->componentData->license_type == 3) { - $boolMethod = 'get'.ComponentbuilderHelper::safeString($this->uniquekey(3, false, 'ddd'), 'W'); - $globalbool = 'set'.ComponentbuilderHelper::safeString($this->uniquekey(3), 'W'); - // add it to the system - $this->fileContentDynamic[$view]['###LICENSE_LOCKED_SET_BOOL###'] = $this->setBoolLincenseLock($boolMethod,$globalbool); - $this->fileContentDynamic[$view]['###LICENSE_LOCKED_CHECK###'] = $this->checkStatmentLicenseLocked($boolMethod); - $this->fileContentDynamic[$view]['###LICENSE_TABLE_LOCKED_CHECK###'] = $this->checkStatmentLicenseLocked($boolMethod, '$table'); - $this->fileContentDynamic[$view]['###BOOLMETHOD###'] = $boolMethod; + if (!isset($this->fileContentDynamic[$view]['###BOOLMETHOD###'])) + { + $boolMethod = 'get'.ComponentbuilderHelper::safeString($this->uniquekey(3, false, 'ddd'), 'W'); + $globalbool = 'set'.ComponentbuilderHelper::safeString($this->uniquekey(3), 'W'); + // add it to the system + $this->fileContentDynamic[$view]['###LICENSE_LOCKED_SET_BOOL###'] = $this->setBoolLincenseLock($boolMethod,$globalbool); + $this->fileContentDynamic[$view]['###LICENSE_LOCKED_CHECK###'] = $this->checkStatmentLicenseLocked($boolMethod); + $this->fileContentDynamic[$view]['###LICENSE_TABLE_LOCKED_CHECK###'] = $this->checkStatmentLicenseLocked($boolMethod, '$table'); + $this->fileContentDynamic[$view]['###BOOLMETHOD###'] = $boolMethod; + } } else { @@ -1333,7 +1339,7 @@ class Interpretation extends Fields { if ($array['decode'] == 'json') { - $if = "\n\t".$tab."\tif (".$this->fileContentStatic['###Component###']."Helper::checkString(".$string."->".$field."))\n\t".$tab."\t{"; + $if = "\n\t".$tab."\tif (".$this->fileContentStatic['###Component###']."Helper::checkJson(".$string."->".$field."))\n\t".$tab."\t{"; // json_decode $decoder = $string."->".$field." = json_decode(".$string."->".$field.", true);"; // TODO Use the type of field to prepare it even more for use in the view @@ -2114,7 +2120,7 @@ class Interpretation extends Fields { $methods .= "\n\n\t\t//".$this->setLine(__LINE__)." Check if \$" . $default['on_field'] . " is an array with values."; $methods .= "\n\t\t\$array = \$" . $default['on_field'] . ";"; - $methods .= "\n\t\tif (isset(\$array) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$array))"; + $methods .= "\n\t\tif (isset(\$array) && ".$this->fileContentStatic['###Component###']."Helper::checkArray(\$array, true))"; $methods .= "\n\t\t{"; $methods .= "\n\t\t\t\$query->where('".$get['join_field']." ".$get['operator']." (' . implode(',', \$array) . ')');"; $methods .= "\n\t\t}"; @@ -2368,13 +2374,16 @@ class Interpretation extends Fields $getItem = ''; $this->siteDecrypt['basic'][$code] = false; $this->siteDecrypt['advanced'][$code] = false; + $Component = $this->fileContentStatic['###Component###']; if (ComponentbuilderHelper::checkObject($get)) { $getItem .= "\n\n\t\t//".$this->setLine(__LINE__)." Convert the parameter fields into objects."; - $getItem .= "\n\t\tforeach (\$items as \$nr => &\$item)"; + $getItem .= "\n\t\tif (".$Component."Helper::checkArray(\$items))"; $getItem .= "\n\t\t{"; - $getItem .= "\n\t\t\t//".$this->setLine(__LINE__)." Always create a slug for sef URL's"; - $getItem .= "\n\t\t\t\$item->slug = (isset(\$item->alias)) ? \$item->id.':'.\$item->alias : \$item->id;"; + $getItem .= "\n\t\t\tforeach (\$items as \$nr => &\$item)"; + $getItem .= "\n\t\t\t{"; + $getItem .= "\n\t\t\t\t//".$this->setLine(__LINE__)." Always create a slug for sef URL's"; + $getItem .= "\n\t\t\t\t\$item->slug = (isset(\$item->alias) && isset(\$item->id)) ? \$item->id.':'.\$item->alias : \$item->id;"; if (isset($get->main_get) && ComponentbuilderHelper::checkArray($get->main_get)) { $asBucket = array(); @@ -2386,7 +2395,7 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkArray($decodeChecker)) { // set decoding of needed fields - $getItem .= $this->setCustomViewFieldDecode($main_get,$decodeChecker,"\$item",$code,"\t"); + $getItem .= $this->setCustomViewFieldDecode($main_get,$decodeChecker,"\$item",$code,"\t\t"); } } // also filter fields if needed @@ -2395,7 +2404,7 @@ class Interpretation extends Fields $decodeFilter = $this->siteFieldDecodeFilter[$this->target][$code][$main_get['key']][$main_get['as']]; if (ComponentbuilderHelper::checkArray($decodeFilter)) { - $getItem .= $this->setCustomViewFieldDecodeFilter($main_get,$decodeFilter,"\$item",'$items[$nr]',$code,"\t"); + $getItem .= $this->setCustomViewFieldDecodeFilter($main_get,$decodeFilter,"\$item",'$items[$nr]',$code,"\t\t"); } } if (isset($this->siteFieldData['uikit'][$code][$main_get['key']][$main_get['as']])) @@ -2404,25 +2413,26 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkArray($uikitChecker)) { // set uikit checkers on needed fields - $getItem .= $this->setCustomViewFieldUikitChecker($main_get,$uikitChecker,"\$item",$code,"\t"); + $getItem .= $this->setCustomViewFieldUikitChecker($main_get,$uikitChecker,"\$item",$code,"\t\t"); } } $asBucket[] = $main_get['as']; } } // setup Globals - $getItem .= $this->setCustomViewGlobals($get->global,'$item',$asBucket,"\t"); + $getItem .= $this->setCustomViewGlobals($get->global,'$item',$asBucket,"\t\t"); // setup the custom gets that returns multipal values - $getItem .= $this->setCustomViewCustomJoin($get->custom_get,"\$item",$code,$asBucket,"\t"); + $getItem .= $this->setCustomViewCustomJoin($get->custom_get,"\$item",$code,$asBucket,"\t\t"); // set calculations if ($get->addcalculation == 1) { $get->php_calculation = (array) explode("\n",$get->php_calculation); if (ComponentbuilderHelper::checkArray($get->php_calculation)) { - $getItem .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),"\n\t\t\t".implode("\n\t\t\t",$get->php_calculation)); + $getItem .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),"\n\t\t\t\t".implode("\n\t\t\t\t",$get->php_calculation)); } } + $getItem .= "\n\t\t\t}"; $getItem .= "\n\t\t}"; // remove empty foreach if (strlen($getItem) <= 100) @@ -2433,7 +2443,6 @@ class Interpretation extends Fields if ($this->siteDecrypt['basic'][$code] || $this->siteDecrypt['advanced'][$code]) { - $Component = $this->fileContentStatic['###Component###']; $script = ''; if ($this->siteDecrypt['basic'][$code]) { @@ -3986,8 +3995,16 @@ class Interpretation extends Fields return ''; } - public function routerParseSwitch(&$view) + public function routerParseSwitch(&$view, $viewArray = null) { + $isCategory = ''; + if ($viewArray && ComponentbuilderHelper::checkArray($viewArray)) + { + if (isset($viewArray['settings']->main_get->db_table_main) && $viewArray['settings']->main_get->db_table_main == 'categories') + { + $isCategory = ', true'; // TODO we will keep an eye on this.... + } + } // add if tags is added, also for all front item views if (1) { @@ -4002,7 +4019,7 @@ class Interpretation extends Fields $routerSwitch[] = "\t\t\t\t}"; $routerSwitch[] = "\t\t\t\telse"; $routerSwitch[] = "\t\t\t\t{"; - $routerSwitch[] = "\t\t\t\t\t\$id = \$this->getVar('".$view."', \$segments[\$count-1], 'alias', 'id');"; + $routerSwitch[] = "\t\t\t\t\t\$id = \$this->getVar('".$view."', \$segments[\$count-1], 'alias', 'id'".$isCategory.");"; $routerSwitch[] = "\t\t\t\t\tif(\$id)"; $routerSwitch[] = "\t\t\t\t\t{"; $routerSwitch[] = "\t\t\t\t\t\t\$vars['id'] = \$id;"; @@ -7382,7 +7399,8 @@ class Interpretation extends Fields $addButton[] = "\t\t\t\$script = array();"; $addButton[] = "\t\t\t\$buttonName = \$this->getAttribute('name');"; $addButton[] = "\t\t\t//".$this->setLine(__LINE__)." get the input from url"; - $addButton[] = "\t\t\t\$jinput = JFactory::getApplication()->input;"; + $addButton[] = "\t\t\t\$app = JFactory::getApplication();"; + $addButton[] = "\t\t\t\$jinput = \$app->input;"; $addButton[] = "\t\t\t//".$this->setLine(__LINE__)." get the view name & id"; $addButton[] = "\t\t\t\$values = \$jinput->getArray(array("; $addButton[] = "\t\t\t\t'id' => 'int',"; @@ -7409,11 +7427,11 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($targetView,$this->permissionBuilder['global'][$core['core.create']])) { - $addButton[] = "\t\t\tif (\$user->authorise('".$core['core.create']."', 'com_".$this->fileContentStatic['###component###']."'))"; + $addButton[] = "\t\t\tif (\$user->authorise('".$core['core.create']."', 'com_".$this->fileContentStatic['###component###']."') && \$app->isAdmin()) // TODO for now only in admin area."; } else { - $addButton[] = "\t\t\tif (\$user->authorise('core.create', 'com_".$this->fileContentStatic['###component###']."'))"; + $addButton[] = "\t\t\tif (\$user->authorise('core.create', 'com_".$this->fileContentStatic['###component###']."') && \$app->isAdmin()) // TODO for now only in admin area."; } $addButton[] = "\t\t\t{"; $addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build Create button"; @@ -7430,11 +7448,11 @@ class Interpretation extends Fields // check if the item has permissions. if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($targetView,$this->permissionBuilder['global'][$core['core.edit']])) { - $addButton[] = "\t\t\tif ((\$buttonName == '".$targetView."' || \$buttonName == '".$targetViews."') && \$user->authorise('".$core['core.edit']."', 'com_".$this->fileContentStatic['###component###']."'))"; + $addButton[] = "\t\t\tif ((\$buttonName == '".$targetView."' || \$buttonName == '".$targetViews."') && \$user->authorise('".$core['core.edit']."', 'com_".$this->fileContentStatic['###component###']."') && \$app->isAdmin()) // TODO for now only in admin area."; } else { - $addButton[] = "\t\t\tif ((\$buttonName == '".$targetView."' || \$buttonName == '".$targetViews."') && \$user->authorise('core.edit', 'com_".$this->fileContentStatic['###component###']."'))"; + $addButton[] = "\t\t\tif ((\$buttonName == '".$targetView."' || \$buttonName == '".$targetViews."') && \$user->authorise('core.edit', 'com_".$this->fileContentStatic['###component###']."') && \$app->isAdmin()) // TODO for now only in admin area."; } $addButton[] = "\t\t\t{"; $addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build edit button"; @@ -9156,7 +9174,7 @@ class Interpretation extends Fields { $allow[] = "\t\t\t\$permission = \$user->authorise('core.edit', 'com_".$component.".".$otherView.".' . (int) \$recordId);"; } - $allow[] = "\t\t\tif (!\$permission && !is_null(\$permission))"; + $allow[] = "\t\t\tif (!\$permission)"; $allow[] = "\t\t\t{"; // check if the item has permissions. if ($coreLoad && isset($core['core.edit.own']) && isset($this->permissionBuilder[$core['core.edit.own']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.edit.own']]) && in_array($otherView,$this->permissionBuilder[$core['core.edit.own']])) @@ -9252,7 +9270,7 @@ class Interpretation extends Fields { $allow[] = "\t\t\t\$permission = \$user->authorise('core.edit', 'com_".$component.".".$viewName_single.".' . (int) \$recordId);"; } - $allow[] = "\t\t\tif (!\$permission && !is_null(\$permission))"; + $allow[] = "\t\t\tif (!\$permission)"; $allow[] = "\t\t\t{"; // check if the item has permissions. if ($coreLoad && isset($core['core.edit.own']) && isset($this->permissionBuilder[$core['core.edit.own']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.edit.own']]) && in_array($viewName_single,$this->permissionBuilder[$core['core.edit.own']])) @@ -11608,6 +11626,7 @@ class Interpretation extends Fields // these can be added anytime really (but looks best after groups $this->setUikitConfigFieldsets($lang); $this->setGooglechartConfigFieldsets($lang); + $this->setEmailHelperConfigFieldsets($lang); $this->setEncryptionConfigFieldsets($lang); // these are the coustom settings $this->setCustomControlConfigFieldsets($lang); @@ -12183,6 +12202,476 @@ for developing fast and powerful web interfaces. For more info visit componentData->add_email_helper) && $this->componentData->add_email_helper) + { + // main lang prefix + $lang = $lang.''; + // set main lang string + $this->langContent[$this->lang][$lang.'_MAIL_CONFIGURATION'] = "Mail Configuration"; + $this->langContent[$this->lang][$lang.'_DKIM'] = "DKIM"; + // start building field set for email helper functions + $this->configFieldSets[] = "\n\tconfigFieldSets[] = "\t\tname=\"mail_configuration_custom_config\""; + $this->configFieldSets[] = "\t\tlabel=\"".$lang."_MAIL_CONFIGURATION\">"; + // add custom Mail Configurations + if (isset($this->configFieldSetsCustomField['Mail Configuration']) && ComponentbuilderHelper::checkArray($this->configFieldSetsCustomField['Mail Configuration'])) + { + $this->configFieldSets[] = implode("\t\t",$this->configFieldSetsCustomField['Mail Configuration']); + unset($this->configFieldSetsCustomField['Mail Configuration']); + } + else + { + // set all the laguage strings + $this->langContent[$this->lang][$lang.'_MAILONLINE_LABEL'] = "Mailer Status"; + $this->langContent[$this->lang][$lang.'_MAILONLINE_DESCRIPTION'] = "Warning this will stop all emails from going out."; + $this->langContent[$this->lang][$lang.'_ON'] = "On"; + $this->langContent[$this->lang][$lang.'_OFF'] = "Off"; + $this->langContent[$this->lang][$lang.'_MAILER_LABEL'] = "Mailer"; + $this->langContent[$this->lang][$lang.'_MAILER_DESCRIPTION'] = "Select what mailer you would like to use to send emails."; + $this->langContent[$this->lang][$lang.'_GLOBAL'] = "Global"; + $this->langContent[$this->lang][$lang.'_PHP_MAIL'] = "PHP Mail"; + $this->langContent[$this->lang][$lang.'_SENDMAIL'] = "Sendmail"; + $this->langContent[$this->lang][$lang.'_SMTP'] = "SMTP"; + $this->langContent[$this->lang][$lang.'_EMAILFROM_LABEL'] = " From Email"; + $this->langContent[$this->lang][$lang.'_EMAILFROM_DESCRIPTION'] = "The global email address that will be used to send system email."; + $this->langContent[$this->lang][$lang.'_EMAILFROM_HINT'] = "Email Address Here"; + $this->langContent[$this->lang][$lang.'_FROMNAME_LABEL'] = "From Name"; + $this->langContent[$this->lang][$lang.'_FROMNAME_DESCRIPTION'] = "Text displayed in the header "From:" field when sending a site email. Usually the site name."; + $this->langContent[$this->lang][$lang.'_FROMNAME_HINT'] = "From Name Here"; + $this->langContent[$this->lang][$lang.'_EMAILREPLY_LABEL'] = " Reply Email"; + $this->langContent[$this->lang][$lang.'_EMAILREPLY_DESCRIPTION'] = "The global email address that will be used to set as the reply email. (leave blank for none)"; + $this->langContent[$this->lang][$lang.'_EMAILREPLY_HINT'] = "Email Address Here"; + $this->langContent[$this->lang][$lang.'_REPLYNAME_LABEL'] = "Reply Name"; + $this->langContent[$this->lang][$lang.'_REPLYNAME_DESCRIPTION'] = "Text displayed in the header "Reply To:" field when replying to the site email. Usually the the person that receives the response. (leave blank for none)"; + $this->langContent[$this->lang][$lang.'_REPLYNAME_HINT'] = "Reply Name Here"; + $this->langContent[$this->lang][$lang.'_SENDMAIL_LABEL'] = "Sendmail Path"; + $this->langContent[$this->lang][$lang.'_SENDMAIL_DESCRIPTION'] = "Enter the path to the sendmail program directory on your host server."; + $this->langContent[$this->lang][$lang.'_SENDMAIL_HINT'] = "/usr/sbin/sendmail"; + $this->langContent[$this->lang][$lang.'_SMTPAUTH_LABEL'] = "SMTP Authentication"; + $this->langContent[$this->lang][$lang.'_SMTPAUTH_DESCRIPTION'] = "Select yes if your SMTP host requires SMTP Authentication."; + $this->langContent[$this->lang][$lang.'_YES'] = "Yes"; + $this->langContent[$this->lang][$lang.'_NO'] = "No"; + $this->langContent[$this->lang][$lang.'_SMTPSECURE_LABEL'] = "SMTP Security"; + $this->langContent[$this->lang][$lang.'_SMTPSECURE_DESCRIPTION'] = "Select the security model that your SMTP server uses."; + $this->langContent[$this->lang][$lang.'_NONE'] = "None"; + $this->langContent[$this->lang][$lang.'_SSL'] = "SSL"; + $this->langContent[$this->lang][$lang.'_TLS'] = "TLS"; + $this->langContent[$this->lang][$lang.'_SMTPPORT_LABEL'] = "SMTP Port"; + $this->langContent[$this->lang][$lang.'_SMTPPORT_DESCRIPTION'] = "Enter the port number of your SMTP server. Use 25 for most unsecured servers and 465 for most secure servers."; + $this->langContent[$this->lang][$lang.'_SMTPPORT_HINT'] = "25"; + $this->langContent[$this->lang][$lang.'_SMTPUSER_LABEL'] = "SMTP Username"; + $this->langContent[$this->lang][$lang.'_SMTPUSER_DESCRIPTION'] = "Enter the username for access to the SMTP host."; + $this->langContent[$this->lang][$lang.'_SMTPUSER_HINT'] = "email@demo.com"; + $this->langContent[$this->lang][$lang.'_SMTPPASS_LABEL'] = "SMTP Password"; + $this->langContent[$this->lang][$lang.'_SMTPPASS_DESCRIPTION'] = "Enter the password for access to the SMTP host."; + $this->langContent[$this->lang][$lang.'_SMTPHOST_LABEL'] = "SMTP Host"; + $this->langContent[$this->lang][$lang.'_SMTPHOST_DESCRIPTION'] = "Enter the name of the SMTP host."; + $this->langContent[$this->lang][$lang.'_SMTPHOST_HINT'] = "localhost"; + + // set the mailer fields + $this->configFieldSets[] = "\n\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"radio\""; + $this->configFieldSets[] = "\t\t\tname=\"mailonline\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_MAILONLINE_LABEL\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_MAILONLINE_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"btn-group btn-group-yesno\""; + $this->configFieldSets[] = "\t\t\tdefault=\"1\">"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"list\""; + $this->configFieldSets[] = "\t\t\tname=\"mailer\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_MAILER_LABEL\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_MAILER_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"list_class\""; + $this->configFieldSets[] = "\t\t\tmultiple=\"false\""; + $this->configFieldSets[] = "\t\t\tfilter=\"WORD\""; + $this->configFieldSets[] = "\t\t\trequired=\"true\""; + $this->configFieldSets[] = "\t\t\tdefault=\"global\">"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"emailfrom\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_EMAILFROM_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_EMAILFROM_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"STRING\""; + $this->configFieldSets[] = "\t\t\tvalidate=\"email\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add email address here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_EMAILFROM_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp,sendmail,default\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"fromname\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_FROMNAME_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_FROMNAME_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"STRING\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add some name here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_FROMNAME_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp,sendmail,default\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"emailreply\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_EMAILREPLY_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_EMAILREPLY_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"STRING\""; + $this->configFieldSets[] = "\t\t\tvalidate=\"email\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add email address here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_EMAILREPLY_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp,sendmail,default\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"replyname\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_REPLYNAME_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_REPLYNAME_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"STRING\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add some name here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_REPLYNAME_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp,sendmail,default\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"sendmail\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_SENDMAIL_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_SENDMAIL_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\trequired=\"false\""; + $this->configFieldSets[] = "\t\t\tfilter=\"PATH\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add path to you local sendmail here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_SENDMAIL_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"mailer:sendmail\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"radio\""; + $this->configFieldSets[] = "\t\t\tname=\"smtpauth\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_SMTPAUTH_LABEL\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_SMTPAUTH_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"btn-group btn-group-yesno\""; + $this->configFieldSets[] = "\t\t\tdefault=\"0\""; + $this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp\">"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"list\""; + $this->configFieldSets[] = "\t\t\tname=\"smtpsecure\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_SMTPSECURE_LABEL\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_SMTPSECURE_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"list_class\""; + $this->configFieldSets[] = "\t\t\tmultiple=\"false\""; + $this->configFieldSets[] = "\t\t\tfilter=\"WORD\""; + $this->configFieldSets[] = "\t\t\tdefault=\"none\""; + $this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp\">"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"smtpport\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_SMTPPORT_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdefault=\"25\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_SMTPPORT_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"INT\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add the port number of your SMTP server here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_SMTPPORT_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"smtpuser\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_SMTPUSER_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_SMTPUSER_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"STRING\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add the username for SMTP server here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_SMTPUSER_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"password\""; + $this->configFieldSets[] = "\t\t\tname=\"smtppass\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_SMTPPASS_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_SMTPPASS_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"raw\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add the password for SMTP server here.\""; + $this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"smtphost\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_SMTPHOST_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdefault=\"localhost\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_SMTPHOST_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"STRING\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add the name of the SMTP host here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_SMTPHOST_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp\""; + $this->configFieldSets[] = "\t\t/>"; + } + // close that fieldset + $this->configFieldSets[] = "\t"; + + // start dkim field set + $this->configFieldSets[] = "\tconfigFieldSets[] = "\t\tname=\"dkim_custom_config\""; + $this->configFieldSets[] = "\t\tlabel=\"".$lang."_DKIM\">"; + // add custom DKIM fields + if (isset($this->configFieldSetsCustomField['DKIM']) && ComponentbuilderHelper::checkArray($this->configFieldSetsCustomField['DKIM'])) + { + $this->configFieldSets[] = implode("\t\t",$this->configFieldSetsCustomField['DKIM']); + unset($this->configFieldSetsCustomField['DKIM']); + } + else + { + $this->langContent[$this->lang][$lang.'_DKIM_LABEL'] = "Enable DKIM"; + $this->langContent[$this->lang][$lang.'_DKIM_DESCRIPTION'] = "Set this option to Yes if you want to sign your emails using DKIM."; + $this->langContent[$this->lang][$lang.'_YES'] = "Yes"; + $this->langContent[$this->lang][$lang.'_NO'] = "No"; + $this->langContent[$this->lang][$lang.'_DKIM_DOMAIN_LABEL'] = "Domain"; + $this->langContent[$this->lang][$lang.'_DKIM_DOMAIN_DESCRIPTION'] = "Set the domain. Eg. domain.com"; + $this->langContent[$this->lang][$lang.'_DKIM_DOMAIN_HINT'] = "domain.com"; + $this->langContent[$this->lang][$lang.'_DKIM_SELECTOR_LABEL'] = "Selector"; + $this->langContent[$this->lang][$lang.'_DKIM_SELECTOR_DESCRIPTION'] = "Set your DKIM/DNS selector."; + $this->langContent[$this->lang][$lang.'_DKIM_SELECTOR_HINT'] = "vdm"; + $this->langContent[$this->lang][$lang.'_DKIM_PASSPHRASE_LABEL'] = "Passphrase"; + $this->langContent[$this->lang][$lang.'_DKIM_PASSPHRASE_DESCRIPTION'] = "Enter your passphrase here."; + $this->langContent[$this->lang][$lang.'_DKIM_IDENTITY_LABEL'] = "Identity"; + $this->langContent[$this->lang][$lang.'_DKIM_IDENTITY_DESCRIPTION'] = "Set DKIM identity. This can be in the format of an email address 'you@yourdomain.com' typically used as the source of the email."; + $this->langContent[$this->lang][$lang.'_DKIM_IDENTITY_HINT'] = "you@yourdomain.com"; + $this->langContent[$this->lang][$lang.'_DKIM_PRIVATE_KEY_LABEL'] = "Private key"; + $this->langContent[$this->lang][$lang.'_DKIM_PRIVATE_KEY_DESCRIPTION'] = "set private key"; + $this->langContent[$this->lang][$lang.'_DKIM_PUBLIC_KEY_LABEL'] = "Public key"; + $this->langContent[$this->lang][$lang.'_DKIM_PUBLIC_KEY_DESCRIPTION'] = "set public key"; + $this->langContent[$this->lang][$lang.'_NOTE_DKIM_USE_LABEL'] = "Server Configuration"; + $this->langContent[$this->lang][$lang.'_NOTE_DKIM_USE_DESCRIPTION'] = "

Using the below details, you need to configure your DNS by adding a TXT record on your domain:

+"; + $this->langContent[$this->lang][$lang.'_DKIM_KEY_LABEL'] = "Key"; + $this->langContent[$this->lang][$lang.'_DKIM_KEY_DESCRIPTION'] = "This is the KEY to use in the DNS record."; + $this->langContent[$this->lang][$lang.'_DKIM_KEY_HINT'] = "vdm._domainkey"; + $this->langContent[$this->lang][$lang.'_DKIM_VALUE_LABEL'] = "Value"; + $this->langContent[$this->lang][$lang.'_DKIM_VALUE_DESCRIPTION'] = "This is the TXT value to use in the DNS. Replace the PUBLICKEY with your public key."; + $this->langContent[$this->lang][$lang.'_DKIM_VALUE_HINT'] = "v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY"; + + + $this->configFieldSets[] = "\n\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"radio\""; + $this->configFieldSets[] = "\t\t\tname=\"dkim\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_DKIM_LABEL\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_DKIM_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"btn-group btn-group-yesno\""; + $this->configFieldSets[] = "\t\t\tdefault=\"0\""; + $this->configFieldSets[] = "\t\t\trequired=\"true\">"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t"; + $this->configFieldSets[] = "\t\t\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"dkim_domain\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_DKIM_DOMAIN_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_DKIM_DOMAIN_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"STRING\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add DKIM Domain here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_DKIM_DOMAIN_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"dkim:1\""; + $this->configFieldSets[] = "\t\t\tonchange=\"vdm_dkim();\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"dkim_selector\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_DKIM_SELECTOR_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdefault=\"vdm\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_DKIM_SELECTOR_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"STRING\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add DKIM/DNS selector here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_DKIM_SELECTOR_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"dkim:1\""; + $this->configFieldSets[] = "\t\t\tonchange=\"vdm_dkim();\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"password\""; + $this->configFieldSets[] = "\t\t\tname=\"dkim_passphrase\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_DKIM_PASSPHRASE_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_DKIM_PASSPHRASE_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"raw\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add passphrase here.\""; + $this->configFieldSets[] = "\t\t\tshowon=\"dkim:1\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"dkim_identity\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_DKIM_IDENTITY_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"60\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_DKIM_IDENTITY_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"raw\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add DKIM Identity here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_DKIM_IDENTITY_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"dkim:1\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"textarea\""; + $this->configFieldSets[] = "\t\t\tname=\"dkim_private_key\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_DKIM_PRIVATE_KEY_LABEL\""; + $this->configFieldSets[] = "\t\t\trows=\"15\""; + $this->configFieldSets[] = "\t\t\tcols=\"5\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_DKIM_PRIVATE_KEY_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"input-xxlarge span12\""; + $this->configFieldSets[] = "\t\t\tshowon=\"dkim:1\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"textarea\""; + $this->configFieldSets[] = "\t\t\tname=\"dkim_public_key\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_DKIM_PUBLIC_KEY_LABEL\""; + $this->configFieldSets[] = "\t\t\trows=\"5\""; + $this->configFieldSets[] = "\t\t\tcols=\"5\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_DKIM_PUBLIC_KEY_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"input-xxlarge span12\""; + $this->configFieldSets[] = "\t\t\tshowon=\"dkim:1\""; + $this->configFieldSets[] = "\t\t\tonchange=\"vdm_dkim();\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\t\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"dkim_key\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_DKIM_KEY_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"40\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"150\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_DKIM_KEY_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"STRING\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add KEY here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_DKIM_KEY_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"dkim:1\""; + $this->configFieldSets[] = "\t\t/>\t\t"; + $this->configFieldSets[] = "\t\t"; + $this->configFieldSets[] = "\t\tconfigFieldSets[] = "\t\t\ttype=\"text\""; + $this->configFieldSets[] = "\t\t\tname=\"dkim_value\""; + $this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_DKIM_VALUE_LABEL\""; + $this->configFieldSets[] = "\t\t\tsize=\"80\""; + $this->configFieldSets[] = "\t\t\tmaxlength=\"350\""; + $this->configFieldSets[] = "\t\t\tdescription=\"".$lang."_DKIM_VALUE_DESCRIPTION\""; + $this->configFieldSets[] = "\t\t\tclass=\"text_area\""; + $this->configFieldSets[] = "\t\t\tfilter=\"STRING\""; + $this->configFieldSets[] = "\t\t\tmessage=\"Error! Please add TXT record here.\""; + $this->configFieldSets[] = "\t\t\thint=\"".$lang."_DKIM_VALUE_HINT\""; + $this->configFieldSets[] = "\t\t\tshowon=\"dkim:1\""; + $this->configFieldSets[] = "\t\t/>"; + } + // close that fieldset + $this->configFieldSets[] = "\t"; + } + + } + public function setGooglechartConfigFieldsets($lang) { if ($this->googlechart) diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index 9eee7668b..85fd131de 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -252,8 +252,8 @@ class Infusion extends Interpretation $this->placeholders['###View###'] = $viewName_f; // set license per view if needed - $this->setLockLicensePer($viewName_single); - $this->setLockLicensePer($viewName_list); + $this->setLockLicensePer($viewName_single, $this->target); + $this->setLockLicensePer($viewName_list, $this->target); // ###FIELDSETS### <<>> $this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] = $this->setFieldSet($view, $this->fileContentStatic['###component###']); @@ -610,7 +610,7 @@ class Infusion extends Interpretation $this->placeholders['[[[SVIEWS]]]'] = $view['settings']->CODE; // set license per view if needed - $this->setLockLicensePer($view['settings']->code); + $this->setLockLicensePer($view['settings']->code, $this->target); if ($view['settings']->main_get->gettype == 1) { @@ -857,7 +857,7 @@ class Infusion extends Interpretation $this->placeholders['[[[SVIEWS]]]'] = $view['settings']->CODE; // set license per view if needed - $this->setLockLicensePer($view['settings']->code); + $this->setLockLicensePer($view['settings']->code, $this->target); // set the site default view if ($view['default_view'] == 1) @@ -874,7 +874,7 @@ class Infusion extends Interpretation // insure the needed route helper is loaded $this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($view['settings']->code,$view['settings']->code, true); // build route details - $this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($view['settings']->code); + $this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($view['settings']->code, $view); $this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($view['settings']->code); if ($view['settings']->main_get->gettype == 1) diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 49d884149..e3e47e2a9 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php - @author Llewellyn van der Merwe + @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 @@ -854,7 +854,7 @@ abstract class ComponentbuilderHelper { // The record has been set. Check the record permissions. $permission = $user->authorise($action->name, 'com_componentbuilder.'.$view.'.' . (int) $record->id); - if (!$permission && !is_null($permission)) + if (!$permission) // TODO removed && !is_null($permission) { if ($action->name == 'core.edit' || $action->name == $view.'.edit') { @@ -1189,10 +1189,22 @@ abstract class ComponentbuilderHelper return false; } - public static function checkArray($array) + public static function checkArray($array, $removeEmptyString = false) { if (isset($array) && is_array($array) && count($array) > 0) { + // also make sure the empty strings are removed + if ($removeEmptyString) + { + foreach ($array as $key => $string) + { + if (empty($string)) + { + unset($array[$key]); + } + } + return self::checkArray($array, false); + } return true; } return false; diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 7bb23ce82..2c2fef4de 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage batch_.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 2d3a8b3d7..44541c136 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage indenter.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/helpers/js.php b/admin/helpers/js.php index 987d87980..aa7dd6a37 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage js.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 90ea4f6e7..c55357890 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage minify.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 7eca856c2..eb9c6b3f4 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -1087,7 +1087,7 @@ COM_COMPONENTBUILDER_COMPONENT_NOTE_README_DESCRIPTION="
input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create - if ($user->authorise('core.create', 'com_componentbuilder')) + if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList '; } // only add if user allowed to edit - if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_componentbuilder')) + if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 2cfce64d8..931916ef1 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldAdminviews extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldAdminviews extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create admin_view - if ($user->authorise('core.create', 'com_componentbuilder')) + if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldAdminviews extends JFormFieldList '; } // only add if user allowed to edit admin_view - if (($buttonName == 'admin_view' || $buttonName == 'admin_views') && $user->authorise('core.edit', 'com_componentbuilder')) + if (($buttonName == 'admin_view' || $buttonName == 'admin_views') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 2ce008f29..65a2ce101 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage articles.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldArticles extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldArticles extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create article - if ($user->authorise('core.create', 'com_componentbuilder')) + if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldArticles extends JFormFieldList '; } // only add if user allowed to edit article - if (($buttonName == 'article' || $buttonName == 'articles') && $user->authorise('core.edit', 'com_componentbuilder')) + if (($buttonName == 'article' || $buttonName == 'articles') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 358acc0d1..93c51aac1 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldCustomadminviews extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldCustomadminviews extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create custom_admin_view - if ($user->authorise('core.create', 'com_componentbuilder')) + if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldCustomadminviews extends JFormFieldList '; } // only add if user allowed to edit custom_admin_view - if (($buttonName == 'custom_admin_view' || $buttonName == 'custom_admin_views') && $user->authorise('core.edit', 'com_componentbuilder')) + if (($buttonName == 'custom_admin_view' || $buttonName == 'custom_admin_views') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index a9252c3a1..ba4cb24b8 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldCustomfilelist extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldCustomfilelist extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create - if ($user->authorise('core.create', 'com_componentbuilder')) + if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldCustomfilelist extends JFormFieldList '; } // only add if user allowed to edit - if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_componentbuilder')) + if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 12edaacab..35f58d685 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldCustomfolderlist extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldCustomfolderlist extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create - if ($user->authorise('core.create', 'com_componentbuilder')) + if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldCustomfolderlist extends JFormFieldList '; } // only add if user allowed to edit - if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_componentbuilder')) + if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index 7f6339961..5cbcc4ad4 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage customgets.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldCustomgets extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldCustomgets extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create dynamic_get - if ($user->authorise('dynamic_get.create', 'com_componentbuilder')) + if ($user->authorise('dynamic_get.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldCustomgets extends JFormFieldList '; } // only add if user allowed to edit dynamic_get - if (($buttonName == 'dynamic_get' || $buttonName == 'dynamic_gets') && $user->authorise('dynamic_get.edit', 'com_componentbuilder')) + if (($buttonName == 'dynamic_get' || $buttonName == 'dynamic_gets') && $user->authorise('dynamic_get.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index 22110df83..dba98401c 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldDbtables extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldDbtables extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create - if ($user->authorise('core.create', 'com_componentbuilder')) + if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldDbtables extends JFormFieldList '; } // only add if user allowed to edit - if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_componentbuilder')) + if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 64cc40863..04e1fb6d8 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldDynamicgets extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldDynamicgets extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create dynamic_get - if ($user->authorise('dynamic_get.create', 'com_componentbuilder')) + if ($user->authorise('dynamic_get.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldDynamicgets extends JFormFieldList '; } // only add if user allowed to edit dynamic_get - if (($buttonName == 'dynamic_get' || $buttonName == 'dynamic_gets') && $user->authorise('dynamic_get.edit', 'com_componentbuilder')) + if (($buttonName == 'dynamic_get' || $buttonName == 'dynamic_gets') && $user->authorise('dynamic_get.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 42cd06e64..4bedbe2d4 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldFields extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldFields extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create field - if ($user->authorise('field.create', 'com_componentbuilder')) + if ($user->authorise('field.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldFields extends JFormFieldList '; } // only add if user allowed to edit field - if (($buttonName == 'field' || $buttonName == 'fields') && $user->authorise('field.edit', 'com_componentbuilder')) + if (($buttonName == 'field' || $buttonName == 'fields') && $user->authorise('field.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index 0eb9a5ca8..95b5f437e 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldFieldsmulti extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldFieldsmulti extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create field - if ($user->authorise('field.create', 'com_componentbuilder')) + if ($user->authorise('field.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldFieldsmulti extends JFormFieldList '; } // only add if user allowed to edit field - if (($buttonName == 'field' || $buttonName == 'fields') && $user->authorise('field.edit', 'com_componentbuilder')) + if (($buttonName == 'field' || $buttonName == 'fields') && $user->authorise('field.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 6875f8761..87ece3130 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldFieldtypes extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldFieldtypes extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create fieldtype - if ($user->authorise('fieldtype.create', 'com_componentbuilder')) + if ($user->authorise('fieldtype.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldFieldtypes extends JFormFieldList '; } // only add if user allowed to edit fieldtype - if (($buttonName == 'fieldtype' || $buttonName == 'fieldtypes') && $user->authorise('fieldtype.edit', 'com_componentbuilder')) + if (($buttonName == 'fieldtype' || $buttonName == 'fieldtypes') && $user->authorise('fieldtype.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index bbc6fefb5..be9bac2f8 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage maingets.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldMaingets extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldMaingets extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create dynamic_get - if ($user->authorise('dynamic_get.create', 'com_componentbuilder')) + if ($user->authorise('dynamic_get.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldMaingets extends JFormFieldList '; } // only add if user allowed to edit dynamic_get - if (($buttonName == 'dynamic_get' || $buttonName == 'dynamic_gets') && $user->authorise('dynamic_get.edit', 'com_componentbuilder')) + if (($buttonName == 'dynamic_get' || $buttonName == 'dynamic_gets') && $user->authorise('dynamic_get.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 7f85c0c92..8bab66122 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldSiteviewfolderlist extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldSiteviewfolderlist extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create - if ($user->authorise('core.create', 'com_componentbuilder')) + if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldSiteviewfolderlist extends JFormFieldList '; } // only add if user allowed to edit - if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_componentbuilder')) + if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index 9280c5a08..ba928c3cb 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldSiteviews extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldSiteviews extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create site_view - if ($user->authorise('core.create', 'com_componentbuilder')) + if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldSiteviews extends JFormFieldList '; } // only add if user allowed to edit site_view - if (($buttonName == 'site_view' || $buttonName == 'site_views') && $user->authorise('core.edit', 'com_componentbuilder')) + if (($buttonName == 'site_view' || $buttonName == 'site_views') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index a514bcec8..5dc68a30f 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php - @author Llewellyn van der Merwe + @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 @@ -61,7 +61,8 @@ class JFormFieldSnippets extends JFormFieldList $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ class JFormFieldSnippets extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create snippet - if ($user->authorise('core.create', 'com_componentbuilder')) + if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ class JFormFieldSnippets extends JFormFieldList '; } // only add if user allowed to edit snippet - if (($buttonName == 'snippet' || $buttonName == 'snippets') && $user->authorise('core.edit', 'com_componentbuilder')) + if (($buttonName == 'snippet' || $buttonName == 'snippets') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index c1a3bdefb..9e22dfc7d 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php index 9cf40b760..3fab54bab 100644 --- a/admin/models/fieldtypes.php +++ b/admin/models/fieldtypes.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 00b1cea40..c017fb2e2 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/forms/component.js b/admin/models/forms/component.js index 039ef79f1..c18fdcab6 100644 --- a/admin/models/forms/component.js +++ b/admin/models/forms/component.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js index 9b0f3fd6b..a871a6763 100644 --- a/admin/models/forms/custom_admin_view.js +++ b/admin/models/forms/custom_admin_view.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js index a94852e5e..29e88fb36 100644 --- a/admin/models/forms/dynamic_get.js +++ b/admin/models/forms/dynamic_get.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js index 68c5fd9ea..143befe03 100644 --- a/admin/models/forms/field.js +++ b/admin/models/forms/field.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js index 086c47987..e53895c64 100644 --- a/admin/models/forms/fieldtype.js +++ b/admin/models/forms/fieldtype.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index dddfbe06f..7649ad87b 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js index 8d6fa22ce..74abcaee5 100644 --- a/admin/models/forms/layout.js +++ b/admin/models/forms/layout.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js index 4e1108971..6cb9abdd6 100644 --- a/admin/models/forms/site_view.js +++ b/admin/models/forms/site_view.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/forms/snippet.js b/admin/models/forms/snippet.js index ca25c78cb..90ec58f8c 100644 --- a/admin/models/forms/snippet.js +++ b/admin/models/forms/snippet.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/forms/template.js b/admin/models/forms/template.js index 71f15667b..9d6832f1c 100644 --- a/admin/models/forms/template.js +++ b/admin/models/forms/template.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 10633ac19..470326699 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index fe3927d1e..adf302d08 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/import.php b/admin/models/import.php index 7d11b95bf..61da24cab 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage import.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/layout.php b/admin/models/layout.php index 022070c66..2522bbfcb 100644 --- a/admin/models/layout.php +++ b/admin/models/layout.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/layouts.php b/admin/models/layouts.php index ebd6072f8..f76d7f6b8 100644 --- a/admin/models/layouts.php +++ b/admin/models/layouts.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage layouts.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/site_view.php b/admin/models/site_view.php index 4d7663c8b..cdbc3a0b0 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/site_views.php b/admin/models/site_views.php index 9cbcbd184..9dd6f4169 100644 --- a/admin/models/site_views.php +++ b/admin/models/site_views.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/snippet.php b/admin/models/snippet.php index f27ec0d3a..d043ce5ec 100644 --- a/admin/models/snippet.php +++ b/admin/models/snippet.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/snippets.php b/admin/models/snippets.php index 6d4fbdd07..0f200a16f 100644 --- a/admin/models/snippets.php +++ b/admin/models/snippets.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/template.php b/admin/models/template.php index 7b155e393..25454945b 100644 --- a/admin/models/template.php +++ b/admin/models/template.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/models/templates.php b/admin/models/templates.php index 9464177f8..a56f568d2 100644 --- a/admin/models/templates.php +++ b/admin/models/templates.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/sql/updates/mysql/2.2.4.sql b/admin/sql/updates/mysql/2.2.4.sql new file mode 100644 index 000000000..d3f5a12fa --- /dev/null +++ b/admin/sql/updates/mysql/2.2.4.sql @@ -0,0 +1 @@ + diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index 5e77b88f2..76100a572 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/tables/component.php b/admin/tables/component.php index b21849bca..f2a5494d2 100644 --- a/admin/tables/component.php +++ b/admin/tables/component.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/tables/custom_admin_view.php b/admin/tables/custom_admin_view.php index f2b8ba692..b783b6a46 100644 --- a/admin/tables/custom_admin_view.php +++ b/admin/tables/custom_admin_view.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/tables/dynamic_get.php b/admin/tables/dynamic_get.php index 1d90fe92f..7e6968a3f 100644 --- a/admin/tables/dynamic_get.php +++ b/admin/tables/dynamic_get.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/tables/field.php b/admin/tables/field.php index 8fc3e4082..a5de6cb3a 100644 --- a/admin/tables/field.php +++ b/admin/tables/field.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/tables/fieldtype.php b/admin/tables/fieldtype.php index 5c87625bb..468a113ec 100644 --- a/admin/tables/fieldtype.php +++ b/admin/tables/fieldtype.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 36c999cd9..052d1c254 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/tables/layout.php b/admin/tables/layout.php index d08d346c6..53fd44d25 100644 --- a/admin/tables/layout.php +++ b/admin/tables/layout.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/tables/site_view.php b/admin/tables/site_view.php index e3a01c6ba..f8bdab73c 100644 --- a/admin/tables/site_view.php +++ b/admin/tables/site_view.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/tables/snippet.php b/admin/tables/snippet.php index b4d88a07b..260714b00 100644 --- a/admin/tables/snippet.php +++ b/admin/tables/snippet.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/tables/template.php b/admin/tables/template.php index 97e50fcdf..fa414fd7d 100644 --- a/admin/tables/template.php +++ b/admin/tables/template.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index d1e8629eb..388ac7ac7 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index c28de10ab..b0a35da0e 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index b87e34533..8930b5ee6 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 1e69e08e8..5a98868fd 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index 01b1a9fc1..c1d7eb40e 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index c2a3c0385..180c91c13 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index df235737c..e6dd91bbc 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index ba1b3ba28..e0639955a 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index 77454c2e0..d6692da50 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index c63bbd4e5..6c1d315d4 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 5b5326f5a..6467c25e4 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php index 61276db7b..02c5c69c2 100644 --- a/admin/views/compiler/tmpl/default.php +++ b/admin/views/compiler/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index 01f50c133..cf585a08c 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/component/submitbutton.js b/admin/views/component/submitbutton.js index 83e00c95e..e7bb737d2 100644 --- a/admin/views/component/submitbutton.js +++ b/admin/views/component/submitbutton.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/component/tmpl/edit.php b/admin/views/component/tmpl/edit.php index 185bb4cc0..fbd746bcf 100644 --- a/admin/views/component/tmpl/edit.php +++ b/admin/views/component/tmpl/edit.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/component/view.html.php b/admin/views/component/view.html.php index b10658d61..a5999ca78 100644 --- a/admin/views/component/view.html.php +++ b/admin/views/component/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index bdfe22f26..9a4bf9c32 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/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 78b3394c7..aaae58c80 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,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_closed_issues_the_closed_issues_on_github.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index c4845b8fd..7ff3f6fcc 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_main.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/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 6b2d0ade3..f3434c3fa 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,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_open_issues_the_open_issues_on_github.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index f29d2be17..b2e0283a5 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index ac757e363..54f8b6cdd 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,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index 383a925d2..588916491 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 4147a404a..28a7edc99 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/components/tmpl/default.php b/admin/views/components/tmpl/default.php index 4b72bf132..4936017ec 100644 --- a/admin/views/components/tmpl/default.php +++ b/admin/views/components/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/components/tmpl/default_batch_body.php b/admin/views/components/tmpl/default_batch_body.php index 6fe4ff695..85d0236f1 100644 --- a/admin/views/components/tmpl/default_batch_body.php +++ b/admin/views/components/tmpl/default_batch_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/components/tmpl/default_batch_footer.php b/admin/views/components/tmpl/default_batch_footer.php index 362ea2371..0ea580385 100644 --- a/admin/views/components/tmpl/default_batch_footer.php +++ b/admin/views/components/tmpl/default_batch_footer.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/components/tmpl/default_body.php b/admin/views/components/tmpl/default_body.php index dee168a94..22c64b27b 100644 --- a/admin/views/components/tmpl/default_body.php +++ b/admin/views/components/tmpl/default_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/components/tmpl/default_foot.php b/admin/views/components/tmpl/default_foot.php index 514eddd76..ea50f8fdf 100644 --- a/admin/views/components/tmpl/default_foot.php +++ b/admin/views/components/tmpl/default_foot.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/components/tmpl/default_head.php b/admin/views/components/tmpl/default_head.php index 15ce5aa15..d9e01b890 100644 --- a/admin/views/components/tmpl/default_head.php +++ b/admin/views/components/tmpl/default_head.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/components/tmpl/default_toolbar.php b/admin/views/components/tmpl/default_toolbar.php index 25ef6c750..f530f2d43 100644 --- a/admin/views/components/tmpl/default_toolbar.php +++ b/admin/views/components/tmpl/default_toolbar.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/components/view.html.php b/admin/views/components/view.html.php index 41153d1a8..933cf1c39 100644 --- a/admin/views/components/view.html.php +++ b/admin/views/components/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/custom_admin_view/submitbutton.js b/admin/views/custom_admin_view/submitbutton.js index 6486a5ec6..bd437e85b 100644 --- a/admin/views/custom_admin_view/submitbutton.js +++ b/admin/views/custom_admin_view/submitbutton.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php index ad80a3bd3..4e7e040ba 100644 --- a/admin/views/custom_admin_view/tmpl/edit.php +++ b/admin/views/custom_admin_view/tmpl/edit.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index a36113903..23c81f82d 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/custom_admin_views/tmpl/default.php b/admin/views/custom_admin_views/tmpl/default.php index 18ec13b6c..8e40c8a73 100644 --- a/admin/views/custom_admin_views/tmpl/default.php +++ b/admin/views/custom_admin_views/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/custom_admin_views/tmpl/default_batch_body.php b/admin/views/custom_admin_views/tmpl/default_batch_body.php index ee7371f60..471977cf0 100644 --- a/admin/views/custom_admin_views/tmpl/default_batch_body.php +++ b/admin/views/custom_admin_views/tmpl/default_batch_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/custom_admin_views/tmpl/default_batch_footer.php b/admin/views/custom_admin_views/tmpl/default_batch_footer.php index 1a76b20af..db833188e 100644 --- a/admin/views/custom_admin_views/tmpl/default_batch_footer.php +++ b/admin/views/custom_admin_views/tmpl/default_batch_footer.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/custom_admin_views/tmpl/default_body.php b/admin/views/custom_admin_views/tmpl/default_body.php index 11ce91aec..c60ffb7cf 100644 --- a/admin/views/custom_admin_views/tmpl/default_body.php +++ b/admin/views/custom_admin_views/tmpl/default_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/custom_admin_views/tmpl/default_foot.php b/admin/views/custom_admin_views/tmpl/default_foot.php index dbe1d6b22..ea7543b05 100644 --- a/admin/views/custom_admin_views/tmpl/default_foot.php +++ b/admin/views/custom_admin_views/tmpl/default_foot.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/custom_admin_views/tmpl/default_head.php b/admin/views/custom_admin_views/tmpl/default_head.php index 612e133cc..ad16ed570 100644 --- a/admin/views/custom_admin_views/tmpl/default_head.php +++ b/admin/views/custom_admin_views/tmpl/default_head.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/custom_admin_views/tmpl/default_toolbar.php b/admin/views/custom_admin_views/tmpl/default_toolbar.php index 05509590e..5ea7f4ce9 100644 --- a/admin/views/custom_admin_views/tmpl/default_toolbar.php +++ b/admin/views/custom_admin_views/tmpl/default_toolbar.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index 5aee9ad13..3e00a18c8 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/dynamic_get/submitbutton.js b/admin/views/dynamic_get/submitbutton.js index c5dc47343..b3cd6652b 100644 --- a/admin/views/dynamic_get/submitbutton.js +++ b/admin/views/dynamic_get/submitbutton.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/dynamic_get/tmpl/edit.php b/admin/views/dynamic_get/tmpl/edit.php index 18bd69c7a..f2c81181b 100644 --- a/admin/views/dynamic_get/tmpl/edit.php +++ b/admin/views/dynamic_get/tmpl/edit.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php index 6730458e7..b37100e6b 100644 --- a/admin/views/dynamic_get/view.html.php +++ b/admin/views/dynamic_get/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/dynamic_gets/tmpl/default.php b/admin/views/dynamic_gets/tmpl/default.php index 04a1158dc..fe4f532cc 100644 --- a/admin/views/dynamic_gets/tmpl/default.php +++ b/admin/views/dynamic_gets/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/dynamic_gets/tmpl/default_batch_body.php b/admin/views/dynamic_gets/tmpl/default_batch_body.php index 547a142d2..b751abe24 100644 --- a/admin/views/dynamic_gets/tmpl/default_batch_body.php +++ b/admin/views/dynamic_gets/tmpl/default_batch_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/dynamic_gets/tmpl/default_batch_footer.php b/admin/views/dynamic_gets/tmpl/default_batch_footer.php index df6b4023b..ac38c0f8a 100644 --- a/admin/views/dynamic_gets/tmpl/default_batch_footer.php +++ b/admin/views/dynamic_gets/tmpl/default_batch_footer.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/dynamic_gets/tmpl/default_body.php b/admin/views/dynamic_gets/tmpl/default_body.php index 69815f2ed..b3ef13e03 100644 --- a/admin/views/dynamic_gets/tmpl/default_body.php +++ b/admin/views/dynamic_gets/tmpl/default_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/dynamic_gets/tmpl/default_foot.php b/admin/views/dynamic_gets/tmpl/default_foot.php index aab669efd..366edac29 100644 --- a/admin/views/dynamic_gets/tmpl/default_foot.php +++ b/admin/views/dynamic_gets/tmpl/default_foot.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/dynamic_gets/tmpl/default_head.php b/admin/views/dynamic_gets/tmpl/default_head.php index 2e3b98e4d..e5c24ce03 100644 --- a/admin/views/dynamic_gets/tmpl/default_head.php +++ b/admin/views/dynamic_gets/tmpl/default_head.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/dynamic_gets/tmpl/default_toolbar.php b/admin/views/dynamic_gets/tmpl/default_toolbar.php index c4ae928b1..0b311eaf7 100644 --- a/admin/views/dynamic_gets/tmpl/default_toolbar.php +++ b/admin/views/dynamic_gets/tmpl/default_toolbar.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php index 95a77c391..21e5e36a2 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/field/submitbutton.js b/admin/views/field/submitbutton.js index b0ca2e6ea..f6aa9abc2 100644 --- a/admin/views/field/submitbutton.js +++ b/admin/views/field/submitbutton.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php index 8b53e1f12..73049262b 100644 --- a/admin/views/field/tmpl/edit.php +++ b/admin/views/field/tmpl/edit.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php index a89d71cdf..48908a30a 100644 --- a/admin/views/field/view.html.php +++ b/admin/views/field/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fields/tmpl/default.php b/admin/views/fields/tmpl/default.php index e37b19ee4..584343109 100644 --- a/admin/views/fields/tmpl/default.php +++ b/admin/views/fields/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fields/tmpl/default_batch_body.php b/admin/views/fields/tmpl/default_batch_body.php index ca11d2c08..b42a5cd00 100644 --- a/admin/views/fields/tmpl/default_batch_body.php +++ b/admin/views/fields/tmpl/default_batch_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fields/tmpl/default_batch_footer.php b/admin/views/fields/tmpl/default_batch_footer.php index 62cb95114..7404a668a 100644 --- a/admin/views/fields/tmpl/default_batch_footer.php +++ b/admin/views/fields/tmpl/default_batch_footer.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fields/tmpl/default_body.php b/admin/views/fields/tmpl/default_body.php index ccda80862..5189c5f8f 100644 --- a/admin/views/fields/tmpl/default_body.php +++ b/admin/views/fields/tmpl/default_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fields/tmpl/default_foot.php b/admin/views/fields/tmpl/default_foot.php index 0f54e794d..ccb1d9c43 100644 --- a/admin/views/fields/tmpl/default_foot.php +++ b/admin/views/fields/tmpl/default_foot.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fields/tmpl/default_head.php b/admin/views/fields/tmpl/default_head.php index e0fd6ba10..e90892629 100644 --- a/admin/views/fields/tmpl/default_head.php +++ b/admin/views/fields/tmpl/default_head.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fields/tmpl/default_toolbar.php b/admin/views/fields/tmpl/default_toolbar.php index 113db847e..ae13e9308 100644 --- a/admin/views/fields/tmpl/default_toolbar.php +++ b/admin/views/fields/tmpl/default_toolbar.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php index b7cab4188..3658958d6 100644 --- a/admin/views/fields/view.html.php +++ b/admin/views/fields/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fieldtype/submitbutton.js b/admin/views/fieldtype/submitbutton.js index 50a508564..6884e286d 100644 --- a/admin/views/fieldtype/submitbutton.js +++ b/admin/views/fieldtype/submitbutton.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fieldtype/tmpl/edit.php b/admin/views/fieldtype/tmpl/edit.php index dd657e8d3..04100bf50 100644 --- a/admin/views/fieldtype/tmpl/edit.php +++ b/admin/views/fieldtype/tmpl/edit.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php index 860e29ade..38e20f3da 100644 --- a/admin/views/fieldtype/view.html.php +++ b/admin/views/fieldtype/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fieldtypes/tmpl/default.php b/admin/views/fieldtypes/tmpl/default.php index 4b8c73b60..58b2386ca 100644 --- a/admin/views/fieldtypes/tmpl/default.php +++ b/admin/views/fieldtypes/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fieldtypes/tmpl/default_batch_body.php b/admin/views/fieldtypes/tmpl/default_batch_body.php index bda7680c0..1d363c461 100644 --- a/admin/views/fieldtypes/tmpl/default_batch_body.php +++ b/admin/views/fieldtypes/tmpl/default_batch_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fieldtypes/tmpl/default_batch_footer.php b/admin/views/fieldtypes/tmpl/default_batch_footer.php index 25824fa68..e0bc0f5ea 100644 --- a/admin/views/fieldtypes/tmpl/default_batch_footer.php +++ b/admin/views/fieldtypes/tmpl/default_batch_footer.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fieldtypes/tmpl/default_body.php b/admin/views/fieldtypes/tmpl/default_body.php index 6265e6ad0..ea098eeeb 100644 --- a/admin/views/fieldtypes/tmpl/default_body.php +++ b/admin/views/fieldtypes/tmpl/default_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fieldtypes/tmpl/default_foot.php b/admin/views/fieldtypes/tmpl/default_foot.php index aab669efd..366edac29 100644 --- a/admin/views/fieldtypes/tmpl/default_foot.php +++ b/admin/views/fieldtypes/tmpl/default_foot.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fieldtypes/tmpl/default_head.php b/admin/views/fieldtypes/tmpl/default_head.php index 2781d01e2..80e2c718b 100644 --- a/admin/views/fieldtypes/tmpl/default_head.php +++ b/admin/views/fieldtypes/tmpl/default_head.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fieldtypes/tmpl/default_toolbar.php b/admin/views/fieldtypes/tmpl/default_toolbar.php index d7ff69e6a..20120fa39 100644 --- a/admin/views/fieldtypes/tmpl/default_toolbar.php +++ b/admin/views/fieldtypes/tmpl/default_toolbar.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php index c8cf428ee..632b19517 100644 --- a/admin/views/fieldtypes/view.html.php +++ b/admin/views/fieldtypes/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index d561dcd96..991cb9db7 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index c711043c4..6bb6f8df9 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 5a37cf0ac..70ad0b7a2 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index b02199106..4532f219b 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index 343e2a324..f845a8ac0 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index 627250fb1..84cc57ce9 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index d2822eae5..10967ca00 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index 514eddd76..ea50f8fdf 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index e2b5f5252..d594b8f57 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index d31a06a36..f4b4b974e 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 6473d2703..1a9ed2819 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index c98fd5fa4..7d6613716 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 24bdf764d..ff5bd2c2a 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/layout/submitbutton.js b/admin/views/layout/submitbutton.js index 75c0557d9..f550102f4 100644 --- a/admin/views/layout/submitbutton.js +++ b/admin/views/layout/submitbutton.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/layout/tmpl/edit.php b/admin/views/layout/tmpl/edit.php index 4c9e35c0e..8e9960373 100644 --- a/admin/views/layout/tmpl/edit.php +++ b/admin/views/layout/tmpl/edit.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/layout/view.html.php b/admin/views/layout/view.html.php index e7ca3f36e..e9fd3bd31 100644 --- a/admin/views/layout/view.html.php +++ b/admin/views/layout/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/layouts/tmpl/default.php b/admin/views/layouts/tmpl/default.php index 1e7354a03..e601db6a9 100644 --- a/admin/views/layouts/tmpl/default.php +++ b/admin/views/layouts/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/layouts/tmpl/default_batch_body.php b/admin/views/layouts/tmpl/default_batch_body.php index 6df2970d4..408fbb528 100644 --- a/admin/views/layouts/tmpl/default_batch_body.php +++ b/admin/views/layouts/tmpl/default_batch_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/layouts/tmpl/default_batch_footer.php b/admin/views/layouts/tmpl/default_batch_footer.php index c6f0571f2..b7cd494da 100644 --- a/admin/views/layouts/tmpl/default_batch_footer.php +++ b/admin/views/layouts/tmpl/default_batch_footer.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/layouts/tmpl/default_body.php b/admin/views/layouts/tmpl/default_body.php index 0aa82aa1c..a027b6a25 100644 --- a/admin/views/layouts/tmpl/default_body.php +++ b/admin/views/layouts/tmpl/default_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/layouts/tmpl/default_foot.php b/admin/views/layouts/tmpl/default_foot.php index ba1b3ba28..e0639955a 100644 --- a/admin/views/layouts/tmpl/default_foot.php +++ b/admin/views/layouts/tmpl/default_foot.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/layouts/tmpl/default_head.php b/admin/views/layouts/tmpl/default_head.php index d7090185d..2d580b1ed 100644 --- a/admin/views/layouts/tmpl/default_head.php +++ b/admin/views/layouts/tmpl/default_head.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/layouts/tmpl/default_toolbar.php b/admin/views/layouts/tmpl/default_toolbar.php index 0ee4b23c2..fc26f5ed8 100644 --- a/admin/views/layouts/tmpl/default_toolbar.php +++ b/admin/views/layouts/tmpl/default_toolbar.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php index 790acbf4e..59907cb5e 100644 --- a/admin/views/layouts/view.html.php +++ b/admin/views/layouts/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/site_view/submitbutton.js b/admin/views/site_view/submitbutton.js index 6c5a1f526..dcdab6c37 100644 --- a/admin/views/site_view/submitbutton.js +++ b/admin/views/site_view/submitbutton.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php index 5215c0ffc..b97efcedf 100644 --- a/admin/views/site_view/tmpl/edit.php +++ b/admin/views/site_view/tmpl/edit.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php index 40a213a75..2592f9c80 100644 --- a/admin/views/site_view/view.html.php +++ b/admin/views/site_view/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/site_views/tmpl/default.php b/admin/views/site_views/tmpl/default.php index 1c31dcf02..0be1e30f6 100644 --- a/admin/views/site_views/tmpl/default.php +++ b/admin/views/site_views/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/site_views/tmpl/default_batch_body.php b/admin/views/site_views/tmpl/default_batch_body.php index a5543d04f..4e1b4a03d 100644 --- a/admin/views/site_views/tmpl/default_batch_body.php +++ b/admin/views/site_views/tmpl/default_batch_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/site_views/tmpl/default_batch_footer.php b/admin/views/site_views/tmpl/default_batch_footer.php index f56f2f571..235a4e0ea 100644 --- a/admin/views/site_views/tmpl/default_batch_footer.php +++ b/admin/views/site_views/tmpl/default_batch_footer.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/site_views/tmpl/default_body.php b/admin/views/site_views/tmpl/default_body.php index 6b3d0ac68..f9b1c94a1 100644 --- a/admin/views/site_views/tmpl/default_body.php +++ b/admin/views/site_views/tmpl/default_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/site_views/tmpl/default_foot.php b/admin/views/site_views/tmpl/default_foot.php index dbe1d6b22..ea7543b05 100644 --- a/admin/views/site_views/tmpl/default_foot.php +++ b/admin/views/site_views/tmpl/default_foot.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/site_views/tmpl/default_head.php b/admin/views/site_views/tmpl/default_head.php index 4e83b1c47..fd9ad0773 100644 --- a/admin/views/site_views/tmpl/default_head.php +++ b/admin/views/site_views/tmpl/default_head.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/site_views/tmpl/default_toolbar.php b/admin/views/site_views/tmpl/default_toolbar.php index 38c740290..914e5df47 100644 --- a/admin/views/site_views/tmpl/default_toolbar.php +++ b/admin/views/site_views/tmpl/default_toolbar.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php index d939c4fe6..9ad283e3c 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/snippet/submitbutton.js b/admin/views/snippet/submitbutton.js index d176fca93..511fb1e69 100644 --- a/admin/views/snippet/submitbutton.js +++ b/admin/views/snippet/submitbutton.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/snippet/tmpl/edit.php b/admin/views/snippet/tmpl/edit.php index 43a814d15..42ae857f4 100644 --- a/admin/views/snippet/tmpl/edit.php +++ b/admin/views/snippet/tmpl/edit.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/snippet/view.html.php b/admin/views/snippet/view.html.php index 12d9968b3..8e9ff6a16 100644 --- a/admin/views/snippet/view.html.php +++ b/admin/views/snippet/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/snippets/tmpl/default.php b/admin/views/snippets/tmpl/default.php index cfe4d7ab6..8c6d194fb 100644 --- a/admin/views/snippets/tmpl/default.php +++ b/admin/views/snippets/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/snippets/tmpl/default_batch_body.php b/admin/views/snippets/tmpl/default_batch_body.php index 5e2cb5687..321a8083b 100644 --- a/admin/views/snippets/tmpl/default_batch_body.php +++ b/admin/views/snippets/tmpl/default_batch_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/snippets/tmpl/default_batch_footer.php b/admin/views/snippets/tmpl/default_batch_footer.php index a2360e87d..59e90f903 100644 --- a/admin/views/snippets/tmpl/default_batch_footer.php +++ b/admin/views/snippets/tmpl/default_batch_footer.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/snippets/tmpl/default_body.php b/admin/views/snippets/tmpl/default_body.php index b2e1f5ed5..da698d95b 100644 --- a/admin/views/snippets/tmpl/default_body.php +++ b/admin/views/snippets/tmpl/default_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/snippets/tmpl/default_foot.php b/admin/views/snippets/tmpl/default_foot.php index ba1b3ba28..e0639955a 100644 --- a/admin/views/snippets/tmpl/default_foot.php +++ b/admin/views/snippets/tmpl/default_foot.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/snippets/tmpl/default_head.php b/admin/views/snippets/tmpl/default_head.php index 7738b8433..5aa62e938 100644 --- a/admin/views/snippets/tmpl/default_head.php +++ b/admin/views/snippets/tmpl/default_head.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/snippets/tmpl/default_toolbar.php b/admin/views/snippets/tmpl/default_toolbar.php index f26c1e0d1..64c70b9ea 100644 --- a/admin/views/snippets/tmpl/default_toolbar.php +++ b/admin/views/snippets/tmpl/default_toolbar.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php index 2c14ad2fb..d6d41aff8 100644 --- a/admin/views/snippets/view.html.php +++ b/admin/views/snippets/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/template/submitbutton.js b/admin/views/template/submitbutton.js index 0c9c9d1f1..d1a3d3771 100644 --- a/admin/views/template/submitbutton.js +++ b/admin/views/template/submitbutton.js @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/template/tmpl/edit.php b/admin/views/template/tmpl/edit.php index 6f676b4ee..a2739ac5f 100644 --- a/admin/views/template/tmpl/edit.php +++ b/admin/views/template/tmpl/edit.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/template/view.html.php b/admin/views/template/view.html.php index 712bcd354..aa15ede98 100644 --- a/admin/views/template/view.html.php +++ b/admin/views/template/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/templates/tmpl/default.php b/admin/views/templates/tmpl/default.php index 17ff2e49b..e7c0ad071 100644 --- a/admin/views/templates/tmpl/default.php +++ b/admin/views/templates/tmpl/default.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/templates/tmpl/default_batch_body.php b/admin/views/templates/tmpl/default_batch_body.php index 15cf82eb0..53d088a3a 100644 --- a/admin/views/templates/tmpl/default_batch_body.php +++ b/admin/views/templates/tmpl/default_batch_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/templates/tmpl/default_batch_footer.php b/admin/views/templates/tmpl/default_batch_footer.php index 4453a5902..d3efce338 100644 --- a/admin/views/templates/tmpl/default_batch_footer.php +++ b/admin/views/templates/tmpl/default_batch_footer.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/templates/tmpl/default_body.php b/admin/views/templates/tmpl/default_body.php index 9ce440185..09346478f 100644 --- a/admin/views/templates/tmpl/default_body.php +++ b/admin/views/templates/tmpl/default_body.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/templates/tmpl/default_foot.php b/admin/views/templates/tmpl/default_foot.php index ba1b3ba28..e0639955a 100644 --- a/admin/views/templates/tmpl/default_foot.php +++ b/admin/views/templates/tmpl/default_foot.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/templates/tmpl/default_head.php b/admin/views/templates/tmpl/default_head.php index f8c692d44..8c40935b5 100644 --- a/admin/views/templates/tmpl/default_head.php +++ b/admin/views/templates/tmpl/default_head.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/templates/tmpl/default_toolbar.php b/admin/views/templates/tmpl/default_toolbar.php index 5751fd624..859e0c27c 100644 --- a/admin/views/templates/tmpl/default_toolbar.php +++ b/admin/views/templates/tmpl/default_toolbar.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php index 9f86f287a..0e0122fd4 100644 --- a/admin/views/templates/view.html.php +++ b/admin/views/templates/view.html.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/componentbuilder.xml b/componentbuilder.xml index 8c1650e09..65d95815b 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,20 +1,20 @@ COM_COMPONENTBUILDER - 25th November, 2016 + 22nd December, 2016 Llewellyn van der Merwe info@vdm.io - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 2.2.4 + 2.2.5 Component Builder (v.2.2.4) +

Component Builder (v.2.2.5)

The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanced, truly able to build extremely complex components in a fraction of the time. 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!

-

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

+

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

]]> diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml index 36f6ac6ee..df411f868 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -5,7 +5,7 @@ com_componentbuilder component 2.1.0 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.0.zip @@ -13,7 +13,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -22,7 +22,7 @@ com_componentbuilder component 2.1.1 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.1.zip @@ -30,7 +30,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -39,7 +39,7 @@ com_componentbuilder component 2.1.2 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.2.zip @@ -47,7 +47,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -56,7 +56,7 @@ com_componentbuilder component 2.1.3 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.3.zip @@ -64,7 +64,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -73,7 +73,7 @@ com_componentbuilder component 2.1.4 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.4.zip @@ -81,7 +81,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -90,7 +90,7 @@ com_componentbuilder component 2.1.5 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.5.zip @@ -98,7 +98,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -107,7 +107,7 @@ com_componentbuilder component 2.1.6 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.6.zip @@ -115,7 +115,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -124,7 +124,7 @@ com_componentbuilder component 2.1.7 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.7.zip @@ -132,7 +132,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -141,7 +141,7 @@ com_componentbuilder component 2.1.8 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.8.zip @@ -149,7 +149,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -158,7 +158,7 @@ com_componentbuilder component 2.1.9 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.9.zip @@ -166,7 +166,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -175,7 +175,7 @@ com_componentbuilder component 2.1.10 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.10.zip @@ -183,7 +183,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -192,7 +192,7 @@ com_componentbuilder component 2.1.11 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.11.zip @@ -200,7 +200,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -209,7 +209,7 @@ com_componentbuilder component 2.1.12 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.12.zip @@ -217,7 +217,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -226,7 +226,7 @@ com_componentbuilder component 2.1.13 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.13.zip @@ -234,7 +234,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -243,7 +243,7 @@ com_componentbuilder component 2.1.14 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.14.zip @@ -251,7 +251,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -260,7 +260,7 @@ com_componentbuilder component 2.1.15 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.15.zip @@ -268,7 +268,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -277,7 +277,7 @@ com_componentbuilder component 2.1.16 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.16.zip @@ -285,7 +285,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -294,7 +294,7 @@ com_componentbuilder component 2.1.17 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.17.zip @@ -302,7 +302,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -311,7 +311,7 @@ com_componentbuilder component 2.1.18 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.18.zip @@ -319,7 +319,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -328,7 +328,7 @@ com_componentbuilder component 2.1.19 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.19.zip @@ -336,7 +336,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -345,7 +345,7 @@ com_componentbuilder component 2.1.20 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/archive/v2.1.20.zip @@ -353,7 +353,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -362,7 +362,7 @@ com_componentbuilder component 2.1.21 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.1.21/JCB_v2.1.21.zip @@ -370,7 +370,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -379,7 +379,7 @@ com_componentbuilder component 2.2.0 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.2.0/JCB_v2.2.0.zip @@ -387,7 +387,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -396,7 +396,7 @@ com_componentbuilder component 2.2.1 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.2.1/JCB_v2.2.1.zip @@ -404,7 +404,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -413,7 +413,7 @@ com_componentbuilder component 2.2.2 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.2.2/JCB_v2.2.2.zip @@ -421,7 +421,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -430,7 +430,7 @@ com_componentbuilder component 2.2.3 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.2.3/JCB_v2.2.3.zip @@ -438,7 +438,7 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder @@ -447,7 +447,7 @@ com_componentbuilder component 2.2.4 - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.2.4/JCB_v2.2.4.zip @@ -455,7 +455,24 @@ stable Llewellyn van der Merwe - https://www.vdm.io/joomla-component-builder + http://vdm.bz/component-builder + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.2.5 + http://vdm.bz/component-builder + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.2.5/JCB_v2.2.5.zip + + + stable + + Llewellyn van der Merwe + http://vdm.bz/component-builder \ No newline at end of file diff --git a/script.php b/script.php index 5da63cc8b..f927e02f0 100644 --- a/script.php +++ b/script.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage script.php - @author Llewellyn van der Merwe + @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 @@ -1200,7 +1200,7 @@ class com_componentbuilderInstallerScript

Please let me know at info@vdm.io.
We at Vast Development Method are committed to building extensions that performs proficiently! You can help us, really!
Send me your thoughts on improvements that is needed, trust me, I will be very grateful! -
Visit us at https://www.vdm.io/joomla-component-builder today!

'; +
Visit us at http://vdm.bz/component-builder today!

'; } /** @@ -1431,7 +1431,7 @@ class com_componentbuilderInstallerScript $query->update($db->quoteName('#__extensions'))->set($fields)->where($conditions); $db->setQuery($query); $allDone = $db->execute(); - echo ' + echo ' '; } @@ -1820,10 +1820,10 @@ class com_componentbuilderInstallerScript } - echo ' + echo ' -

Upgrade to Version 2.2.4 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 2.2.5 Was Successful! Let us know if anything is not working as expected.

'; } } } diff --git a/site/assets/css/site.css b/site/assets/css/site.css index 6e7177b7c..bd609e3af 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -9,12 +9,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage site.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/site/componentbuilder.php b/site/componentbuilder.php index b9ecddb33..0728cf438 100644 --- a/site/componentbuilder.php +++ b/site/componentbuilder.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/site/controller.php b/site/controller.php index a6949c08d..a96357caf 100644 --- a/site/controller.php +++ b/site/controller.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage controller.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/site/controllers/help.php b/site/controllers/help.php index 5c9b10fe3..0c56d3e9d 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage help.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index 4e5f139e4..7c0e2eb31 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php - @author Llewellyn van der Merwe + @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 @@ -579,7 +579,7 @@ abstract class ComponentbuilderHelper { // The record has been set. Check the record permissions. $permission = $user->authorise($action->name, 'com_componentbuilder.'.$view.'.' . (int) $record->id); - if (!$permission && !is_null($permission)) + if (!$permission) // TODO removed && !is_null($permission) { if ($action->name == 'core.edit' || $action->name == $view.'.edit') { @@ -763,10 +763,22 @@ abstract class ComponentbuilderHelper return false; } - public static function checkArray($array) + public static function checkArray($array, $removeEmptyString = false) { if (isset($array) && is_array($array) && count($array) > 0) { + // also make sure the empty strings are removed + if ($removeEmptyString) + { + foreach ($array as $key => $string) + { + if (empty($string)) + { + unset($array[$key]); + } + } + return self::checkArray($array, false); + } return true; } return false; diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index d8a626b06..e4bcb648e 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/site/helpers/route.php b/site/helpers/route.php index 53242e801..504d969c8 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage route.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/site/router.php b/site/router.php index 188b36be3..b40d3d714 100644 --- a/site/router.php +++ b/site/router.php @@ -10,12 +10,12 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.4 - @build 25th November, 2016 + @version 2.2.5 + @build 22nd December, 2016 @created 30th April, 2015 @package Component Builder @subpackage router.php - @author Llewellyn van der Merwe + @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 @@ -124,16 +124,10 @@ class ComponentbuilderRouter extends JComponentRouterBase * @since 3.3 */ public function parse(&$segments) - { - //var_dump($segments); - //$app = JFactory::getApplication(); - //$menu = $app->getMenu(); - //$item = $menu->getActive(); - + { $count = count($segments); $vars = array(); - - //var_dump($item->query['view']); + //Handle View and Identifier switch($segments[0]) { @@ -142,7 +136,7 @@ class ComponentbuilderRouter extends JComponentRouterBase return $vars; } - protected function getVar($table, $where = null, $whereString = 'user', $what = 'id', $operator = '=', $main = 'componentbuilder') + protected function getVar($table, $where = null, $whereString = 'user', $what = 'id', $category = false, $operator = '=', $main = 'componentbuilder') { if(!$where) { @@ -154,7 +148,7 @@ class ComponentbuilderRouter extends JComponentRouterBase $query = $db->getQuery(true); $query->select($db->quoteName(array($what))); - if ('categories' == $table || 'category' == $table) + if ('categories' == $table || 'category' == $table || $category) { $query->from($db->quoteName('#__categories')); }