From a7e641b499536848540c6bd391fd2fe45cdf3d38 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sat, 3 Sep 2016 22:44:47 +0100 Subject: [PATCH] Added another PHP field to the admin views, improved the custom code methods in the compiler, and fixed some permissional errors. --- README.md | 10 +- admin/assets/css/admin.css | 4 +- admin/assets/css/admin_view.css | 4 +- admin/assets/css/admin_views.css | 4 +- admin/assets/css/component.css | 4 +- admin/assets/css/components.css | 4 +- admin/assets/css/custom_admin_view.css | 4 +- admin/assets/css/custom_admin_views.css | 4 +- admin/assets/css/dashboard.css | 4 +- admin/assets/css/dynamic_get.css | 4 +- admin/assets/css/dynamic_gets.css | 4 +- admin/assets/css/field.css | 4 +- admin/assets/css/fields.css | 4 +- admin/assets/css/fieldtype.css | 4 +- admin/assets/css/fieldtypes.css | 4 +- admin/assets/css/help_document.css | 4 +- admin/assets/css/help_documents.css | 4 +- admin/assets/css/layout.css | 4 +- admin/assets/css/layouts.css | 4 +- admin/assets/css/site_view.css | 4 +- admin/assets/css/site_views.css | 4 +- admin/assets/css/snippet.css | 4 +- admin/assets/css/snippets.css | 4 +- admin/assets/css/template.css | 4 +- admin/assets/css/templates.css | 4 +- admin/compiler/joomla_3/JModelList.php | 2 +- admin/componentbuilder.php | 4 +- admin/controller.php | 4 +- admin/controllers/admin_view.php | 4 +- admin/controllers/admin_views.php | 4 +- admin/controllers/ajax.json.php | 4 +- admin/controllers/compiler.php | 4 +- admin/controllers/component.php | 4 +- admin/controllers/componentbuilder.php | 4 +- admin/controllers/components.php | 4 +- admin/controllers/custom_admin_view.php | 4 +- admin/controllers/custom_admin_views.php | 4 +- admin/controllers/dynamic_get.php | 4 +- admin/controllers/dynamic_gets.php | 4 +- admin/controllers/field.php | 4 +- admin/controllers/fields.php | 4 +- admin/controllers/fieldtype.php | 4 +- admin/controllers/fieldtypes.php | 4 +- admin/controllers/help.php | 4 +- admin/controllers/help_document.php | 4 +- admin/controllers/help_documents.php | 4 +- admin/controllers/import.php | 4 +- admin/controllers/layout.php | 4 +- admin/controllers/layouts.php | 4 +- admin/controllers/site_view.php | 4 +- admin/controllers/site_views.php | 4 +- admin/controllers/snippet.php | 4 +- admin/controllers/snippets.php | 4 +- admin/controllers/template.php | 4 +- admin/controllers/templates.php | 4 +- admin/helpers/compiler.php | 17 + admin/helpers/compiler/a_Get.php | 19 +- admin/helpers/compiler/b_Structure.php | 17 + admin/helpers/compiler/c_Fields.php | 59 +- admin/helpers/compiler/e_Interpretation.php | 228 ++-- admin/helpers/compiler/f_Infusion.php | 28 +- admin/helpers/componentbuilder.php | 4 +- admin/helpers/html/batch_.php | 4 +- admin/helpers/indenter.php | 4 +- admin/helpers/js.php | 4 +- admin/helpers/minify.php | 4 +- .../en-GB/en-GB.com_componentbuilder.ini | 8 +- admin/layouts/admin_view/css_fullwidth.php | 4 +- .../admin_view/custom_import_fullwidth.php | 4 +- admin/layouts/admin_view/fields_fullwidth.php | 6 +- .../admin_view/javascript_fullwidth.php | 4 +- admin/layouts/admin_view/mysql_fullwidth.php | 4 +- admin/layouts/admin_view/mysql_left.php | 4 +- admin/layouts/admin_view/php_fullwidth.php | 6 +- admin/layouts/admin_view/publishing.php | 4 +- admin/layouts/admin_view/publlshing.php | 4 +- admin/layouts/admin_view/settings_above.php | 4 +- admin/layouts/admin_view/settings_left.php | 4 +- admin/layouts/admin_view/settings_right.php | 4 +- admin/layouts/admin_view/settings_under.php | 4 +- admin/layouts/batchselection.php | 4 +- .../component/admin_views_fullwidth.php | 4 +- admin/layouts/component/details_above.php | 4 +- admin/layouts/component/details_left.php | 4 +- admin/layouts/component/details_right.php | 4 +- admin/layouts/component/details_under.php | 4 +- .../component/ftp_servers_fullwidth.php | 4 +- admin/layouts/component/publishing.php | 4 +- admin/layouts/component/publlshing.php | 4 +- admin/layouts/component/readme_left.php | 4 +- admin/layouts/component/readme_right.php | 4 +- admin/layouts/component/scripts_fullwidth.php | 4 +- admin/layouts/component/settings_left.php | 4 +- admin/layouts/component/settings_right.php | 4 +- .../component/site_views_fullwidth.php | 4 +- .../custom_buttons_fullwidth.php | 4 +- .../custom_admin_view/custom_buttons_left.php | 4 +- .../custom_script_fullwidth.php | 4 +- .../custom_admin_view/details_above.php | 4 +- .../custom_admin_view/details_fullwidth.php | 4 +- .../custom_admin_view/details_left.php | 4 +- .../custom_admin_view/details_right.php | 4 +- .../custom_admin_view/details_rightside.php | 4 +- .../custom_admin_view/details_under.php | 4 +- .../layouts/custom_admin_view/publishing.php | 4 +- .../layouts/custom_admin_view/publlshing.php | 4 +- .../layouts/dynamic_get/abacus_fullwidth.php | 4 +- admin/layouts/dynamic_get/abacus_left.php | 4 +- .../dynamic_get/custom_script_fullwidth.php | 4 +- admin/layouts/dynamic_get/gettable_above.php | 4 +- .../dynamic_get/gettable_fullwidth.php | 4 +- admin/layouts/dynamic_get/gettable_left.php | 4 +- admin/layouts/dynamic_get/gettable_right.php | 4 +- admin/layouts/dynamic_get/gettable_under.php | 4 +- admin/layouts/dynamic_get/publishing.php | 4 +- admin/layouts/dynamic_get/publlshing.php | 4 +- admin/layouts/field/details_fullwidth.php | 4 +- admin/layouts/field/details_left.php | 4 +- admin/layouts/field/details_right.php | 4 +- admin/layouts/field/details_under.php | 4 +- admin/layouts/field/publishing.php | 4 +- admin/layouts/field/publlshing.php | 4 +- admin/layouts/field/scripts_left.php | 4 +- admin/layouts/field/scripts_right.php | 4 +- admin/layouts/fieldtype/details_left.php | 4 +- admin/layouts/fieldtype/details_right.php | 4 +- admin/layouts/fieldtype/fields_fullwidth.php | 6 +- admin/layouts/fieldtype/publishing.php | 4 +- admin/layouts/fieldtype/publlshing.php | 4 +- admin/layouts/help_document/details_above.php | 4 +- .../help_document/details_fullwidth.php | 4 +- admin/layouts/help_document/details_left.php | 4 +- admin/layouts/help_document/details_right.php | 4 +- admin/layouts/help_document/details_under.php | 4 +- admin/layouts/help_document/publishing.php | 4 +- admin/layouts/help_document/publlshing.php | 4 +- .../layout/custom_script_fullwidth.php | 4 +- admin/layouts/layout/details_fullwidth.php | 4 +- admin/layouts/layout/details_left.php | 4 +- admin/layouts/layout/details_right.php | 4 +- admin/layouts/layout/details_rightside.php | 4 +- admin/layouts/layout/details_under.php | 4 +- admin/layouts/layout/publishing.php | 4 +- admin/layouts/layout/publlshing.php | 4 +- .../site_view/custom_buttons_fullwidth.php | 4 +- admin/layouts/site_view/details_above.php | 4 +- admin/layouts/site_view/details_fullwidth.php | 4 +- admin/layouts/site_view/details_left.php | 4 +- admin/layouts/site_view/details_right.php | 4 +- admin/layouts/site_view/details_rightside.php | 4 +- admin/layouts/site_view/details_under.php | 4 +- .../site_view/javascript_css_fullwidth.php | 4 +- admin/layouts/site_view/php_fullwidth.php | 4 +- admin/layouts/site_view/publishing.php | 4 +- admin/layouts/site_view/publlshing.php | 4 +- admin/layouts/snippet/details_above.php | 4 +- admin/layouts/snippet/details_left.php | 4 +- admin/layouts/snippet/details_right.php | 4 +- admin/layouts/snippet/publishing.php | 4 +- admin/layouts/snippet/publlshing.php | 4 +- .../template/custom_script_fullwidth.php | 4 +- admin/layouts/template/details_fullwidth.php | 4 +- admin/layouts/template/details_left.php | 4 +- admin/layouts/template/details_right.php | 4 +- admin/layouts/template/details_rightside.php | 4 +- admin/layouts/template/details_under.php | 4 +- admin/layouts/template/publishing.php | 4 +- admin/layouts/template/publlshing.php | 4 +- admin/models/admin_view.php | 52 +- admin/models/admin_views.php | 16 +- admin/models/ajax.php | 4 +- admin/models/compiler.php | 4 +- admin/models/component.php | 4 +- admin/models/componentbuilder.php | 4 +- admin/models/components.php | 6 +- admin/models/custom_admin_view.php | 4 +- admin/models/custom_admin_views.php | 6 +- admin/models/dynamic_get.php | 4 +- admin/models/dynamic_gets.php | 6 +- admin/models/field.php | 4 +- admin/models/fields.php | 6 +- admin/models/fields/adminviews.php | 4 +- admin/models/fields/articles.php | 4 +- admin/models/fields/customadminviews.php | 4 +- admin/models/fields/customfilelist.php | 4 +- admin/models/fields/customfolderlist.php | 4 +- admin/models/fields/customgets.php | 4 +- admin/models/fields/dbtables.php | 4 +- admin/models/fields/dynamicgets.php | 4 +- admin/models/fields/fields.php | 4 +- admin/models/fields/fieldsmulti.php | 4 +- admin/models/fields/fieldtypes.php | 4 +- admin/models/fields/maingets.php | 4 +- admin/models/fields/siteviews.php | 4 +- admin/models/fields/snippets.php | 4 +- admin/models/fieldtype.php | 16 +- admin/models/fieldtypes.php | 6 +- admin/models/forms/admin_view.js | 425 ++++--- admin/models/forms/admin_view.xml | 463 ++++--- admin/models/forms/component.js | 4 +- admin/models/forms/component.xml | 115 +- admin/models/forms/custom_admin_view.js | 250 ++-- admin/models/forms/custom_admin_view.xml | 7 +- admin/models/forms/dynamic_get.js | 1072 ++++++++--------- admin/models/forms/dynamic_get.xml | 34 +- admin/models/forms/field.js | 491 ++++---- admin/models/forms/field.xml | 1 + admin/models/forms/fieldtype.js | 4 +- admin/models/forms/fieldtype.xml | 13 +- admin/models/forms/help_document.js | 306 ++--- admin/models/forms/layout.js | 24 +- admin/models/forms/layout.xml | 1 + admin/models/forms/site_view.js | 278 ++--- admin/models/forms/site_view.xml | 15 +- admin/models/forms/snippet.js | 4 +- admin/models/forms/snippet.xml | 1 + admin/models/forms/template.js | 24 +- admin/models/forms/template.xml | 1 + admin/models/help_document.php | 4 +- admin/models/help_documents.php | 6 +- admin/models/import.php | 4 +- admin/models/layout.php | 4 +- admin/models/layouts.php | 6 +- admin/models/site_view.php | 4 +- admin/models/site_views.php | 6 +- admin/models/snippet.php | 4 +- admin/models/snippets.php | 6 +- admin/models/template.php | 4 +- admin/models/templates.php | 6 +- admin/sql/install.mysql.utf8.sql | 257 ++-- admin/tables/admin_view.php | 4 +- admin/tables/component.php | 4 +- admin/tables/custom_admin_view.php | 4 +- admin/tables/dynamic_get.php | 4 +- admin/tables/field.php | 4 +- admin/tables/fieldtype.php | 4 +- admin/tables/help_document.php | 4 +- admin/tables/layout.php | 4 +- admin/tables/site_view.php | 4 +- admin/tables/snippet.php | 4 +- admin/tables/template.php | 4 +- admin/views/admin_view/submitbutton.js | 4 +- admin/views/admin_view/tmpl/edit.php | 223 ++-- admin/views/admin_view/view.html.php | 6 +- admin/views/admin_views/tmpl/default.php | 4 +- .../admin_views/tmpl/default_batch_body.php | 4 +- .../admin_views/tmpl/default_batch_footer.php | 4 +- admin/views/admin_views/tmpl/default_body.php | 4 +- admin/views/admin_views/tmpl/default_foot.php | 4 +- admin/views/admin_views/tmpl/default_head.php | 4 +- .../admin_views/tmpl/default_toolbar.php | 4 +- admin/views/admin_views/view.html.php | 4 +- admin/views/compiler/tmpl/default.php | 4 +- admin/views/compiler/view.html.php | 4 +- admin/views/component/submitbutton.js | 4 +- admin/views/component/tmpl/edit.php | 4 +- admin/views/component/view.html.php | 4 +- admin/views/componentbuilder/tmpl/default.php | 4 +- .../componentbuilder/tmpl/default_main.php | 4 +- .../componentbuilder/tmpl/default_vdm.php | 4 +- admin/views/componentbuilder/view.html.php | 4 +- admin/views/components/tmpl/default.php | 4 +- .../components/tmpl/default_batch_body.php | 4 +- .../components/tmpl/default_batch_footer.php | 4 +- admin/views/components/tmpl/default_body.php | 4 +- admin/views/components/tmpl/default_foot.php | 4 +- admin/views/components/tmpl/default_head.php | 4 +- .../views/components/tmpl/default_toolbar.php | 4 +- admin/views/components/view.html.php | 4 +- admin/views/custom_admin_view/submitbutton.js | 4 +- admin/views/custom_admin_view/tmpl/edit.php | 84 +- admin/views/custom_admin_view/view.html.php | 4 +- .../views/custom_admin_views/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../custom_admin_views/tmpl/default_body.php | 4 +- .../custom_admin_views/tmpl/default_foot.php | 4 +- .../custom_admin_views/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/custom_admin_views/view.html.php | 4 +- admin/views/dynamic_get/submitbutton.js | 4 +- admin/views/dynamic_get/tmpl/edit.php | 308 ++--- admin/views/dynamic_get/view.html.php | 4 +- admin/views/dynamic_gets/tmpl/default.php | 4 +- .../dynamic_gets/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/dynamic_gets/tmpl/default_body.php | 4 +- .../views/dynamic_gets/tmpl/default_foot.php | 4 +- .../views/dynamic_gets/tmpl/default_head.php | 4 +- .../dynamic_gets/tmpl/default_toolbar.php | 4 +- admin/views/dynamic_gets/view.html.php | 4 +- admin/views/field/submitbutton.js | 4 +- admin/views/field/tmpl/edit.php | 151 +-- admin/views/field/view.html.php | 4 +- admin/views/fields/tmpl/default.php | 4 +- .../views/fields/tmpl/default_batch_body.php | 4 +- .../fields/tmpl/default_batch_footer.php | 4 +- admin/views/fields/tmpl/default_body.php | 4 +- admin/views/fields/tmpl/default_foot.php | 4 +- admin/views/fields/tmpl/default_head.php | 4 +- admin/views/fields/tmpl/default_toolbar.php | 4 +- admin/views/fields/view.html.php | 4 +- admin/views/fieldtype/submitbutton.js | 4 +- admin/views/fieldtype/tmpl/edit.php | 4 +- admin/views/fieldtype/view.html.php | 6 +- admin/views/fieldtypes/tmpl/default.php | 4 +- .../fieldtypes/tmpl/default_batch_body.php | 4 +- .../fieldtypes/tmpl/default_batch_footer.php | 4 +- admin/views/fieldtypes/tmpl/default_body.php | 4 +- admin/views/fieldtypes/tmpl/default_foot.php | 4 +- admin/views/fieldtypes/tmpl/default_head.php | 4 +- .../views/fieldtypes/tmpl/default_toolbar.php | 4 +- admin/views/fieldtypes/view.html.php | 4 +- admin/views/help_document/submitbutton.js | 4 +- admin/views/help_document/tmpl/edit.php | 94 +- admin/views/help_document/view.html.php | 4 +- admin/views/help_documents/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../help_documents/tmpl/default_body.php | 4 +- .../help_documents/tmpl/default_foot.php | 4 +- .../help_documents/tmpl/default_head.php | 4 +- .../help_documents/tmpl/default_toolbar.php | 4 +- admin/views/help_documents/view.html.php | 4 +- admin/views/import/tmpl/default.php | 4 +- admin/views/import/view.html.php | 4 +- admin/views/layout/submitbutton.js | 4 +- admin/views/layout/tmpl/edit.php | 14 +- admin/views/layout/view.html.php | 4 +- admin/views/layouts/tmpl/default.php | 4 +- .../views/layouts/tmpl/default_batch_body.php | 4 +- .../layouts/tmpl/default_batch_footer.php | 4 +- admin/views/layouts/tmpl/default_body.php | 4 +- admin/views/layouts/tmpl/default_foot.php | 4 +- admin/views/layouts/tmpl/default_head.php | 4 +- admin/views/layouts/tmpl/default_toolbar.php | 4 +- admin/views/layouts/view.html.php | 4 +- admin/views/site_view/submitbutton.js | 4 +- admin/views/site_view/tmpl/edit.php | 94 +- admin/views/site_view/view.html.php | 4 +- admin/views/site_views/tmpl/default.php | 4 +- .../site_views/tmpl/default_batch_body.php | 4 +- .../site_views/tmpl/default_batch_footer.php | 4 +- admin/views/site_views/tmpl/default_body.php | 4 +- admin/views/site_views/tmpl/default_foot.php | 4 +- admin/views/site_views/tmpl/default_head.php | 4 +- .../views/site_views/tmpl/default_toolbar.php | 4 +- admin/views/site_views/view.html.php | 4 +- admin/views/snippet/submitbutton.js | 4 +- admin/views/snippet/tmpl/edit.php | 4 +- admin/views/snippet/view.html.php | 4 +- admin/views/snippets/tmpl/default.php | 4 +- .../snippets/tmpl/default_batch_body.php | 4 +- .../snippets/tmpl/default_batch_footer.php | 4 +- admin/views/snippets/tmpl/default_body.php | 4 +- admin/views/snippets/tmpl/default_foot.php | 4 +- admin/views/snippets/tmpl/default_head.php | 4 +- admin/views/snippets/tmpl/default_toolbar.php | 4 +- admin/views/snippets/view.html.php | 4 +- admin/views/template/submitbutton.js | 4 +- admin/views/template/tmpl/edit.php | 14 +- admin/views/template/view.html.php | 4 +- admin/views/templates/tmpl/default.php | 4 +- .../templates/tmpl/default_batch_body.php | 4 +- .../templates/tmpl/default_batch_footer.php | 4 +- admin/views/templates/tmpl/default_body.php | 4 +- admin/views/templates/tmpl/default_foot.php | 4 +- admin/views/templates/tmpl/default_head.php | 4 +- .../views/templates/tmpl/default_toolbar.php | 4 +- admin/views/templates/view.html.php | 4 +- componentbuilder.xml | 6 +- script.php | 14 +- site/assets/css/site.css | 4 +- site/componentbuilder.php | 4 +- site/controller.php | 4 +- site/controllers/help.php | 4 +- site/helpers/componentbuilder.php | 4 +- site/helpers/headercheck.php | 4 +- site/helpers/route.php | 4 +- site/router.php | 4 +- 380 files changed, 3508 insertions(+), 3130 deletions(-) diff --git a/README.md b/README.md index 8cbbef101..25ba8a377 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Component Builder (2.1.16) +# Component Builder (2.1.17) This is a [Joomla 3.x] (http://www.joomla.org/) component. @@ -32,12 +32,12 @@ Would you require more help please open and issue here on [gitHub today](https:/ + *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io) + *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 29th August, 2016 -+ *Version*: 2.1.16 ++ *Last Build*: 3rd September, 2016 ++ *Version*: 2.1.17 + *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*: **83199** -+ *File count*: **509** ++ *Line count*: **83550** ++ *File count*: **510** + *Folder count*: **98** > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder). diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 90e7e8af1..3a47b0d92 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index 2b79b797f..910d9e382 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.css diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index f25342362..8104dfe51 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/component.css b/admin/assets/css/component.css index 6a3cfc026..b42975f7b 100644 --- a/admin/assets/css/component.css +++ b/admin/assets/css/component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.css diff --git a/admin/assets/css/components.css b/admin/assets/css/components.css index 2424aa53f..1e574b78d 100644 --- a/admin/assets/css/components.css +++ b/admin/assets/css/components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.css diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index c0e96223c..2dcdd2cc0 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.css diff --git a/admin/assets/css/custom_admin_views.css b/admin/assets/css/custom_admin_views.css index c2df27a7a..29f0e1690 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 2ab80fd2d..a9b320363 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/dynamic_get.css b/admin/assets/css/dynamic_get.css index 546075b50..fb2c177e0 100644 --- a/admin/assets/css/dynamic_get.css +++ b/admin/assets/css/dynamic_get.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.css diff --git a/admin/assets/css/dynamic_gets.css b/admin/assets/css/dynamic_gets.css index 926cd5972..ff28723ab 100644 --- a/admin/assets/css/dynamic_gets.css +++ b/admin/assets/css/dynamic_gets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.css diff --git a/admin/assets/css/field.css b/admin/assets/css/field.css index 5e4712d5d..472a75530 100644 --- a/admin/assets/css/field.css +++ b/admin/assets/css/field.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.css diff --git a/admin/assets/css/fields.css b/admin/assets/css/fields.css index 16af1dc4d..608799162 100644 --- a/admin/assets/css/fields.css +++ b/admin/assets/css/fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.css diff --git a/admin/assets/css/fieldtype.css b/admin/assets/css/fieldtype.css index 68ff994f8..41b7158ac 100644 --- a/admin/assets/css/fieldtype.css +++ b/admin/assets/css/fieldtype.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.css diff --git a/admin/assets/css/fieldtypes.css b/admin/assets/css/fieldtypes.css index 181434f7a..0a281c0ea 100644 --- a/admin/assets/css/fieldtypes.css +++ b/admin/assets/css/fieldtypes.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index a1f6afb42..34c92a400 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 0418a3b8b..8f95300c6 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.css diff --git a/admin/assets/css/layout.css b/admin/assets/css/layout.css index d924d260f..13911ef65 100644 --- a/admin/assets/css/layout.css +++ b/admin/assets/css/layout.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.css diff --git a/admin/assets/css/layouts.css b/admin/assets/css/layouts.css index bf24c28ba..a2bd1a70a 100644 --- a/admin/assets/css/layouts.css +++ b/admin/assets/css/layouts.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layouts.css diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index b25d26b68..aa51f9770 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.css diff --git a/admin/assets/css/site_views.css b/admin/assets/css/site_views.css index 167714606..838f685fb 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.css diff --git a/admin/assets/css/snippet.css b/admin/assets/css/snippet.css index 305a43571..cf0a1eb79 100644 --- a/admin/assets/css/snippet.css +++ b/admin/assets/css/snippet.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.css diff --git a/admin/assets/css/snippets.css b/admin/assets/css/snippets.css index 21cb53fef..3653c0a37 100644 --- a/admin/assets/css/snippets.css +++ b/admin/assets/css/snippets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.css diff --git a/admin/assets/css/template.css b/admin/assets/css/template.css index c3ad40310..d0a14aedd 100644 --- a/admin/assets/css/template.css +++ b/admin/assets/css/template.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.css diff --git a/admin/assets/css/templates.css b/admin/assets/css/templates.css index 074b41d30..b5f8a8a36 100644 --- a/admin/assets/css/templates.css +++ b/admin/assets/css/templates.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.css diff --git a/admin/compiler/joomla_3/JModelList.php b/admin/compiler/joomla_3/JModelList.php index 15c87b6af..967eb85a7 100644 --- a/admin/compiler/joomla_3/JModelList.php +++ b/admin/compiler/joomla_3/JModelList.php @@ -95,7 +95,7 @@ class ###Component###Model###Views### extends JModelList public function getItems() {###LICENSE_LOCKED_CHECK### ###CHECKINCALL### // load parent items - $items = parent::getItems();###GET_ITEMS_METHOD_STRING_FIX### ###SELECTIONTRANSLATIONFIX### + $items = parent::getItems();###GET_ITEMS_METHOD_STRING_FIX### ###SELECTIONTRANSLATIONFIX### ###GET_ITEMS_METHOD_AFTER_ALL### // return items return $items; diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 8b4286420..355322c5d 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index d95b645bc..5ceb1a6e9 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index d8c613506..b9673abfd 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 6fbb5b13d..caff700f8 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 0f132b5f2..967116308 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 1c850e1be..28e4482d6 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage compiler.php diff --git a/admin/controllers/component.php b/admin/controllers/component.php index a566c5852..3afe82473 100644 --- a/admin/controllers/component.php +++ b/admin/controllers/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 1b574f3dd..c51a6194c 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/components.php b/admin/controllers/components.php index 37efe4d79..b0eb10f68 100644 --- a/admin/controllers/components.php +++ b/admin/controllers/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index d2c2ee864..fbd50b7e9 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index 962e27a0e..86b165bb2 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index 992dcd0f8..5d761f971 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index 701f7cde2..33f87e78f 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/controllers/field.php b/admin/controllers/field.php index 4eb6c2490..29ab6dc43 100644 --- a/admin/controllers/field.php +++ b/admin/controllers/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index 2aad109b7..3cbd70619 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php index a9c201a88..3c0f1ee0d 100644 --- a/admin/controllers/fieldtype.php +++ b/admin/controllers/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php index af4ec2048..529aa62f6 100644 --- a/admin/controllers/fieldtypes.php +++ b/admin/controllers/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 97d418931..b5c38a007 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 43130a145..60e72d51a 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index f508163c6..69d800d30 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index e8bea68d4..86b621ebd 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php index d4e3d7f68..d65334446 100644 --- a/admin/controllers/layout.php +++ b/admin/controllers/layout.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.php diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php index 1672c3d2b..bfa607759 100644 --- a/admin/controllers/layouts.php +++ b/admin/controllers/layouts.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layouts.php diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index 8d39854ae..d36898520 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index 7147871ac..0b574a411 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php index 4c4ba2b55..d4da31fd8 100644 --- a/admin/controllers/snippet.php +++ b/admin/controllers/snippet.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php index 9ce04cbb1..3c9eefed5 100644 --- a/admin/controllers/snippets.php +++ b/admin/controllers/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/controllers/template.php b/admin/controllers/template.php index deff8346b..6cac1327a 100644 --- a/admin/controllers/template.php +++ b/admin/controllers/template.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.php diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php index 873ad022c..023ea42ee 100644 --- a/admin/controllers/templates.php +++ b/admin/controllers/templates.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.php diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php index e6ffb18a4..e933b1995 100644 --- a/admin/helpers/compiler.php +++ b/admin/helpers/compiler.php @@ -82,6 +82,23 @@ class Compiler extends Infusion } return false; } + + /** + * Set the line number in comments + * + * @param int $nr The line number + * + * @return void + * + */ + private function setLine($nr) + { + if ($this->loadLineNr) + { + return ' [Compiler '.$nr.']'; + } + return ''; + } protected function updateFiles() { diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 297a5b706..cb22201d4 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -332,6 +332,23 @@ class Get return false; } + /** + * Set the line number in comments + * + * @param int $nr The line number + * + * @return void + * + */ + private function setLine($nr) + { + if ($this->loadLineNr) + { + return ' [Get '.$nr.']'; + } + return ''; + } + /** * get all Component Data * @@ -1055,7 +1072,7 @@ class Get } } // add_php - $addArrayP = array('php_getitem','php_save','php_postsavehook','php_getitems','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_batchcopy','php_batchmove','php_document'); + $addArrayP = array('php_getitem','php_save','php_postsavehook','php_getitems','php_getitems_after_all','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_batchcopy','php_batchmove','php_document'); foreach ($addArrayP as $scripter) { if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1) diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php index 7bc913d7e..28201a907 100644 --- a/admin/helpers/compiler/b_Structure.php +++ b/admin/helpers/compiler/b_Structure.php @@ -189,6 +189,23 @@ class Structure extends Get return false; } + /** + * Set the line number in comments + * + * @param int $nr The line number + * + * @return void + * + */ + private function setLine($nr) + { + if ($this->loadLineNr) + { + return ' [Structure '.$nr.']'; + } + return ''; + } + /** * Build the Initial Folders * diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php index 46cdb5cc9..c5aa8edf0 100644 --- a/admin/helpers/compiler/c_Fields.php +++ b/admin/helpers/compiler/c_Fields.php @@ -334,6 +334,23 @@ class Fields extends Structure * @var array */ public $movedPublishingFields = array(); + + /** + * Set the line number in comments + * + * @param int $nr The line number + * + * @return void + * + */ + private function setLine($nr) + { + if ($this->loadLineNr) + { + return ' [Fields '.$nr.']'; + } + return ''; + } /** * set the Field set of a view @@ -657,12 +674,14 @@ class Fields extends Structure { if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings'])) { + // reset some values $name = ComponentbuilderHelper::safeString($field['settings']->name); $typeName = ComponentbuilderHelper::safeString($field['settings']->type_name); $multiple = false; $langLabel = ''; $taber = ''; $fieldSet = ''; + $fieldAttributes = array(); // set field attributes $fieldAttributes = $this->setFieldAttributes($field, $viewType, $name, $typeName, $multiple, $langLabel, $langView, $spacerCounter, $listViewName, $viewName, $placeholders); // check if values were set @@ -928,6 +947,7 @@ class Fields extends Structure foreach ($fieldsSets as $fieldId) { // get the field data + $fieldData = array(); $fieldData['settings'] = $this->getFieldData($fieldId, $viewName); if (ComponentbuilderHelper::checkObject($fieldData['settings'])) { @@ -935,8 +955,6 @@ class Fields extends Structure $r_typeName = ComponentbuilderHelper::safeString($fieldData['settings']->type_name); $r_multiple = false; $r_langLabel = ''; - // make sure that these fields are not required - $fieldData['settings']->xml = str_replace('required="', 'requirenot="', $fieldData['settings']->xml); // add the tabs needed $taber = "\t\t\t"; // get field values @@ -1308,6 +1326,11 @@ class Fields extends Structure // dont load the button to repeatable $xmlValue = 'false'; } + elseif ($property['name'] == 'required' && $repeatable) + { + // dont load the required to repeatable + $xmlValue = 'false'; + } elseif ($viewType == 2 && ($property['name'] == 'readonly' || $property['name'] == 'disabled')) { // set read only @@ -1315,7 +1338,7 @@ class Fields extends Structure } elseif ($property['name'] == 'multiple') { - $xmlValue = ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"'); + $xmlValue = (string) ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"'); // add the multipal if ('true' == $xmlValue) { @@ -1342,7 +1365,7 @@ class Fields extends Structure else { // set the rest of the fields - $xmlValue = ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"'); + $xmlValue = (string) ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"'); } // check if translatable @@ -1471,23 +1494,29 @@ class Fields extends Structure $field['settings']->datadefault = '0'; } } - // build the query values - $this->queryBuilder[$viewName][$name] = array( - 'type' => $field['settings']->datatype, - 'lenght' => $field['settings']->datalenght, - 'lenght_other' => $field['settings']->datalenght_other, - 'default' => $field['settings']->datadefault, - 'other' => $field['settings']->datadefault_other, - 'null_switch' => $field['settings']->null_switch); // don't use these as index or uniqe keys - $notKeys = array('TEXT', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'BLOB', 'TINYBLOB', 'MEDIUMBLOB', 'LONGBLOB'); + $textKeys = array('TEXT', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'BLOB', 'TINYBLOB', 'MEDIUMBLOB', 'LONGBLOB'); + // build the query values + $this->queryBuilder[$viewName][$name]['type'] = $field['settings']->datatype; + if (!in_array($field['settings']->datatype, $textKeys)) + { + $this->queryBuilder[$viewName][$name]['lenght'] = $field['settings']->datalenght; + $this->queryBuilder[$viewName][$name]['lenght_other'] = $field['settings']->datalenght_other; + $this->queryBuilder[$viewName][$name]['default'] = $field['settings']->datadefault; + $this->queryBuilder[$viewName][$name]['other'] = $field['settings']->datadefault_other; + } + else + { + $this->queryBuilder[$viewName][$name]['default'] = 'EMPTY'; + } + $this->queryBuilder[$viewName][$name]['null_switch'] = $field['settings']->null_switch; // set index types - if ($field['settings']->indexes == 1 && !in_array($field['settings']->datatype, $notKeys)) + if ($field['settings']->indexes == 1 && !in_array($field['settings']->datatype, $textKeys)) { // build unique keys of this view for db $this->dbUniqueKeys[$viewName][] = $name; } - elseif (($field['settings']->indexes == 2 || $field['alias'] || $field['title'] || $typeName == 'category') && !in_array($field['settings']->datatype, $notKeys)) + elseif (($field['settings']->indexes == 2 || $field['alias'] || $field['title'] || $typeName == 'category') && !in_array($field['settings']->datatype, $textKeys)) { // build keys of this view for db $this->dbKeys[$viewName][] = $name; diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 0fd80a23b..a92551291 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -81,11 +81,11 @@ class Interpretation extends Fields * @return void * */ - public function setLine($nr) + private function setLine($nr) { if ($this->loadLineNr) { - return ' ['.__CLASS__.' '.$nr.']'; + return ' [Interpretation '.$nr.']'; } return ''; } @@ -2285,6 +2285,32 @@ class Interpretation extends Fields return $method; } + public function getCustomScriptBuilder($first, $second, $prefix = '', $note = null, $unset = null, $default = null, $sufix = '') + { + // check if there is any custom script + $script = ''; + if (isset($this->customScriptBuilder[$first][$second]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$first][$second])) + { + // add not if set + if ($note) + { + $script .= $note; + } + $script .= $prefix . str_replace( array_keys($this->placeholders), array_values($this->placeholders), $this->customScriptBuilder[$first][$second]) . $sufix; + // clear some memory + if ($unset) + { + unset($this->customScriptBuilder[$first][$second]); + } + } + // if not found return default + if ($default) + { + return $default; + } + return $script; + } + public function setCustomViewListQuery(&$get,$code,$return = true) { if (ComponentbuilderHelper::checkObject($get)) @@ -2303,13 +2329,7 @@ class Interpretation extends Fields $getItem .= "\n\n\t\t//".$this->setLine(__LINE__)." Create a new query object."; $getItem .= "\n\t\t\$query = \$db->getQuery(true);"; // check if there is any custom script - if (isset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_getlistquery'][$code])) - { - $getItem .= "\n\n\t\t//".$this->setLine(__LINE__)." Filtering."; - $getItem .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_getlistquery'][$code]); - // clear some memory - unset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$code]); - } + $getItem .= $this->getCustomScriptBuilder($this->target.'_php_getlistquery', $code, '', "\n\n\t\t//".$this->setLine(__LINE__)." Filtering.", true); // set main get query $getItem .= $this->setCustomViewQuery($get->main_get,$code); // setup filters @@ -3352,10 +3372,7 @@ class Interpretation extends Fields } // add custom php to getitem method - if (isset($this->customScriptBuilder['php_getitem'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_getitem'][$view])) - { - $script .= "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_getitem'][$view]); - } + $script .= $this->getCustomScriptBuilder('php_getitem', $view, "\n\n"); return $script; } @@ -3459,43 +3476,9 @@ class Interpretation extends Fields } } // add custom PHP to the save method - if(isset($this->customScriptBuilder['php_save'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_save'][$view])) - { - $script .= "\n\n" . str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_save'][$view]); - } + $script .= $this->getCustomScriptBuilder('php_save', $view, "\n\n"); return $script; } - - public function setJmodelAdminBeforeDelete($view) - { - // add custom PHP to the delete Method - if(isset($this->customScriptBuilder['php_before_delete'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_before_delete'][$view])) - { - return "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_before_delete'][$view]); - } - return ""; - } - - public function setJmodelAdminAfterDelete($view) - { - // add custom PHP to the delete Method - if(isset($this->customScriptBuilder['php_after_delete'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_after_delete'][$view])) - { - return "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_after_delete'][$view]); - } - return ""; - } - - public function setPostSaveHook($view) - { - // add custom PHP to the post save hook Method - if(isset($this->customScriptBuilder['php_postsavehook'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_postsavehook'][$view])) - { - return "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_postsavehook'][$view])."\n\n\t\treturn;"; - } - return "\n\t\treturn;"; - - } public function setJtableConstructor($view) { @@ -4068,14 +4051,7 @@ class Interpretation extends Fields $title = $this->titleBuilder[$viewName_single]; } // prepare custom script - if (isset($this->customScriptBuilder['php_batchmove'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_batchmove'][$viewName_single])) - { - $customScript = "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_batchmove'][$viewName_single]); - } - else - { - $customScript = ''; - } + $customScript = $this->getCustomScriptBuilder('php_batchmove', $viewName_single, "\n\n", null, true); $batchmove[] = "\n\t/**"; $batchmove[] = "\t * Batch move items to a new category"; @@ -4265,14 +4241,7 @@ class Interpretation extends Fields $title = $this->titleBuilder[$viewName_single]; } // prepare custom script - if (isset($this->customScriptBuilder['php_batchcopy'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_batchcopy'][$viewName_single])) - { - $customScript = "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_batchcopy'][$viewName_single]); - } - else - { - $customScript = ''; - } + $customScript = $this->getCustomScriptBuilder('php_batchcopy', $viewName_single, "\n\n", null, true); $batchcopy[] = "\n\t/**"; $batchcopy[] = "\t * Batch copy items to a new category or current."; @@ -4672,7 +4641,11 @@ class Interpretation extends Fields { $default = $data['other']; } - if ($default == 'DATETIME' || $default == 'CURRENT_TIMESTAMP') + if ($default == 'EMPTY') + { + $default = $data['null_switch']; + } + elseif ($default == 'DATETIME' || $default == 'CURRENT_TIMESTAMP') { $default = $default.' '.$data['null_switch']; } @@ -4690,7 +4663,7 @@ class Interpretation extends Fields } // set the lenght $lenght = ''; - if ($data['lenght'] == 'Other' && isset($data['lenght_other']) && $data['lenght_other'] > 0) + if (isset($data['lenght']) && $data['lenght'] == 'Other' && isset($data['lenght_other']) && $data['lenght_other'] > 0) { $lenght = '('.$data['lenght_other'].')'; } @@ -4704,7 +4677,7 @@ class Interpretation extends Fields // check if default field was over written if (!isset($this->fieldsNames[$view]['params'])) { - $db .= "\n\t`params` TEXT NOT NULL DEFAULT '',"; + $db .= "\n\t`params` TEXT NOT NULL,"; } // check if default field was over written if (!isset($this->fieldsNames[$view]['published'])) @@ -5250,7 +5223,7 @@ class Interpretation extends Fields $coreLoadLink = true; } // check if the item has permissions. - if ($coreLoadLink && isset($this->permissionBuilder[$coreLink['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$coreLink['core.edit']]) && in_array($item['custom']['view'],$this->permissionBuilder[$coreLink['core.edit']])) + if ($coreLoadLink && (isset($coreLink['core.edit']) && isset($this->permissionBuilder[$coreLink['core.edit']])) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$coreLink['core.edit']]) && in_array($item['custom']['view'],$this->permissionBuilder[$coreLink['core.edit']])) { $accessCheck = "\$this->user->authorise('".$coreLink['core.edit']."', 'com_".$this->fileContentStatic['###component###'].".".$item['custom']['view'].".' . (int)\$item->".$item['id'].")"; } @@ -6690,10 +6663,7 @@ class Interpretation extends Fields $query .= "\n\t\t\$query->join('LEFT', \$db->quoteName('#__categories', 'c') . ' ON (' . \$db->quoteName('a.".$categoryCodeName."') . ' = ' . \$db->quoteName('c.id') . ')');"; } // add custom filtering php - if (isset($this->customScriptBuilder['php_getlistquery'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_getlistquery'][$viewName_single])) - { - $query .= "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_getlistquery'][$viewName_single]); - } + $query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, "\n\n"); // add the custom fields query $query .= $this->setCustomQuery($viewName_list, $viewName_single); if ($key && strpos($key,'-R>') === false && strpos($key,'-A>') === false && strpos($parentKey,'-R>') === false && strpos($parentKey,'-A>') === false) @@ -6742,7 +6712,6 @@ class Interpretation extends Fields $query .= $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###'],"\t"); // ###SELECTIONTRANSLATIONFIX### <<>> $query .= $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###'],"\t"); - // filter by child repetable field values if ($key && strpos($key,'-R>') !== false && strpos($key,'-A>') === false) { @@ -6846,6 +6815,8 @@ class Interpretation extends Fields $query .= "\n\t\t\t\treturn false;"; $query .= "\n\t\t\t}"; } + // add custom php to getitems method after all + $query .= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n\n\t"); $query .= "\n\t\t\treturn \$items;"; $query .= "\n\t\t}"; @@ -6972,10 +6943,8 @@ class Interpretation extends Fields $query .= "\n\t\t\t\$query->from(\$db->quoteName('#__".$this->fileContentStatic['###component###']."_".$viewName_single."', 'a'));"; $query .= "\n\t\t\t\$query->where('a.id IN (' . implode(',',\$pks) . ')');"; // add custom filtering php - if (isset($this->customScriptBuilder['php_getlistquery'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_getlistquery'][$viewName_single])) - { - $query .= "\n\n\t".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_getlistquery'][$viewName_single]); - } + $query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, "\n\n\t"); + if (isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single])) { $query .= "\n\t\t\t//".$this->setLine(__LINE__)." Implement View Level Access"; @@ -6994,6 +6963,8 @@ class Interpretation extends Fields $query .= "\n\t\t\t{"; $query .= "\n\t\t\t\t\$items = \$db->loadObjectList();"; $query .= $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###'],"\t\t",true); + // add custom php to getitems method after all + $query .= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n\n\t\t"); $query .= "\n\t\t\t\treturn \$items;"; $query .= "\n\t\t\t}"; $query .= "\n\t\t}"; @@ -7169,36 +7140,17 @@ class Interpretation extends Fields $target = array('admin' => 'import_'.$viewName_list); $this->buildDynamique($target,'customimport'); // load the custom script to the files - if (isset($this->customScriptBuilder['php_import_display']['import_'.$viewName_list])) - { - // ###IMPORT_DISPLAY_METHOD_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DISPLAY_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_display']['import_'.$viewName_list]); - unset($this->customScriptBuilder['php_import_display']['import_'.$viewName_list]); - } - if (isset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list])) - { - // ###IMPORT_SETDATE_METHOD_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]); - unset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]); - } - if (isset($this->customScriptBuilder['php_import']['import_'.$viewName_list])) - { - // ###IMPORT_METHOD_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import']['import_'.$viewName_list]); - unset($this->customScriptBuilder['php_import']['import_'.$viewName_list]); - } - if (isset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list])) - { - // ###IMPORT_SAVE_METHOD_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_save']['import_'.$viewName_list]); - unset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]); - } - if (isset($this->customScriptBuilder['html_import_view']['import_'.$viewName_list])) - { - // ###IMPORT_DEFAULT_VIEW_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DEFAULT_VIEW_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['html_import_view']['import_'.$viewName_list]); - unset($this->customScriptBuilder['html_import_view']['import_'.$viewName_list]); - } + // ###IMPORT_DISPLAY_METHOD_CUSTOM### <<>> + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DISPLAY_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_display', 'import_'.$viewName_list, "\n", null, true); + // ###IMPORT_SETDATE_METHOD_CUSTOM### <<>> + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_setdata', 'import_'.$viewName_list, "\n", null, true); + // ###IMPORT_METHOD_CUSTOM### <<>> + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import', 'import_'.$viewName_list, "\n", null, true); + // ###IMPORT_SAVE_METHOD_CUSTOM### <<>> + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_save', 'import_'.$viewName_list, "\n", null, true); + // ###IMPORT_DEFAULT_VIEW_CUSTOM### <<>> + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DEFAULT_VIEW_CUSTOM###'] = $this->getCustomScriptBuilder('html_import_view', 'import_'.$viewName_list, "\n", null, true); + // insure we have the view placeholders setup $this->fileContentDynamic['import_'.$viewName_list]['###VIEW###'] = 'IMPORT_'.$this->placeholders['###VIEWS###']; $this->fileContentDynamic['import_'.$viewName_list]['###View###'] = 'Import_'.$this->placeholders['###views###']; @@ -7241,10 +7193,7 @@ class Interpretation extends Fields $query .= "\n\t\t\$query->join('LEFT', \$db->quoteName('#__categories', 'c') . ' ON (' . \$db->quoteName('a.".$categoryCodeName."') . ' = ' . \$db->quoteName('c.id') . ')');"; } // add custom filtering php - if (isset($this->customScriptBuilder['php_getlistquery'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_getlistquery'][$viewName_single])) - { - $query .= "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_getlistquery'][$viewName_single]); - } + $query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, "\n\n"); // add the custom fields query $query .= $this->setCustomQuery($viewName_list, $viewName_single); $query .= "\n\n\t\t//".$this->setLine(__LINE__)." Filter by published state"; @@ -9133,14 +9082,7 @@ class Interpretation extends Fields // set component name $component = ComponentbuilderHelper::safeString($this->componentData->name_code); // prepare custom permission script - if (isset($this->customScriptBuilder['php_allowedit'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_allowedit'][$viewName_single])) - { - $customAllow = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_allowedit'][$viewName_single]); - } - else - { - $customAllow = ''; - } + $customAllow = $this->getCustomScriptBuilder('php_allowedit', $viewName_single, null, true); // setup correct core target $coreLoad = false; if (isset($this->permissionCore[$viewName_single])) @@ -9565,14 +9507,7 @@ class Interpretation extends Fields // set component name $component = ComponentbuilderHelper::safeString($this->componentData->name_code); // prepare custom permission script - if (isset($this->customScriptBuilder['php_allowedit'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_allowedit'][$viewName_single])) - { - $customAllow = "\t\t\$recordId\t= (int) isset(\$data[\$key]) ? \$data[\$key] : 0;\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_allowedit'][$viewName_single]); - } - else - { - $customAllow = ''; - } + $customAllow = $this->getCustomScriptBuilder('php_allowedit', $viewName_single, "\t\t\$recordId\t= (int) isset(\$data[\$key]) ? \$data[\$key] : 0;\n"); // setup correct core target $coreLoad = false; if (isset($this->permissionCore[$viewName_single])) @@ -9668,7 +9603,7 @@ class Interpretation extends Fields $allow[] = "\t\t\t\treturn;"; $allow[] = "\t\t\t}"; // check if the item has permissions. - if ($coreLoad && isset($this->permissionBuilder[$core['core.delete']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.delete']]) && in_array($viewName_single,$this->permissionBuilder[$core['core.delete']])) + if ($coreLoad && (isset($core['core.delete']) && isset($this->permissionBuilder[$core['core.delete']])) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$core['core.delete']]) && in_array($viewName_single,$this->permissionBuilder[$core['core.delete']])) { $allow[] = "\n\t\t\t\$user = JFactory::getUser();"; $allow[] = "\t\t\t//".$this->setLine(__LINE__)." The record has been set. Check the record permissions."; @@ -10163,14 +10098,28 @@ class Interpretation extends Fields $toolBar .= "\n\t\t\t\t\t\tJToolBarHelper::custom('".$viewName.".save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);"; $toolBar .= "\n\t\t\t\t\t}"; $toolBar .= "\n\t\t\t\t}"; - if ($coreLoad && isset($this->historyBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->historyBuilder[$viewName])) - { - $toolBar .= "\n\t\t\t\t\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('".$core['core.version']."'));"; - $toolBar .= "\n\t\t\t\tif (\$this->state->params->get('save_history', 1) && \$this->canDo->get('".$core['core.edit']."') && \$canVersion)"; - $toolBar .= "\n\t\t\t\t{"; - $toolBar .= "\n\t\t\t\t\tJToolbarHelper::versions('com_".$this->fileContentStatic['###component###'].".".$viewName."', \$this->item->id);"; - $toolBar .= "\n\t\t\t\t}"; - } + if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName,$this->permissionBuilder['global'][$core['core.edit']])) + { + if ($coreLoad && isset($this->historyBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->historyBuilder[$viewName])) + { + $toolBar .= "\n\t\t\t\t\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('".$core['core.version']."'));"; + $toolBar .= "\n\t\t\t\tif (\$this->state->params->get('save_history', 1) && \$this->canDo->get('".$core['core.edit']."') && \$canVersion)"; + $toolBar .= "\n\t\t\t\t{"; + $toolBar .= "\n\t\t\t\t\tJToolbarHelper::versions('com_".$this->fileContentStatic['###component###'].".".$viewName."', \$this->item->id);"; + $toolBar .= "\n\t\t\t\t}"; + } + } + else + { + if ($coreLoad && isset($this->historyBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->historyBuilder[$viewName])) + { + $toolBar .= "\n\t\t\t\t\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('".$core['core.version']."'));"; + $toolBar .= "\n\t\t\t\tif (\$this->state->params->get('save_history', 1) && \$this->canDo->get('core.edit') && \$canVersion)"; + $toolBar .= "\n\t\t\t\t{"; + $toolBar .= "\n\t\t\t\t\tJToolbarHelper::versions('com_".$this->fileContentStatic['###component###'].".".$viewName."', \$this->item->id);"; + $toolBar .= "\n\t\t\t\t}"; + } + } if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($viewName,$this->permissionBuilder['global'][$core['core.create']])) { $toolBar .= "\n\t\t\t\tif (\$this->canDo->get('".$core['core.create']."'))"; @@ -10662,10 +10611,7 @@ class Interpretation extends Fields } // add custom php to getitems method - if (isset($this->customScriptBuilder['php_getitems'][$view]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_getitems'][$view])) - { - $fix .= "\n\n".$tab."".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_getitems'][$view]); - } + $fix .= $this->getCustomScriptBuilder('php_getitems', $view, "\n\n".$tab); if ($basicCrypt) { @@ -12756,7 +12702,7 @@ for developing fast and powerful web interfaces. For more info visit permissions)) + if (isset($view['settings']->permissions) && ComponentbuilderHelper::checkArray($view['settings']->permissions)) { array_push($view['settings']->permissions,$menucontrollerView); } diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index 9e05b9dd8..791b45bbc 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -50,6 +50,23 @@ class Infusion extends Interpretation return false; } + /** + * Set the line number in comments + * + * @param int $nr The line number + * + * @return void + * + */ + private function setLine($nr) + { + if ($this->loadLineNr) + { + return ' [Infusion '.$nr.']'; + } + return ''; + } + /** * Build the content for the structure * @@ -293,10 +310,10 @@ class Infusion extends Interpretation $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] = ''; // ###JMODELADMIN_BEFORE_DELETE### <<>> - $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->setJmodelAdminBeforeDelete($viewName_single); + $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->getCustomScriptBuilder('php_before_delete', $viewName_single, "\n"); // ###JMODELADMIN_AFTER_DELETE### <<>> - $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->setJmodelAdminAfterDelete($viewName_single); + $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->getCustomScriptBuilder('php_after_delete', $viewName_single, "\n\n"); // ###CHECKBOX_SAVE### <<>> $this->fileContentDynamic[$viewName_single]['###CHECKBOX_SAVE###'] = $this->setCheckboxSave($viewName_single); @@ -305,7 +322,7 @@ class Infusion extends Interpretation $this->fileContentDynamic[$viewName_single]['###METHOD_ITEM_SAVE###'] = $this->setMethodItemSave($viewName_single); // ###POSTSAVEHOOK### <<>> - $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->setPostSaveHook($viewName_single); + $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, "\n", null, true, "\n\t\treturn;", "\n\n\t\treturn;"); if (isset($this->customScriptBuilder['css_view'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single])) { @@ -383,8 +400,11 @@ class Infusion extends Interpretation $this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = ''; } - // ###STORE_METHOD_FIX### <<>> + // ###GET_ITEMS_METHOD_STRING_FIX### <<>> $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###'] = $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###']); + + // ###GET_ITEMS_METHOD_AFTER_ALL### <<>> + $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###'] = $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n"); // ###SELECTIONTRANSLATIONFIX### <<>> $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###'] = $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###']); diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 4a4d7b132..e519ff15e 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 6c5886d1c..aa425b8cd 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 222e31af0..f9c5c893e 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index 54a3f8c96..e9a701fa2 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 47e56f92d..75dbdca8e 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 2d33ba716..222e8b9ab 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -103,7 +103,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL="Add PHP (custom document script)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM="Add Php Getitem" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS="Add Php Getitems" -COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL="Add PHP (getItems Method)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL="Add Php Getitems After All" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL="Add PHP (getItems Method - after all)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL="Add PHP (getItems Method - before translation fix & decryption)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM_LABEL="Add PHP (getItem Method)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY="Add Php Getlistquery" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL="Add PHP (getListQuery - JModelList)" @@ -312,6 +314,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_HINT="// add custom PHP script to t COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL="Custom Script (Document)" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM="Php Getitem" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS="Php Getitems" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL="Php Getitems After All" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_DESCRIPTION="Add your PHP here! [Do not add the php tags]" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_HINT="// PHP Here that should run in the getItems Method (array) $items is where all values are" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_LABEL="PHP" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_HINT="// PHP Here that should run in the getItems Method (array) $items is where all values are" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_LABEL="PHP" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 4409fea4e..0505f82dc 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index b35f4744d..c7fe4aad7 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php index eb072ad4d..8d21895a5 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -29,7 +29,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vxffields; +$items = $displayData->vxgfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index f5af1114d..0751e8967 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index 45a3c718a..fdf73158a 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index 180124f78..23582930d 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index 6cbe71998..b5ffd2432 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php @@ -38,6 +38,8 @@ $fields = $displayData->get('fields') ?: array( 'php_getitem', 'add_php_getitems', 'php_getitems', + 'add_php_getitems_after_all', + 'php_getitems_after_all', 'add_php_getlistquery', 'php_getlistquery', 'add_php_save', diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index 3990ad649..73cfa1b8e 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index 815d041ae..f6bdf89ab 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php index a3922f3f5..e1ed1bd2e 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_above.php diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php index af50d93f1..c2f2a8fac 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php index d02d8fe03..353569dc5 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index 27d489e55..a6ec1610b 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_under.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 51bde8274..e7f0cd945 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/component/admin_views_fullwidth.php b/admin/layouts/component/admin_views_fullwidth.php index 4f5559581..3bec12da9 100644 --- a/admin/layouts/component/admin_views_fullwidth.php +++ b/admin/layouts/component/admin_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/component/details_above.php b/admin/layouts/component/details_above.php index 2c2a9028b..71d1133fc 100644 --- a/admin/layouts/component/details_above.php +++ b/admin/layouts/component/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/component/details_left.php b/admin/layouts/component/details_left.php index 032465b40..9ddcb740d 100644 --- a/admin/layouts/component/details_left.php +++ b/admin/layouts/component/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/component/details_right.php b/admin/layouts/component/details_right.php index 5123acf22..7f4b5097c 100644 --- a/admin/layouts/component/details_right.php +++ b/admin/layouts/component/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/component/details_under.php b/admin/layouts/component/details_under.php index dda67f2c9..1608882b1 100644 --- a/admin/layouts/component/details_under.php +++ b/admin/layouts/component/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/component/ftp_servers_fullwidth.php b/admin/layouts/component/ftp_servers_fullwidth.php index a5d4202d0..39b53c1d9 100644 --- a/admin/layouts/component/ftp_servers_fullwidth.php +++ b/admin/layouts/component/ftp_servers_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage ftp_servers_fullwidth.php diff --git a/admin/layouts/component/publishing.php b/admin/layouts/component/publishing.php index 3990ad649..73cfa1b8e 100644 --- a/admin/layouts/component/publishing.php +++ b/admin/layouts/component/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/component/publlshing.php b/admin/layouts/component/publlshing.php index 815d041ae..f6bdf89ab 100644 --- a/admin/layouts/component/publlshing.php +++ b/admin/layouts/component/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/component/readme_left.php b/admin/layouts/component/readme_left.php index dc7214744..14ea0b5ae 100644 --- a/admin/layouts/component/readme_left.php +++ b/admin/layouts/component/readme_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/component/readme_right.php b/admin/layouts/component/readme_right.php index 7127ac62e..f9df600db 100644 --- a/admin/layouts/component/readme_right.php +++ b/admin/layouts/component/readme_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/component/scripts_fullwidth.php b/admin/layouts/component/scripts_fullwidth.php index c74aa1859..b2db43e88 100644 --- a/admin/layouts/component/scripts_fullwidth.php +++ b/admin/layouts/component/scripts_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage scripts_fullwidth.php diff --git a/admin/layouts/component/settings_left.php b/admin/layouts/component/settings_left.php index c796f38b8..528a85196 100644 --- a/admin/layouts/component/settings_left.php +++ b/admin/layouts/component/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/component/settings_right.php b/admin/layouts/component/settings_right.php index 3552ba5a4..eadd17557 100644 --- a/admin/layouts/component/settings_right.php +++ b/admin/layouts/component/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/component/site_views_fullwidth.php b/admin/layouts/component/site_views_fullwidth.php index 6cfc3f748..86bac1272 100644 --- a/admin/layouts/component/site_views_fullwidth.php +++ b/admin/layouts/component/site_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index ba4c2c44c..cfbe935a6 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index 47d6afaa2..3ed6acb34 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index 018fb7098..01ef6f8b5 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index 2c2a9028b..71d1133fc 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index 440fecf72..2e665f0e2 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index dd6ed6439..fa3e8d9b2 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index d99c5387a..d94eac917 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index 3c88a18e2..987f087ec 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index dda67f2c9..1608882b1 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 3990ad649..73cfa1b8e 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index 815d041ae..f6bdf89ab 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index 0fd2c27d8..1c3bb7b0e 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index 0421251be..757b106c8 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index c8ba410ea..a5dd58ea6 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index 7380f6be7..e0ccd7d3d 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_above.php diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index c32220944..152139eaa 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index f4bf51cda..e017530ef 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_left.php diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index 69f1f201b..39b105f67 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_right.php diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index a572f3b2d..1318cb20f 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 3990ad649..73cfa1b8e 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index 815d041ae..f6bdf89ab 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index 9b196f4f1..4c88cc649 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index 9a167275a..84574ff85 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index 62f69199d..f720f61ba 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index dda67f2c9..1608882b1 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 3990ad649..73cfa1b8e 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index 815d041ae..f6bdf89ab 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index 45cbe688a..f68322a71 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index 9dd049485..462f866bc 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 7d81451a0..2965ce6ed 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index 40e828ad1..504885821 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 54b0aa3f8..68dade800 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -29,7 +29,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vzafields; +$items = $displayData->vzcfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index 3990ad649..73cfa1b8e 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index 815d041ae..f6bdf89ab 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index eb5a5e120..5235bb63f 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 5c4d24a40..ce31a25c0 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 6ff5594a4..25b273d56 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index d38747517..cf261721f 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index dda67f2c9..1608882b1 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 3990ad649..73cfa1b8e 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 7499eee3a..36de7b4db 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index b5dacd6cb..39393aeed 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index 09603bea7..11b65f89c 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index dd6ed6439..fa3e8d9b2 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index e45f3f236..2c6d8eb46 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index a98a82d26..16d12f15d 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index dda67f2c9..1608882b1 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index 3990ad649..73cfa1b8e 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index 815d041ae..f6bdf89ab 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index f2d4d03f9..bc210b209 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index 2c2a9028b..71d1133fc 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index 440fecf72..2e665f0e2 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index dd6ed6439..fa3e8d9b2 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index e45f3f236..2c6d8eb46 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index 3c88a18e2..987f087ec 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index dda67f2c9..1608882b1 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index 54c9b96a1..37bb18cfd 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 6c6cfdf8f..ff5a57361 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index 3990ad649..73cfa1b8e 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index 815d041ae..f6bdf89ab 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index 949bc585f..6e161e0b2 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index 00639a079..a6e87e963 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index 9a25065f5..5f3248e28 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index 3990ad649..73cfa1b8e 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index 815d041ae..f6bdf89ab 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index b5dacd6cb..39393aeed 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index 0edf34755..9d9ccb91a 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index dd6ed6439..fa3e8d9b2 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index e45f3f236..2c6d8eb46 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index a98a82d26..16d12f15d 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index dda67f2c9..1608882b1 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index 3990ad649..73cfa1b8e 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index 815d041ae..f6bdf89ab 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index d8a667d14..3fc5be201 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -102,10 +102,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_allowedit = base64_decode($item->php_allowedit); } - if (!empty($item->php_getitems)) + if (!empty($item->php_getitems_after_all)) { - // base64 Decode php_getitems. - $item->php_getitems = base64_decode($item->php_getitems); + // base64 Decode php_getitems_after_all. + $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); } if (!empty($item->php_after_delete)) @@ -132,10 +132,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_import_setdata = base64_decode($item->php_import_setdata); } - if (!empty($item->php_getitem)) + if (!empty($item->php_getitems)) { - // base64 Decode php_getitem. - $item->php_getitem = base64_decode($item->php_getitem); + // base64 Decode php_getitems. + $item->php_getitems = base64_decode($item->php_getitems); } if (!empty($item->php_getlistquery)) @@ -238,6 +238,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin { // base64 Decode php_import_save. $item->php_import_save = base64_decode($item->php_import_save); + } + + if (!empty($item->php_getitem)) + { + // base64 Decode php_getitem. + $item->php_getitem = base64_decode($item->php_getitem); } if (!empty($item->id)) @@ -256,7 +262,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxffields() + public function getVxgfields() { // Get the user object. $user = JFactory::getUser(); @@ -325,13 +331,13 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVxffields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVxgfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVxffields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVxgfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVxffields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVxgfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVxffields($item->store, 'store'); + $item->store = $this->selectionTranslationVxgfields($item->store, 'store'); } } @@ -366,7 +372,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVxffields($value,$name) + public function selectionTranslationVxgfields($value,$name) { // Array of datatype language strings if ($name == 'datatype') @@ -1135,10 +1141,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_allowedit'] = base64_encode($data['php_allowedit']); } - // Set the php_getitems string to base64 string. - if (isset($data['php_getitems'])) + // Set the php_getitems_after_all string to base64 string. + if (isset($data['php_getitems_after_all'])) { - $data['php_getitems'] = base64_encode($data['php_getitems']); + $data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']); } // Set the php_after_delete string to base64 string. @@ -1165,10 +1171,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_import_setdata'] = base64_encode($data['php_import_setdata']); } - // Set the php_getitem string to base64 string. - if (isset($data['php_getitem'])) + // Set the php_getitems string to base64 string. + if (isset($data['php_getitems'])) { - $data['php_getitem'] = base64_encode($data['php_getitem']); + $data['php_getitems'] = base64_encode($data['php_getitems']); } // Set the php_getlistquery string to base64 string. @@ -1271,6 +1277,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin if (isset($data['php_import_save'])) { $data['php_import_save'] = base64_encode($data['php_import_save']); + } + + // Set the php_getitem string to base64 string. + if (isset($data['php_getitem'])) + { + $data['php_getitem'] = base64_encode($data['php_getitem']); } // Set the Params Items to data diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index aebeeaf9a..7111aa7cb 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php @@ -131,7 +131,7 @@ class ComponentbuilderModelAdmin_views extends JModelList } } - } + } // return items return $items; @@ -265,8 +265,8 @@ class ComponentbuilderModelAdmin_views extends JModelList // decode php_allowedit $item->php_allowedit = base64_decode($item->php_allowedit); - // decode php_getitems - $item->php_getitems = base64_decode($item->php_getitems); + // decode php_getitems_after_all + $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); // decode php_after_delete $item->php_after_delete = base64_decode($item->php_after_delete); // decode php_save @@ -275,8 +275,8 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->php_batchmove = base64_decode($item->php_batchmove); // decode php_import_setdata $item->php_import_setdata = base64_decode($item->php_import_setdata); - // decode php_getitem - $item->php_getitem = base64_decode($item->php_getitem); + // decode php_getitems + $item->php_getitems = base64_decode($item->php_getitems); // decode php_getlistquery $item->php_getlistquery = base64_decode($item->php_getlistquery); // decode php_postsavehook @@ -311,6 +311,8 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->html_import_view = base64_decode($item->html_import_view); // decode php_import_save $item->php_import_save = base64_decode($item->php_import_save); + // decode php_getitem + $item->php_getitem = base64_decode($item->php_getitem); // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 0c8e8d277..2d8dd5d8a 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage ajax.php diff --git a/admin/models/compiler.php b/admin/models/compiler.php index d2aaad297..224f507cc 100644 --- a/admin/models/compiler.php +++ b/admin/models/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage compiler.php diff --git a/admin/models/component.php b/admin/models/component.php index a20187039..dd69c90b6 100644 --- a/admin/models/component.php +++ b/admin/models/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 11b61ed39..e14394aec 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/components.php b/admin/models/components.php index 8a694dfb6..1ecb95988 100644 --- a/admin/models/components.php +++ b/admin/models/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.php @@ -122,7 +122,7 @@ class ComponentbuilderModelComponents extends JModelList $this->checkInNow(); // load parent items - $items = parent::getItems(); + $items = parent::getItems(); // return items return $items; diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 1bccf7679..0edce78de 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index 00c1bebf7..734d20286 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.php @@ -131,7 +131,7 @@ class ComponentbuilderModelCustom_admin_views extends JModelList } } - } + } // return items return $items; diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 665df6080..e1e3051b6 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php index 34184a42a..417861bb0 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.php @@ -140,7 +140,7 @@ class ComponentbuilderModelDynamic_gets extends JModelList $item->gettype = $this->selectionTranslation($item->gettype, 'gettype'); } } - + // return items return $items; diff --git a/admin/models/field.php b/admin/models/field.php index 5245f24d0..4a0eb146a 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/models/fields.php b/admin/models/fields.php index e97fe9a7d..d4d5f457b 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php @@ -168,7 +168,7 @@ class ComponentbuilderModelFields extends JModelList $item->store = $this->selectionTranslation($item->store, 'store'); } } - + // return items return $items; diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 423142051..8479a0fc7 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 010d07a9c..418a94c46 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index f59a93c65..4a0b127cc 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index 2e384284a..e20dab728 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 83105ab9c..99a9b9b6f 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index 19c190b73..246546afd 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index 3ec07ce41..fbbd9b7b8 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index c1b058973..94e4102a4 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 418aad7a8..f76b2900e 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index 2281e8ee8..9e521a284 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 94fc788b2..11847e6f9 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 0f3393219..a4c1851b0 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index 1f672cd19..8b20aa783 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index e4d86d252..6194e7c5d 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index b4fdc5c16..ec9e61486 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php @@ -112,7 +112,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVzafields() + public function getVzcfields() { // Get the user object. $user = JFactory::getUser(); @@ -196,13 +196,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVzafields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVzcfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVzafields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVzcfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVzafields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVzcfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVzafields($item->store, 'store'); + $item->store = $this->selectionTranslationVzcfields($item->store, 'store'); } } @@ -216,7 +216,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVzafields($value,$name) + public function selectionTranslationVzcfields($value,$name) { // Array of datatype language strings if ($name == 'datatype') diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php index 6ec0ad628..af891a651 100644 --- a/admin/models/fieldtypes.php +++ b/admin/models/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php @@ -135,7 +135,7 @@ class ComponentbuilderModelFieldtypes extends JModelList } } - } + } // return items return $items; diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 6993d8f63..63e7d3d11 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js @@ -44,11 +44,12 @@ jform_vvvvvwyvww_required = false; jform_vvvvvwzvwx_required = false; jform_vvvvvxavwy_required = false; jform_vvvvvxbvwz_required = false; -jform_vvvvvxfvxa_required = false; -jform_vvvvvxfvxb_required = false; -jform_vvvvvxfvxc_required = false; -jform_vvvvvxfvxd_required = false; -jform_vvvvvxfvxe_required = false; +jform_vvvvvxcvxa_required = false; +jform_vvvvvxgvxb_required = false; +jform_vvvvvxgvxc_required = false; +jform_vvvvvxgvxd_required = false; +jform_vvvvvxgvxe_required = false; +jform_vvvvvxgvxf_required = false; // Initial Script jQuery(document).ready(function() @@ -80,49 +81,52 @@ jQuery(document).ready(function() var add_php_getitems_vvvvvwq = jQuery("#jform_add_php_getitems input[type='radio']:checked").val(); vvvvvwq(add_php_getitems_vvvvvwq); - var add_php_getlistquery_vvvvvwr = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); - vvvvvwr(add_php_getlistquery_vvvvvwr); + var add_php_getitems_after_all_vvvvvwr = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val(); + vvvvvwr(add_php_getitems_after_all_vvvvvwr); - var add_php_save_vvvvvws = jQuery("#jform_add_php_save input[type='radio']:checked").val(); - vvvvvws(add_php_save_vvvvvws); + var add_php_getlistquery_vvvvvws = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); + vvvvvws(add_php_getlistquery_vvvvvws); - var add_php_postsavehook_vvvvvwt = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); - vvvvvwt(add_php_postsavehook_vvvvvwt); + var add_php_save_vvvvvwt = jQuery("#jform_add_php_save input[type='radio']:checked").val(); + vvvvvwt(add_php_save_vvvvvwt); - var add_php_allowedit_vvvvvwu = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); - vvvvvwu(add_php_allowedit_vvvvvwu); + var add_php_postsavehook_vvvvvwu = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); + vvvvvwu(add_php_postsavehook_vvvvvwu); - var add_php_batchcopy_vvvvvwv = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); - vvvvvwv(add_php_batchcopy_vvvvvwv); + var add_php_allowedit_vvvvvwv = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); + vvvvvwv(add_php_allowedit_vvvvvwv); - var add_php_batchmove_vvvvvww = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); - vvvvvww(add_php_batchmove_vvvvvww); + var add_php_batchcopy_vvvvvww = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); + vvvvvww(add_php_batchcopy_vvvvvww); - var add_php_before_delete_vvvvvwx = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); - vvvvvwx(add_php_before_delete_vvvvvwx); + var add_php_batchmove_vvvvvwx = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); + vvvvvwx(add_php_batchmove_vvvvvwx); - var add_php_after_delete_vvvvvwy = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); - vvvvvwy(add_php_after_delete_vvvvvwy); + var add_php_before_delete_vvvvvwy = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); + vvvvvwy(add_php_before_delete_vvvvvwy); - var add_php_document_vvvvvwz = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvwz(add_php_document_vvvvvwz); + var add_php_after_delete_vvvvvwz = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); + vvvvvwz(add_php_after_delete_vvvvvwz); - var add_sql_vvvvvxa = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxa(add_sql_vvvvvxa); + var add_php_document_vvvvvxa = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvxa(add_php_document_vvvvvxa); - var source_vvvvvxb = jQuery("#jform_source input[type='radio']:checked").val(); var add_sql_vvvvvxb = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxb(source_vvvvvxb,add_sql_vvvvvxb); + vvvvvxb(add_sql_vvvvvxb); - var source_vvvvvxd = jQuery("#jform_source input[type='radio']:checked").val(); - var add_sql_vvvvvxd = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxd(source_vvvvvxd,add_sql_vvvvvxd); + var source_vvvvvxc = jQuery("#jform_source input[type='radio']:checked").val(); + var add_sql_vvvvvxc = jQuery("#jform_add_sql input[type='radio']:checked").val(); + vvvvvxc(source_vvvvvxc,add_sql_vvvvvxc); - var add_custom_import_vvvvvxf = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); - vvvvvxf(add_custom_import_vvvvvxf); + var source_vvvvvxe = jQuery("#jform_source input[type='radio']:checked").val(); + var add_sql_vvvvvxe = jQuery("#jform_add_sql input[type='radio']:checked").val(); + vvvvvxe(source_vvvvvxe,add_sql_vvvvvxe); var add_custom_import_vvvvvxg = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); vvvvvxg(add_custom_import_vvvvvxg); + + var add_custom_import_vvvvvxh = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvxh(add_custom_import_vvvvvxh); }); // the vvvvvwi function @@ -407,351 +411,382 @@ function vvvvvwq(add_php_getitems_vvvvvwq) } // the vvvvvwr function -function vvvvvwr(add_php_getlistquery_vvvvvwr) +function vvvvvwr(add_php_getitems_after_all_vvvvvwr) { // set the function logic - if (add_php_getlistquery_vvvvvwr == 1) + if (add_php_getitems_after_all_vvvvvwr == 1) { - jQuery('#jform_php_getlistquery').closest('.control-group').show(); + jQuery('#jform_php_getitems_after_all').closest('.control-group').show(); if (jform_vvvvvwrvwp_required) { - updateFieldRequired('php_getlistquery',0); - jQuery('#jform_php_getlistquery').prop('required','required'); - jQuery('#jform_php_getlistquery').attr('aria-required',true); - jQuery('#jform_php_getlistquery').addClass('required'); + updateFieldRequired('php_getitems_after_all',0); + jQuery('#jform_php_getitems_after_all').prop('required','required'); + jQuery('#jform_php_getitems_after_all').attr('aria-required',true); + jQuery('#jform_php_getitems_after_all').addClass('required'); jform_vvvvvwrvwp_required = false; } } else { - jQuery('#jform_php_getlistquery').closest('.control-group').hide(); + jQuery('#jform_php_getitems_after_all').closest('.control-group').hide(); if (!jform_vvvvvwrvwp_required) { - updateFieldRequired('php_getlistquery',1); - jQuery('#jform_php_getlistquery').removeAttr('required'); - jQuery('#jform_php_getlistquery').removeAttr('aria-required'); - jQuery('#jform_php_getlistquery').removeClass('required'); + updateFieldRequired('php_getitems_after_all',1); + jQuery('#jform_php_getitems_after_all').removeAttr('required'); + jQuery('#jform_php_getitems_after_all').removeAttr('aria-required'); + jQuery('#jform_php_getitems_after_all').removeClass('required'); jform_vvvvvwrvwp_required = true; } } } // the vvvvvws function -function vvvvvws(add_php_save_vvvvvws) +function vvvvvws(add_php_getlistquery_vvvvvws) { // set the function logic - if (add_php_save_vvvvvws == 1) + if (add_php_getlistquery_vvvvvws == 1) { - jQuery('#jform_php_save').closest('.control-group').show(); + jQuery('#jform_php_getlistquery').closest('.control-group').show(); if (jform_vvvvvwsvwq_required) { - updateFieldRequired('php_save',0); - jQuery('#jform_php_save').prop('required','required'); - jQuery('#jform_php_save').attr('aria-required',true); - jQuery('#jform_php_save').addClass('required'); + updateFieldRequired('php_getlistquery',0); + jQuery('#jform_php_getlistquery').prop('required','required'); + jQuery('#jform_php_getlistquery').attr('aria-required',true); + jQuery('#jform_php_getlistquery').addClass('required'); jform_vvvvvwsvwq_required = false; } } else { - jQuery('#jform_php_save').closest('.control-group').hide(); + jQuery('#jform_php_getlistquery').closest('.control-group').hide(); if (!jform_vvvvvwsvwq_required) { - updateFieldRequired('php_save',1); - jQuery('#jform_php_save').removeAttr('required'); - jQuery('#jform_php_save').removeAttr('aria-required'); - jQuery('#jform_php_save').removeClass('required'); + updateFieldRequired('php_getlistquery',1); + jQuery('#jform_php_getlistquery').removeAttr('required'); + jQuery('#jform_php_getlistquery').removeAttr('aria-required'); + jQuery('#jform_php_getlistquery').removeClass('required'); jform_vvvvvwsvwq_required = true; } } } // the vvvvvwt function -function vvvvvwt(add_php_postsavehook_vvvvvwt) +function vvvvvwt(add_php_save_vvvvvwt) { // set the function logic - if (add_php_postsavehook_vvvvvwt == 1) + if (add_php_save_vvvvvwt == 1) { - jQuery('#jform_php_postsavehook').closest('.control-group').show(); + jQuery('#jform_php_save').closest('.control-group').show(); if (jform_vvvvvwtvwr_required) { - updateFieldRequired('php_postsavehook',0); - jQuery('#jform_php_postsavehook').prop('required','required'); - jQuery('#jform_php_postsavehook').attr('aria-required',true); - jQuery('#jform_php_postsavehook').addClass('required'); + updateFieldRequired('php_save',0); + jQuery('#jform_php_save').prop('required','required'); + jQuery('#jform_php_save').attr('aria-required',true); + jQuery('#jform_php_save').addClass('required'); jform_vvvvvwtvwr_required = false; } } else { - jQuery('#jform_php_postsavehook').closest('.control-group').hide(); + jQuery('#jform_php_save').closest('.control-group').hide(); if (!jform_vvvvvwtvwr_required) { - updateFieldRequired('php_postsavehook',1); - jQuery('#jform_php_postsavehook').removeAttr('required'); - jQuery('#jform_php_postsavehook').removeAttr('aria-required'); - jQuery('#jform_php_postsavehook').removeClass('required'); + updateFieldRequired('php_save',1); + jQuery('#jform_php_save').removeAttr('required'); + jQuery('#jform_php_save').removeAttr('aria-required'); + jQuery('#jform_php_save').removeClass('required'); jform_vvvvvwtvwr_required = true; } } } // the vvvvvwu function -function vvvvvwu(add_php_allowedit_vvvvvwu) +function vvvvvwu(add_php_postsavehook_vvvvvwu) { // set the function logic - if (add_php_allowedit_vvvvvwu == 1) + if (add_php_postsavehook_vvvvvwu == 1) { - jQuery('#jform_php_allowedit').closest('.control-group').show(); + jQuery('#jform_php_postsavehook').closest('.control-group').show(); if (jform_vvvvvwuvws_required) { - updateFieldRequired('php_allowedit',0); - jQuery('#jform_php_allowedit').prop('required','required'); - jQuery('#jform_php_allowedit').attr('aria-required',true); - jQuery('#jform_php_allowedit').addClass('required'); + updateFieldRequired('php_postsavehook',0); + jQuery('#jform_php_postsavehook').prop('required','required'); + jQuery('#jform_php_postsavehook').attr('aria-required',true); + jQuery('#jform_php_postsavehook').addClass('required'); jform_vvvvvwuvws_required = false; } } else { - jQuery('#jform_php_allowedit').closest('.control-group').hide(); + jQuery('#jform_php_postsavehook').closest('.control-group').hide(); if (!jform_vvvvvwuvws_required) { - updateFieldRequired('php_allowedit',1); - jQuery('#jform_php_allowedit').removeAttr('required'); - jQuery('#jform_php_allowedit').removeAttr('aria-required'); - jQuery('#jform_php_allowedit').removeClass('required'); + updateFieldRequired('php_postsavehook',1); + jQuery('#jform_php_postsavehook').removeAttr('required'); + jQuery('#jform_php_postsavehook').removeAttr('aria-required'); + jQuery('#jform_php_postsavehook').removeClass('required'); jform_vvvvvwuvws_required = true; } } } // the vvvvvwv function -function vvvvvwv(add_php_batchcopy_vvvvvwv) +function vvvvvwv(add_php_allowedit_vvvvvwv) { // set the function logic - if (add_php_batchcopy_vvvvvwv == 1) + if (add_php_allowedit_vvvvvwv == 1) { - jQuery('#jform_php_batchcopy').closest('.control-group').show(); + jQuery('#jform_php_allowedit').closest('.control-group').show(); if (jform_vvvvvwvvwt_required) { - updateFieldRequired('php_batchcopy',0); - jQuery('#jform_php_batchcopy').prop('required','required'); - jQuery('#jform_php_batchcopy').attr('aria-required',true); - jQuery('#jform_php_batchcopy').addClass('required'); + updateFieldRequired('php_allowedit',0); + jQuery('#jform_php_allowedit').prop('required','required'); + jQuery('#jform_php_allowedit').attr('aria-required',true); + jQuery('#jform_php_allowedit').addClass('required'); jform_vvvvvwvvwt_required = false; } } else { - jQuery('#jform_php_batchcopy').closest('.control-group').hide(); + jQuery('#jform_php_allowedit').closest('.control-group').hide(); if (!jform_vvvvvwvvwt_required) { - updateFieldRequired('php_batchcopy',1); - jQuery('#jform_php_batchcopy').removeAttr('required'); - jQuery('#jform_php_batchcopy').removeAttr('aria-required'); - jQuery('#jform_php_batchcopy').removeClass('required'); + updateFieldRequired('php_allowedit',1); + jQuery('#jform_php_allowedit').removeAttr('required'); + jQuery('#jform_php_allowedit').removeAttr('aria-required'); + jQuery('#jform_php_allowedit').removeClass('required'); jform_vvvvvwvvwt_required = true; } } } // the vvvvvww function -function vvvvvww(add_php_batchmove_vvvvvww) +function vvvvvww(add_php_batchcopy_vvvvvww) { // set the function logic - if (add_php_batchmove_vvvvvww == 1) + if (add_php_batchcopy_vvvvvww == 1) { - jQuery('#jform_php_batchmove').closest('.control-group').show(); + jQuery('#jform_php_batchcopy').closest('.control-group').show(); if (jform_vvvvvwwvwu_required) { - updateFieldRequired('php_batchmove',0); - jQuery('#jform_php_batchmove').prop('required','required'); - jQuery('#jform_php_batchmove').attr('aria-required',true); - jQuery('#jform_php_batchmove').addClass('required'); + updateFieldRequired('php_batchcopy',0); + jQuery('#jform_php_batchcopy').prop('required','required'); + jQuery('#jform_php_batchcopy').attr('aria-required',true); + jQuery('#jform_php_batchcopy').addClass('required'); jform_vvvvvwwvwu_required = false; } } else { - jQuery('#jform_php_batchmove').closest('.control-group').hide(); + jQuery('#jform_php_batchcopy').closest('.control-group').hide(); if (!jform_vvvvvwwvwu_required) { - updateFieldRequired('php_batchmove',1); - jQuery('#jform_php_batchmove').removeAttr('required'); - jQuery('#jform_php_batchmove').removeAttr('aria-required'); - jQuery('#jform_php_batchmove').removeClass('required'); + updateFieldRequired('php_batchcopy',1); + jQuery('#jform_php_batchcopy').removeAttr('required'); + jQuery('#jform_php_batchcopy').removeAttr('aria-required'); + jQuery('#jform_php_batchcopy').removeClass('required'); jform_vvvvvwwvwu_required = true; } } } // the vvvvvwx function -function vvvvvwx(add_php_before_delete_vvvvvwx) +function vvvvvwx(add_php_batchmove_vvvvvwx) { // set the function logic - if (add_php_before_delete_vvvvvwx == 1) + if (add_php_batchmove_vvvvvwx == 1) { - jQuery('#jform_php_before_delete').closest('.control-group').show(); + jQuery('#jform_php_batchmove').closest('.control-group').show(); if (jform_vvvvvwxvwv_required) { - updateFieldRequired('php_before_delete',0); - jQuery('#jform_php_before_delete').prop('required','required'); - jQuery('#jform_php_before_delete').attr('aria-required',true); - jQuery('#jform_php_before_delete').addClass('required'); + updateFieldRequired('php_batchmove',0); + jQuery('#jform_php_batchmove').prop('required','required'); + jQuery('#jform_php_batchmove').attr('aria-required',true); + jQuery('#jform_php_batchmove').addClass('required'); jform_vvvvvwxvwv_required = false; } } else { - jQuery('#jform_php_before_delete').closest('.control-group').hide(); + jQuery('#jform_php_batchmove').closest('.control-group').hide(); if (!jform_vvvvvwxvwv_required) { - updateFieldRequired('php_before_delete',1); - jQuery('#jform_php_before_delete').removeAttr('required'); - jQuery('#jform_php_before_delete').removeAttr('aria-required'); - jQuery('#jform_php_before_delete').removeClass('required'); + updateFieldRequired('php_batchmove',1); + jQuery('#jform_php_batchmove').removeAttr('required'); + jQuery('#jform_php_batchmove').removeAttr('aria-required'); + jQuery('#jform_php_batchmove').removeClass('required'); jform_vvvvvwxvwv_required = true; } } } // the vvvvvwy function -function vvvvvwy(add_php_after_delete_vvvvvwy) +function vvvvvwy(add_php_before_delete_vvvvvwy) { // set the function logic - if (add_php_after_delete_vvvvvwy == 1) + if (add_php_before_delete_vvvvvwy == 1) { - jQuery('#jform_php_after_delete').closest('.control-group').show(); + jQuery('#jform_php_before_delete').closest('.control-group').show(); if (jform_vvvvvwyvww_required) { - updateFieldRequired('php_after_delete',0); - jQuery('#jform_php_after_delete').prop('required','required'); - jQuery('#jform_php_after_delete').attr('aria-required',true); - jQuery('#jform_php_after_delete').addClass('required'); + updateFieldRequired('php_before_delete',0); + jQuery('#jform_php_before_delete').prop('required','required'); + jQuery('#jform_php_before_delete').attr('aria-required',true); + jQuery('#jform_php_before_delete').addClass('required'); jform_vvvvvwyvww_required = false; } } else { - jQuery('#jform_php_after_delete').closest('.control-group').hide(); + jQuery('#jform_php_before_delete').closest('.control-group').hide(); if (!jform_vvvvvwyvww_required) { - updateFieldRequired('php_after_delete',1); - jQuery('#jform_php_after_delete').removeAttr('required'); - jQuery('#jform_php_after_delete').removeAttr('aria-required'); - jQuery('#jform_php_after_delete').removeClass('required'); + updateFieldRequired('php_before_delete',1); + jQuery('#jform_php_before_delete').removeAttr('required'); + jQuery('#jform_php_before_delete').removeAttr('aria-required'); + jQuery('#jform_php_before_delete').removeClass('required'); jform_vvvvvwyvww_required = true; } } } // the vvvvvwz function -function vvvvvwz(add_php_document_vvvvvwz) +function vvvvvwz(add_php_after_delete_vvvvvwz) { // set the function logic - if (add_php_document_vvvvvwz == 1) + if (add_php_after_delete_vvvvvwz == 1) { - jQuery('#jform_php_document').closest('.control-group').show(); + jQuery('#jform_php_after_delete').closest('.control-group').show(); if (jform_vvvvvwzvwx_required) { - updateFieldRequired('php_document',0); - jQuery('#jform_php_document').prop('required','required'); - jQuery('#jform_php_document').attr('aria-required',true); - jQuery('#jform_php_document').addClass('required'); + updateFieldRequired('php_after_delete',0); + jQuery('#jform_php_after_delete').prop('required','required'); + jQuery('#jform_php_after_delete').attr('aria-required',true); + jQuery('#jform_php_after_delete').addClass('required'); jform_vvvvvwzvwx_required = false; } } else { - jQuery('#jform_php_document').closest('.control-group').hide(); + jQuery('#jform_php_after_delete').closest('.control-group').hide(); if (!jform_vvvvvwzvwx_required) { - updateFieldRequired('php_document',1); - jQuery('#jform_php_document').removeAttr('required'); - jQuery('#jform_php_document').removeAttr('aria-required'); - jQuery('#jform_php_document').removeClass('required'); + updateFieldRequired('php_after_delete',1); + jQuery('#jform_php_after_delete').removeAttr('required'); + jQuery('#jform_php_after_delete').removeAttr('aria-required'); + jQuery('#jform_php_after_delete').removeClass('required'); jform_vvvvvwzvwx_required = true; } } } // the vvvvvxa function -function vvvvvxa(add_sql_vvvvvxa) +function vvvvvxa(add_php_document_vvvvvxa) { // set the function logic - if (add_sql_vvvvvxa == 1) + if (add_php_document_vvvvvxa == 1) { - jQuery('#jform_source').closest('.control-group').show(); + jQuery('#jform_php_document').closest('.control-group').show(); if (jform_vvvvvxavwy_required) { - updateFieldRequired('source',0); - jQuery('#jform_source').prop('required','required'); - jQuery('#jform_source').attr('aria-required',true); - jQuery('#jform_source').addClass('required'); + updateFieldRequired('php_document',0); + jQuery('#jform_php_document').prop('required','required'); + jQuery('#jform_php_document').attr('aria-required',true); + jQuery('#jform_php_document').addClass('required'); jform_vvvvvxavwy_required = false; } } else { - jQuery('#jform_source').closest('.control-group').hide(); + jQuery('#jform_php_document').closest('.control-group').hide(); if (!jform_vvvvvxavwy_required) { - updateFieldRequired('source',1); - jQuery('#jform_source').removeAttr('required'); - jQuery('#jform_source').removeAttr('aria-required'); - jQuery('#jform_source').removeClass('required'); + updateFieldRequired('php_document',1); + jQuery('#jform_php_document').removeAttr('required'); + jQuery('#jform_php_document').removeAttr('aria-required'); + jQuery('#jform_php_document').removeClass('required'); jform_vvvvvxavwy_required = true; } } } // the vvvvvxb function -function vvvvvxb(source_vvvvvxb,add_sql_vvvvvxb) +function vvvvvxb(add_sql_vvvvvxb) { // set the function logic - if (source_vvvvvxb == 2 && add_sql_vvvvvxb == 1) + if (add_sql_vvvvvxb == 1) { - jQuery('#jform_sql').closest('.control-group').show(); + jQuery('#jform_source').closest('.control-group').show(); if (jform_vvvvvxbvwz_required) { - updateFieldRequired('sql',0); - jQuery('#jform_sql').prop('required','required'); - jQuery('#jform_sql').attr('aria-required',true); - jQuery('#jform_sql').addClass('required'); + updateFieldRequired('source',0); + jQuery('#jform_source').prop('required','required'); + jQuery('#jform_source').attr('aria-required',true); + jQuery('#jform_source').addClass('required'); jform_vvvvvxbvwz_required = false; } } else { - jQuery('#jform_sql').closest('.control-group').hide(); + jQuery('#jform_source').closest('.control-group').hide(); if (!jform_vvvvvxbvwz_required) { - updateFieldRequired('sql',1); - jQuery('#jform_sql').removeAttr('required'); - jQuery('#jform_sql').removeAttr('aria-required'); - jQuery('#jform_sql').removeClass('required'); + updateFieldRequired('source',1); + jQuery('#jform_source').removeAttr('required'); + jQuery('#jform_source').removeAttr('aria-required'); + jQuery('#jform_source').removeClass('required'); jform_vvvvvxbvwz_required = true; } } } -// the vvvvvxd function -function vvvvvxd(source_vvvvvxd,add_sql_vvvvvxd) +// the vvvvvxc function +function vvvvvxc(source_vvvvvxc,add_sql_vvvvvxc) { // set the function logic - if (source_vvvvvxd == 1 && add_sql_vvvvvxd == 1) + if (source_vvvvvxc == 2 && add_sql_vvvvvxc == 1) + { + jQuery('#jform_sql').closest('.control-group').show(); + if (jform_vvvvvxcvxa_required) + { + updateFieldRequired('sql',0); + jQuery('#jform_sql').prop('required','required'); + jQuery('#jform_sql').attr('aria-required',true); + jQuery('#jform_sql').addClass('required'); + jform_vvvvvxcvxa_required = false; + } + + } + else + { + jQuery('#jform_sql').closest('.control-group').hide(); + if (!jform_vvvvvxcvxa_required) + { + updateFieldRequired('sql',1); + jQuery('#jform_sql').removeAttr('required'); + jQuery('#jform_sql').removeAttr('aria-required'); + jQuery('#jform_sql').removeClass('required'); + jform_vvvvvxcvxa_required = true; + } + } +} + +// the vvvvvxe function +function vvvvvxe(source_vvvvvxe,add_sql_vvvvvxe) +{ + // set the function logic + if (source_vvvvvxe == 1 && add_sql_vvvvvxe == 1) { jQuery('#jform_addtables').closest('.control-group').show(); } @@ -761,120 +796,120 @@ function vvvvvxd(source_vvvvvxd,add_sql_vvvvvxd) } } -// the vvvvvxf function -function vvvvvxf(add_custom_import_vvvvvxf) +// the vvvvvxg function +function vvvvvxg(add_custom_import_vvvvvxg) { // set the function logic - if (add_custom_import_vvvvvxf == 1) + if (add_custom_import_vvvvvxg == 1) { jQuery('#jform_html_import_view').closest('.control-group').show(); - if (jform_vvvvvxfvxa_required) + if (jform_vvvvvxgvxb_required) { updateFieldRequired('html_import_view',0); jQuery('#jform_html_import_view').prop('required','required'); jQuery('#jform_html_import_view').attr('aria-required',true); jQuery('#jform_html_import_view').addClass('required'); - jform_vvvvvxfvxa_required = false; + jform_vvvvvxgvxb_required = false; } jQuery('.note_advanced_import').closest('.control-group').show(); jQuery('#jform_php_import_display').closest('.control-group').show(); - if (jform_vvvvvxfvxb_required) + if (jform_vvvvvxgvxc_required) { updateFieldRequired('php_import_display',0); jQuery('#jform_php_import_display').prop('required','required'); jQuery('#jform_php_import_display').attr('aria-required',true); jQuery('#jform_php_import_display').addClass('required'); - jform_vvvvvxfvxb_required = false; + jform_vvvvvxgvxc_required = false; } jQuery('#jform_php_import').closest('.control-group').show(); - if (jform_vvvvvxfvxc_required) + if (jform_vvvvvxgvxd_required) { updateFieldRequired('php_import',0); jQuery('#jform_php_import').prop('required','required'); jQuery('#jform_php_import').attr('aria-required',true); jQuery('#jform_php_import').addClass('required'); - jform_vvvvvxfvxc_required = false; + jform_vvvvvxgvxd_required = false; } jQuery('#jform_php_import_save').closest('.control-group').show(); - if (jform_vvvvvxfvxd_required) + if (jform_vvvvvxgvxe_required) { updateFieldRequired('php_import_save',0); jQuery('#jform_php_import_save').prop('required','required'); jQuery('#jform_php_import_save').attr('aria-required',true); jQuery('#jform_php_import_save').addClass('required'); - jform_vvvvvxfvxd_required = false; + jform_vvvvvxgvxe_required = false; } jQuery('#jform_php_import_setdata').closest('.control-group').show(); - if (jform_vvvvvxfvxe_required) + if (jform_vvvvvxgvxf_required) { updateFieldRequired('php_import_setdata',0); jQuery('#jform_php_import_setdata').prop('required','required'); jQuery('#jform_php_import_setdata').attr('aria-required',true); jQuery('#jform_php_import_setdata').addClass('required'); - jform_vvvvvxfvxe_required = false; + jform_vvvvvxgvxf_required = false; } } else { jQuery('#jform_html_import_view').closest('.control-group').hide(); - if (!jform_vvvvvxfvxa_required) + if (!jform_vvvvvxgvxb_required) { updateFieldRequired('html_import_view',1); jQuery('#jform_html_import_view').removeAttr('required'); jQuery('#jform_html_import_view').removeAttr('aria-required'); jQuery('#jform_html_import_view').removeClass('required'); - jform_vvvvvxfvxa_required = true; + jform_vvvvvxgvxb_required = true; } jQuery('.note_advanced_import').closest('.control-group').hide(); jQuery('#jform_php_import_display').closest('.control-group').hide(); - if (!jform_vvvvvxfvxb_required) + if (!jform_vvvvvxgvxc_required) { updateFieldRequired('php_import_display',1); jQuery('#jform_php_import_display').removeAttr('required'); jQuery('#jform_php_import_display').removeAttr('aria-required'); jQuery('#jform_php_import_display').removeClass('required'); - jform_vvvvvxfvxb_required = true; + jform_vvvvvxgvxc_required = true; } jQuery('#jform_php_import').closest('.control-group').hide(); - if (!jform_vvvvvxfvxc_required) + if (!jform_vvvvvxgvxd_required) { updateFieldRequired('php_import',1); jQuery('#jform_php_import').removeAttr('required'); jQuery('#jform_php_import').removeAttr('aria-required'); jQuery('#jform_php_import').removeClass('required'); - jform_vvvvvxfvxc_required = true; + jform_vvvvvxgvxd_required = true; } jQuery('#jform_php_import_save').closest('.control-group').hide(); - if (!jform_vvvvvxfvxd_required) + if (!jform_vvvvvxgvxe_required) { updateFieldRequired('php_import_save',1); jQuery('#jform_php_import_save').removeAttr('required'); jQuery('#jform_php_import_save').removeAttr('aria-required'); jQuery('#jform_php_import_save').removeClass('required'); - jform_vvvvvxfvxd_required = true; + jform_vvvvvxgvxe_required = true; } jQuery('#jform_php_import_setdata').closest('.control-group').hide(); - if (!jform_vvvvvxfvxe_required) + if (!jform_vvvvvxgvxf_required) { updateFieldRequired('php_import_setdata',1); jQuery('#jform_php_import_setdata').removeAttr('required'); jQuery('#jform_php_import_setdata').removeAttr('aria-required'); jQuery('#jform_php_import_setdata').removeClass('required'); - jform_vvvvvxfvxe_required = true; + jform_vvvvvxgvxf_required = true; } } } -// the vvvvvxg function -function vvvvvxg(add_custom_import_vvvvvxg) +// the vvvvvxh function +function vvvvvxh(add_custom_import_vvvvvxh) { // set the function logic - if (add_custom_import_vvvvvxg == 0) + if (add_custom_import_vvvvvxh == 0) { jQuery('.note_beginner_import').closest('.control-group').show(); } diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index e6ddf16e7..db9221f37 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -149,6 +149,8 @@ message="Error! Please add some short description here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> + + - + @@ -203,21 +205,6 @@ - - - - - + @@ -257,6 +244,27 @@ + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP - + @@ -291,27 +299,6 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT" required="true" /> - - - - + + + + - - - - + filter="CMD" + required="false"> @@ -408,7 +396,8 @@ name="implementation" label="COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -420,6 +409,21 @@ + + + + - - - - + + + + - - - - @@ -536,7 +527,8 @@ name="list" label="COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -551,6 +543,7 @@ default="0" description="COM_COMPONENTBUILDER_ADMIN_VIEW_ORDER_LIST_DESCRIPTION" class="fieldSmall" + required="false" first="0" last="100" step="1" @@ -561,7 +554,8 @@ name="title" label="COM_COMPONENTBUILDER_ADMIN_VIEW_TITLE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_TITLE_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -574,7 +568,8 @@ name="alias" label="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -587,7 +582,8 @@ name="sort" label="COM_COMPONENTBUILDER_ADMIN_VIEW_SORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_SORT_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -600,7 +596,8 @@ name="search" label="COM_COMPONENTBUILDER_ADMIN_VIEW_SEARCH_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_SEARCH_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -613,7 +610,8 @@ name="filter" label="COM_COMPONENTBUILDER_ADMIN_VIEW_FILTER_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_FILTER_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -626,7 +624,8 @@ name="link" label="COM_COMPONENTBUILDER_ADMIN_VIEW_LINK_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_LINK_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -641,6 +640,7 @@ default="1" description="COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_DESCRIPTION" class="fieldSmall" + required="false" first="1" last="15" step="1" @@ -654,6 +654,7 @@ class="fieldMedium" multiple="false" filter="INT" + required="false" default="1"> @@ -699,6 +702,21 @@ + + + + - - - - @@ -756,7 +760,8 @@ name="target_behavior" label="COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_BEHAVIOR_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_BEHAVIOR_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -769,7 +774,8 @@ name="target_relation" label="COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_RELATION_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_RELATION_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -783,6 +789,7 @@ label="COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_FIELD_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_FIELD_DESCRIPTION" multiple="false" + required="false" button="false" /> @@ -794,6 +801,7 @@ class="list_class" multiple="false" filter="INT" + required="false" default="1"> + + @@ -902,6 +926,7 @@ default="1" description="COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_DESCRIPTION" class="fieldSmall" + required="false" first="1" last="15" step="1" @@ -917,6 +942,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="WORD" message="Error! Please add key here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_HINT" @@ -932,6 +958,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="WORD" message="Error! Please add key here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_HINT" @@ -941,7 +968,8 @@ type="radio" name="addnew" label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_LABEL" - default="1"> + default="1" + required="false"> @@ -979,11 +1007,11 @@ - + @@ -1006,11 +1034,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_HINT" required="true" /> - + @@ -1034,11 +1062,11 @@ - + @@ -1061,11 +1089,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_HINT" required="true" /> - + @@ -1089,11 +1117,11 @@ - + @@ -1116,11 +1144,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FILE_HINT" required="true" /> - + @@ -1144,11 +1172,11 @@ - + @@ -1171,11 +1199,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_HINT" required="true" /> - + @@ -1199,11 +1227,11 @@ - + @@ -1226,11 +1254,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FILE_HINT" required="true" /> - + @@ -1254,6 +1282,33 @@ + + + + + + + + @@ -1287,25 +1343,11 @@ class="text_area span4" filter="HTML" hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_HINT" + required="false" /> - - - - COM_COMPONENTBUILDER_ADMIN_VIEW_NO + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_NO - - - - @@ -1493,17 +1530,17 @@ - + @@ -1520,6 +1557,32 @@ + + + + @@ -801,6 +813,7 @@ class="list_class" multiple="false" default="0" + required="false" button="false" /> @@ -814,6 +827,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="PATH" message="Error! Please add target path." hint="COM_COMPONENTBUILDER_COMPONENT_PATH_HINT" @@ -824,7 +838,8 @@ name="notnew" label="COM_COMPONENTBUILDER_COMPONENT_NOTNEW_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_NOTNEW_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -917,6 +932,7 @@ description="COM_COMPONENTBUILDER_COMPONENT_ADMINVIEW_DESCRIPTION" class="fieldMedium" multiple="false" + required="false" button="false" /> @@ -926,7 +942,8 @@ label="COM_COMPONENTBUILDER_COMPONENT_ICOMOON_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_ICOMOON_DESCRIPTION" class="list_class fieldMedium" - multiple="false"> + multiple="false" + required="false"> @@ -1355,7 +1372,8 @@ name="mainmenu" label="COM_COMPONENTBUILDER_COMPONENT_MAINMENU_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_MAINMENU_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -1368,7 +1386,8 @@ name="dashboard_add" label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_ADD_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_ADD_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -1381,7 +1400,8 @@ name="dashboard_list" label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_LIST_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_LIST_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -1394,7 +1414,8 @@ name="submenu" label="COM_COMPONENTBUILDER_COMPONENT_SUBMENU_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_SUBMENU_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -1407,7 +1428,8 @@ name="checkin" label="COM_COMPONENTBUILDER_COMPONENT_CHECKIN_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_CHECKIN_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -1420,7 +1442,8 @@ name="history" label="COM_COMPONENTBUILDER_COMPONENT_HISTORY_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_HISTORY_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -1433,7 +1456,8 @@ name="metadata" label="COM_COMPONENTBUILDER_COMPONENT_METADATA_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_METADATA_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -1446,7 +1470,8 @@ name="access" label="COM_COMPONENTBUILDER_COMPONENT_ACCESS_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_ACCESS_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -1459,7 +1484,8 @@ name="port" label="COM_COMPONENTBUILDER_COMPONENT_PORT_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_PORT_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -1472,7 +1498,8 @@ name="edit_create_site_view" label="COM_COMPONENTBUILDER_COMPONENT_EDIT_CREATE_SITE_VIEW_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_EDIT_CREATE_SITE_VIEW_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -1487,6 +1514,7 @@ default="0" description="COM_COMPONENTBUILDER_COMPONENT_ORDER_DESCRIPTION" class="fieldSmall" + required="false" first="0" last="400" step="1" @@ -1527,6 +1555,7 @@ description="COM_COMPONENTBUILDER_COMPONENT_CUSTOMADMINVIEW_DESCRIPTION" class="fieldMedium" multiple="false" + required="false" button="false" /> @@ -1536,7 +1565,8 @@ label="COM_COMPONENTBUILDER_COMPONENT_ICOMOON_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_ICOMOON_DESCRIPTION" class="list_class fieldMedium" - multiple="false"> + multiple="false" + required="false"> @@ -1965,7 +1995,8 @@ name="mainmenu" label="COM_COMPONENTBUILDER_COMPONENT_MAINMENU_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_MAINMENU_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -1978,7 +2009,8 @@ name="dashboard_list" label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_LIST_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_LIST_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -1991,7 +2023,8 @@ name="submenu" label="COM_COMPONENTBUILDER_COMPONENT_SUBMENU_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_SUBMENU_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -2004,7 +2037,8 @@ name="metadata" label="COM_COMPONENTBUILDER_COMPONENT_METADATA_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_METADATA_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -2017,7 +2051,8 @@ name="access" label="COM_COMPONENTBUILDER_COMPONENT_ACCESS_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_ACCESS_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -2032,6 +2067,7 @@ description="COM_COMPONENTBUILDER_COMPONENT_ADMINVIEWS_DESCRIPTION" class="fieldMedium" multiple="true" + required="false" button="false" /> @@ -2042,6 +2078,7 @@ description="COM_COMPONENTBUILDER_COMPONENT_BEFORE_DESCRIPTION" class="fieldMedium" multiple="false" + required="false" button="false" /> @@ -2082,6 +2119,7 @@ description="COM_COMPONENTBUILDER_COMPONENT_SITEVIEW_DESCRIPTION" class="fieldMedium" multiple="false" + required="false" button="false" /> @@ -2090,7 +2128,8 @@ name="menu" label="COM_COMPONENTBUILDER_COMPONENT_MENU_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_MENU_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -2103,7 +2142,8 @@ name="metadata" label="COM_COMPONENTBUILDER_COMPONENT_METADATA_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_METADATA_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -2116,7 +2156,8 @@ name="default_view" label="COM_COMPONENTBUILDER_COMPONENT_DEFAULT_VIEW_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_DEFAULT_VIEW_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -2129,7 +2170,8 @@ name="access" label="COM_COMPONENTBUILDER_COMPONENT_ACCESS_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_ACCESS_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -2190,6 +2232,7 @@ description="COM_COMPONENTBUILDER_COMPONENT_ADMINVIEW_DESCRIPTION" class="fieldMedium" multiple="false" + required="false" button="false" /> @@ -2198,7 +2241,8 @@ name="add_sql" label="COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -2213,7 +2257,8 @@ description="COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_OPTIONS_DESCRIPTION" class="list_class" multiple="false" - filter="INT"> + filter="INT" + required="false"> @@ -2233,6 +2278,7 @@ class="text_area span6" filter="raw" hint="COM_COMPONENTBUILDER_COMPONENT_IDS_HINT" + required="false" /> @@ -2306,6 +2352,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add name here." hint="COM_COMPONENTBUILDER_COMPONENT_NAME_HINT" @@ -2319,6 +2366,7 @@ maxlength="50" description="COM_COMPONENTBUILDER_COMPONENT_NAME_CODE_DESCRIPTION" class="text_area" + required="false" filter="CMD" message="Error! Please add name in code here." hint="COM_COMPONENTBUILDER_COMPONENT_NAME_CODE_HINT" @@ -2334,6 +2382,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add menu link." hint="COM_COMPONENTBUILDER_COMPONENT_LINK_HINT" @@ -2353,7 +2402,8 @@ name="mainmenu" label="COM_COMPONENTBUILDER_COMPONENT_MAINMENU_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_MAINMENU_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -2366,7 +2416,8 @@ name="dashboard_list" label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_LIST_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_LIST_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -2379,7 +2430,8 @@ name="submenu" label="COM_COMPONENTBUILDER_COMPONENT_SUBMENU_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_SUBMENU_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -2394,6 +2446,7 @@ description="COM_COMPONENTBUILDER_COMPONENT_BEFORE_DESCRIPTION" class="fieldMedium" multiple="false" + required="false" button="false" /> @@ -2423,6 +2476,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add name here." hint="COM_COMPONENTBUILDER_COMPONENT_NAME_HINT" @@ -2438,6 +2492,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add header here." hint="COM_COMPONENTBUILDER_COMPONENT_HEADER_HINT" @@ -2452,6 +2507,7 @@ class="text_area span6" filter="raw" hint="COM_COMPONENTBUILDER_COMPONENT_HTML_HINT" + required="false" /> @@ -2500,6 +2556,7 @@ description="COM_COMPONENTBUILDER_COMPONENT_FIELD_DESCRIPTION" class="fieldMedium" multiple="false" + required="false" button="false" /> @@ -2513,6 +2570,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" hint="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_VALUE_HINT" /> @@ -2528,6 +2586,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add tab name here." hint="COM_COMPONENTBUILDER_COMPONENT_TABNAME_HINT" diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js index ac9fccfe3..d48487e22 100644 --- a/admin/models/forms/custom_admin_view.js +++ b/admin/models/forms/custom_admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.js @@ -24,255 +24,255 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvxhvxg_required = false; jform_vvvvvxivxh_required = false; jform_vvvvvxjvxi_required = false; jform_vvvvvxkvxj_required = false; jform_vvvvvxlvxk_required = false; jform_vvvvvxmvxl_required = false; jform_vvvvvxnvxm_required = false; -jform_vvvvvxnvxn_required = false; +jform_vvvvvxovxn_required = false; jform_vvvvvxovxo_required = false; +jform_vvvvvxpvxp_required = false; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvxh = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvxh(add_php_view_vvvvvxh); + var add_php_view_vvvvvxi = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvxi(add_php_view_vvvvvxi); - var add_php_jview_display_vvvvvxi = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); - vvvvvxi(add_php_jview_display_vvvvvxi); + var add_php_jview_display_vvvvvxj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); + vvvvvxj(add_php_jview_display_vvvvvxj); - var add_php_jview_vvvvvxj = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); - vvvvvxj(add_php_jview_vvvvvxj); + var add_php_jview_vvvvvxk = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); + vvvvvxk(add_php_jview_vvvvvxk); - var add_php_document_vvvvvxk = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvxk(add_php_document_vvvvvxk); + var add_php_document_vvvvvxl = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvxl(add_php_document_vvvvvxl); - var add_css_document_vvvvvxl = jQuery("#jform_add_css_document input[type='radio']:checked").val(); - vvvvvxl(add_css_document_vvvvvxl); + var add_css_document_vvvvvxm = jQuery("#jform_add_css_document input[type='radio']:checked").val(); + vvvvvxm(add_css_document_vvvvvxm); - var add_js_document_vvvvvxm = jQuery("#jform_add_js_document input[type='radio']:checked").val(); - vvvvvxm(add_js_document_vvvvvxm); + var add_js_document_vvvvvxn = jQuery("#jform_add_js_document input[type='radio']:checked").val(); + vvvvvxn(add_js_document_vvvvvxn); - var add_custom_button_vvvvvxn = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvxn(add_custom_button_vvvvvxn); + var add_custom_button_vvvvvxo = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvxo(add_custom_button_vvvvvxo); - var add_css_vvvvvxo = jQuery("#jform_add_css input[type='radio']:checked").val(); - vvvvvxo(add_css_vvvvvxo); + var add_css_vvvvvxp = jQuery("#jform_add_css input[type='radio']:checked").val(); + vvvvvxp(add_css_vvvvvxp); }); -// the vvvvvxh function -function vvvvvxh(add_php_view_vvvvvxh) +// the vvvvvxi function +function vvvvvxi(add_php_view_vvvvvxi) { // set the function logic - if (add_php_view_vvvvvxh == 1) + if (add_php_view_vvvvvxi == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvxhvxg_required) + if (jform_vvvvvxivxh_required) { updateFieldRequired('php_view',0); jQuery('#jform_php_view').prop('required','required'); jQuery('#jform_php_view').attr('aria-required',true); jQuery('#jform_php_view').addClass('required'); - jform_vvvvvxhvxg_required = false; - } - - } - else - { - jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvxhvxg_required) - { - updateFieldRequired('php_view',1); - jQuery('#jform_php_view').removeAttr('required'); - jQuery('#jform_php_view').removeAttr('aria-required'); - jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvxhvxg_required = true; - } - } -} - -// the vvvvvxi function -function vvvvvxi(add_php_jview_display_vvvvvxi) -{ - // set the function logic - if (add_php_jview_display_vvvvvxi == 1) - { - jQuery('#jform_php_jview_display').closest('.control-group').show(); - if (jform_vvvvvxivxh_required) - { - updateFieldRequired('php_jview_display',0); - jQuery('#jform_php_jview_display').prop('required','required'); - jQuery('#jform_php_jview_display').attr('aria-required',true); - jQuery('#jform_php_jview_display').addClass('required'); jform_vvvvvxivxh_required = false; } } else { - jQuery('#jform_php_jview_display').closest('.control-group').hide(); + jQuery('#jform_php_view').closest('.control-group').hide(); if (!jform_vvvvvxivxh_required) { - updateFieldRequired('php_jview_display',1); - jQuery('#jform_php_jview_display').removeAttr('required'); - jQuery('#jform_php_jview_display').removeAttr('aria-required'); - jQuery('#jform_php_jview_display').removeClass('required'); + updateFieldRequired('php_view',1); + jQuery('#jform_php_view').removeAttr('required'); + jQuery('#jform_php_view').removeAttr('aria-required'); + jQuery('#jform_php_view').removeClass('required'); jform_vvvvvxivxh_required = true; } } } // the vvvvvxj function -function vvvvvxj(add_php_jview_vvvvvxj) +function vvvvvxj(add_php_jview_display_vvvvvxj) { // set the function logic - if (add_php_jview_vvvvvxj == 1) + if (add_php_jview_display_vvvvvxj == 1) { - jQuery('#jform_php_jview').closest('.control-group').show(); + jQuery('#jform_php_jview_display').closest('.control-group').show(); if (jform_vvvvvxjvxi_required) { - updateFieldRequired('php_jview',0); - jQuery('#jform_php_jview').prop('required','required'); - jQuery('#jform_php_jview').attr('aria-required',true); - jQuery('#jform_php_jview').addClass('required'); + updateFieldRequired('php_jview_display',0); + jQuery('#jform_php_jview_display').prop('required','required'); + jQuery('#jform_php_jview_display').attr('aria-required',true); + jQuery('#jform_php_jview_display').addClass('required'); jform_vvvvvxjvxi_required = false; } } else { - jQuery('#jform_php_jview').closest('.control-group').hide(); + jQuery('#jform_php_jview_display').closest('.control-group').hide(); if (!jform_vvvvvxjvxi_required) { - updateFieldRequired('php_jview',1); - jQuery('#jform_php_jview').removeAttr('required'); - jQuery('#jform_php_jview').removeAttr('aria-required'); - jQuery('#jform_php_jview').removeClass('required'); + updateFieldRequired('php_jview_display',1); + jQuery('#jform_php_jview_display').removeAttr('required'); + jQuery('#jform_php_jview_display').removeAttr('aria-required'); + jQuery('#jform_php_jview_display').removeClass('required'); jform_vvvvvxjvxi_required = true; } } } // the vvvvvxk function -function vvvvvxk(add_php_document_vvvvvxk) +function vvvvvxk(add_php_jview_vvvvvxk) { // set the function logic - if (add_php_document_vvvvvxk == 1) + if (add_php_jview_vvvvvxk == 1) { - jQuery('#jform_php_document').closest('.control-group').show(); + jQuery('#jform_php_jview').closest('.control-group').show(); if (jform_vvvvvxkvxj_required) { - updateFieldRequired('php_document',0); - jQuery('#jform_php_document').prop('required','required'); - jQuery('#jform_php_document').attr('aria-required',true); - jQuery('#jform_php_document').addClass('required'); + updateFieldRequired('php_jview',0); + jQuery('#jform_php_jview').prop('required','required'); + jQuery('#jform_php_jview').attr('aria-required',true); + jQuery('#jform_php_jview').addClass('required'); jform_vvvvvxkvxj_required = false; } } else { - jQuery('#jform_php_document').closest('.control-group').hide(); + jQuery('#jform_php_jview').closest('.control-group').hide(); if (!jform_vvvvvxkvxj_required) { - updateFieldRequired('php_document',1); - jQuery('#jform_php_document').removeAttr('required'); - jQuery('#jform_php_document').removeAttr('aria-required'); - jQuery('#jform_php_document').removeClass('required'); + updateFieldRequired('php_jview',1); + jQuery('#jform_php_jview').removeAttr('required'); + jQuery('#jform_php_jview').removeAttr('aria-required'); + jQuery('#jform_php_jview').removeClass('required'); jform_vvvvvxkvxj_required = true; } } } // the vvvvvxl function -function vvvvvxl(add_css_document_vvvvvxl) +function vvvvvxl(add_php_document_vvvvvxl) { // set the function logic - if (add_css_document_vvvvvxl == 1) + if (add_php_document_vvvvvxl == 1) { - jQuery('#jform_css_document').closest('.control-group').show(); + jQuery('#jform_php_document').closest('.control-group').show(); if (jform_vvvvvxlvxk_required) { - updateFieldRequired('css_document',0); - jQuery('#jform_css_document').prop('required','required'); - jQuery('#jform_css_document').attr('aria-required',true); - jQuery('#jform_css_document').addClass('required'); + updateFieldRequired('php_document',0); + jQuery('#jform_php_document').prop('required','required'); + jQuery('#jform_php_document').attr('aria-required',true); + jQuery('#jform_php_document').addClass('required'); jform_vvvvvxlvxk_required = false; } } else { - jQuery('#jform_css_document').closest('.control-group').hide(); + jQuery('#jform_php_document').closest('.control-group').hide(); if (!jform_vvvvvxlvxk_required) { - updateFieldRequired('css_document',1); - jQuery('#jform_css_document').removeAttr('required'); - jQuery('#jform_css_document').removeAttr('aria-required'); - jQuery('#jform_css_document').removeClass('required'); + updateFieldRequired('php_document',1); + jQuery('#jform_php_document').removeAttr('required'); + jQuery('#jform_php_document').removeAttr('aria-required'); + jQuery('#jform_php_document').removeClass('required'); jform_vvvvvxlvxk_required = true; } } } // the vvvvvxm function -function vvvvvxm(add_js_document_vvvvvxm) +function vvvvvxm(add_css_document_vvvvvxm) { // set the function logic - if (add_js_document_vvvvvxm == 1) + if (add_css_document_vvvvvxm == 1) { - jQuery('#jform_js_document').closest('.control-group').show(); + jQuery('#jform_css_document').closest('.control-group').show(); if (jform_vvvvvxmvxl_required) { - updateFieldRequired('js_document',0); - jQuery('#jform_js_document').prop('required','required'); - jQuery('#jform_js_document').attr('aria-required',true); - jQuery('#jform_js_document').addClass('required'); + updateFieldRequired('css_document',0); + jQuery('#jform_css_document').prop('required','required'); + jQuery('#jform_css_document').attr('aria-required',true); + jQuery('#jform_css_document').addClass('required'); jform_vvvvvxmvxl_required = false; } } else { - jQuery('#jform_js_document').closest('.control-group').hide(); + jQuery('#jform_css_document').closest('.control-group').hide(); if (!jform_vvvvvxmvxl_required) { - updateFieldRequired('js_document',1); - jQuery('#jform_js_document').removeAttr('required'); - jQuery('#jform_js_document').removeAttr('aria-required'); - jQuery('#jform_js_document').removeClass('required'); + updateFieldRequired('css_document',1); + jQuery('#jform_css_document').removeAttr('required'); + jQuery('#jform_css_document').removeAttr('aria-required'); + jQuery('#jform_css_document').removeClass('required'); jform_vvvvvxmvxl_required = true; } } } // the vvvvvxn function -function vvvvvxn(add_custom_button_vvvvvxn) +function vvvvvxn(add_js_document_vvvvvxn) { // set the function logic - if (add_custom_button_vvvvvxn == 1) + if (add_js_document_vvvvvxn == 1) + { + jQuery('#jform_js_document').closest('.control-group').show(); + if (jform_vvvvvxnvxm_required) + { + updateFieldRequired('js_document',0); + jQuery('#jform_js_document').prop('required','required'); + jQuery('#jform_js_document').attr('aria-required',true); + jQuery('#jform_js_document').addClass('required'); + jform_vvvvvxnvxm_required = false; + } + + } + else + { + jQuery('#jform_js_document').closest('.control-group').hide(); + if (!jform_vvvvvxnvxm_required) + { + updateFieldRequired('js_document',1); + jQuery('#jform_js_document').removeAttr('required'); + jQuery('#jform_js_document').removeAttr('aria-required'); + jQuery('#jform_js_document').removeClass('required'); + jform_vvvvvxnvxm_required = true; + } + } +} + +// the vvvvvxo function +function vvvvvxo(add_custom_button_vvvvvxo) +{ + // set the function logic + if (add_custom_button_vvvvvxo == 1) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvxnvxm_required) + if (jform_vvvvvxovxn_required) { updateFieldRequired('php_controller',0); jQuery('#jform_php_controller').prop('required','required'); jQuery('#jform_php_controller').attr('aria-required',true); jQuery('#jform_php_controller').addClass('required'); - jform_vvvvvxnvxm_required = false; + jform_vvvvvxovxn_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvxnvxn_required) + if (jform_vvvvvxovxo_required) { updateFieldRequired('php_model',0); jQuery('#jform_php_model').prop('required','required'); jQuery('#jform_php_model').attr('aria-required',true); jQuery('#jform_php_model').addClass('required'); - jform_vvvvvxnvxn_required = false; + jform_vvvvvxovxo_required = false; } } @@ -280,53 +280,53 @@ function vvvvvxn(add_custom_button_vvvvvxn) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvxnvxm_required) + if (!jform_vvvvvxovxn_required) { updateFieldRequired('php_controller',1); jQuery('#jform_php_controller').removeAttr('required'); jQuery('#jform_php_controller').removeAttr('aria-required'); jQuery('#jform_php_controller').removeClass('required'); - jform_vvvvvxnvxm_required = true; + jform_vvvvvxovxn_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvxnvxn_required) + if (!jform_vvvvvxovxo_required) { updateFieldRequired('php_model',1); jQuery('#jform_php_model').removeAttr('required'); jQuery('#jform_php_model').removeAttr('aria-required'); jQuery('#jform_php_model').removeClass('required'); - jform_vvvvvxnvxn_required = true; + jform_vvvvvxovxo_required = true; } } } -// the vvvvvxo function -function vvvvvxo(add_css_vvvvvxo) +// the vvvvvxp function +function vvvvvxp(add_css_vvvvvxp) { // set the function logic - if (add_css_vvvvvxo == 1) + if (add_css_vvvvvxp == 1) { jQuery('#jform_css').closest('.control-group').show(); - if (jform_vvvvvxovxo_required) + if (jform_vvvvvxpvxp_required) { updateFieldRequired('css',0); jQuery('#jform_css').prop('required','required'); jQuery('#jform_css').attr('aria-required',true); jQuery('#jform_css').addClass('required'); - jform_vvvvvxovxo_required = false; + jform_vvvvvxpvxp_required = false; } } else { jQuery('#jform_css').closest('.control-group').hide(); - if (!jform_vvvvvxovxo_required) + if (!jform_vvvvvxpvxp_required) { updateFieldRequired('css',1); jQuery('#jform_css').removeAttr('required'); jQuery('#jform_css').removeAttr('aria-required'); jQuery('#jform_css').removeClass('required'); - jform_vvvvvxovxo_required = true; + jform_vvvvvxpvxp_required = true; } } } diff --git a/admin/models/forms/custom_admin_view.xml b/admin/models/forms/custom_admin_view.xml index 5ab81d6ea..a79929af9 100644 --- a/admin/models/forms/custom_admin_view.xml +++ b/admin/models/forms/custom_admin_view.xml @@ -114,6 +114,7 @@ class="text_area" readonly="false" disabled="false" + required="true" filter="STRING" message="Error! Please add name here." hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NAME_HINT" @@ -433,7 +434,8 @@ label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_DESCRIPTION" class="list_class fieldMedium" - multiple="false"> + multiple="false" + required="false"> @@ -867,6 +869,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add name here." hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NAME_HINT" @@ -880,6 +883,7 @@ maxlength="50" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_DESCRIPTION" class="text_area" + required="false" filter="CMD" message="Error! Please add controller method name here." hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_HINT" @@ -892,6 +896,7 @@ description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TARGET_DESCRIPTION" class="list_class fieldMedium" filter="INT" + required="false" default="1"> @@ -1153,6 +1179,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="CMD" message="Error! Please add variable name here." hint="COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_HINT" @@ -1168,6 +1195,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add table as name here." hint="COM_COMPONENTBUILDER_DYNAMIC_GET_KEY_HINT" @@ -1180,6 +1208,7 @@ class="list_class fieldSmall" multiple="false" filter="WORD" + required="false" default="a"> diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js index e634917b4..b1950f49d 100644 --- a/admin/models/forms/field.js +++ b/admin/models/forms/field.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.js @@ -24,147 +24,96 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvywvyt_required = false; jform_vvvvvyxvyu_required = false; jform_vvvvvyyvyv_required = false; -jform_vvvvvzbvyw_required = false; -jform_vvvvvzcvyx_required = false; +jform_vvvvvyzvyw_required = false; +jform_vvvvvzavyx_required = false; jform_vvvvvzdvyy_required = false; jform_vvvvvzevyz_required = false; +jform_vvvvvzfvza_required = false; +jform_vvvvvzgvzb_required = false; // Initial Script jQuery(document).ready(function() { - var datalenght_vvvvvyw = jQuery("#jform_datalenght").val(); - vvvvvyw(datalenght_vvvvvyw); + var datalenght_vvvvvyx = jQuery("#jform_datalenght").val(); + vvvvvyx(datalenght_vvvvvyx); - var datadefault_vvvvvyx = jQuery("#jform_datadefault").val(); - vvvvvyx(datadefault_vvvvvyx); + var datadefault_vvvvvyy = jQuery("#jform_datadefault").val(); + vvvvvyy(datadefault_vvvvvyy); - var datatype_vvvvvyy = jQuery("#jform_datatype").val(); - vvvvvyy(datatype_vvvvvyy); - - var store_vvvvvyz = jQuery("#jform_store").val(); var datatype_vvvvvyz = jQuery("#jform_datatype").val(); - vvvvvyz(store_vvvvvyz,datatype_vvvvvyz); + vvvvvyz(datatype_vvvvvyz); - var add_css_view_vvvvvzb = jQuery("#jform_add_css_view input[type='radio']:checked").val(); - vvvvvzb(add_css_view_vvvvvzb); + var datatype_vvvvvza = jQuery("#jform_datatype").val(); + vvvvvza(datatype_vvvvvza); - var add_css_views_vvvvvzc = jQuery("#jform_add_css_views input[type='radio']:checked").val(); - vvvvvzc(add_css_views_vvvvvzc); + var store_vvvvvzb = jQuery("#jform_store").val(); + var datatype_vvvvvzb = jQuery("#jform_datatype").val(); + vvvvvzb(store_vvvvvzb,datatype_vvvvvzb); - var add_javascript_view_footer_vvvvvzd = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); - vvvvvzd(add_javascript_view_footer_vvvvvzd); + var add_css_view_vvvvvzd = jQuery("#jform_add_css_view input[type='radio']:checked").val(); + vvvvvzd(add_css_view_vvvvvzd); - var add_javascript_views_footer_vvvvvze = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); - vvvvvze(add_javascript_views_footer_vvvvvze); + var add_css_views_vvvvvze = jQuery("#jform_add_css_views input[type='radio']:checked").val(); + vvvvvze(add_css_views_vvvvvze); + + var add_javascript_view_footer_vvvvvzf = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); + vvvvvzf(add_javascript_view_footer_vvvvvzf); + + var add_javascript_views_footer_vvvvvzg = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); + vvvvvzg(add_javascript_views_footer_vvvvvzg); }); -// the vvvvvyw function -function vvvvvyw(datalenght_vvvvvyw) +// the vvvvvyx function +function vvvvvyx(datalenght_vvvvvyx) { - if (isSet(datalenght_vvvvvyw) && datalenght_vvvvvyw.constructor !== Array) + if (isSet(datalenght_vvvvvyx) && datalenght_vvvvvyx.constructor !== Array) { - var temp_vvvvvyw = datalenght_vvvvvyw; - var datalenght_vvvvvyw = []; - datalenght_vvvvvyw.push(temp_vvvvvyw); + var temp_vvvvvyx = datalenght_vvvvvyx; + var datalenght_vvvvvyx = []; + datalenght_vvvvvyx.push(temp_vvvvvyx); } - else if (!isSet(datalenght_vvvvvyw)) + else if (!isSet(datalenght_vvvvvyx)) { - var datalenght_vvvvvyw = []; + var datalenght_vvvvvyx = []; } - var datalenght = datalenght_vvvvvyw.some(datalenght_vvvvvyw_SomeFunc); + var datalenght = datalenght_vvvvvyx.some(datalenght_vvvvvyx_SomeFunc); // set this function logic if (datalenght) { jQuery('#jform_datalenght_other').closest('.control-group').show(); - if (jform_vvvvvywvyt_required) + if (jform_vvvvvyxvyu_required) { updateFieldRequired('datalenght_other',0); jQuery('#jform_datalenght_other').prop('required','required'); jQuery('#jform_datalenght_other').attr('aria-required',true); jQuery('#jform_datalenght_other').addClass('required'); - jform_vvvvvywvyt_required = false; - } - - } - else - { - jQuery('#jform_datalenght_other').closest('.control-group').hide(); - if (!jform_vvvvvywvyt_required) - { - updateFieldRequired('datalenght_other',1); - jQuery('#jform_datalenght_other').removeAttr('required'); - jQuery('#jform_datalenght_other').removeAttr('aria-required'); - jQuery('#jform_datalenght_other').removeClass('required'); - jform_vvvvvywvyt_required = true; - } - } -} - -// the vvvvvyw Some function -function datalenght_vvvvvyw_SomeFunc(datalenght_vvvvvyw) -{ - // set the function logic - if (datalenght_vvvvvyw == 'Other') - { - return true; - } - return false; -} - -// the vvvvvyx function -function vvvvvyx(datadefault_vvvvvyx) -{ - if (isSet(datadefault_vvvvvyx) && datadefault_vvvvvyx.constructor !== Array) - { - var temp_vvvvvyx = datadefault_vvvvvyx; - var datadefault_vvvvvyx = []; - datadefault_vvvvvyx.push(temp_vvvvvyx); - } - else if (!isSet(datadefault_vvvvvyx)) - { - var datadefault_vvvvvyx = []; - } - var datadefault = datadefault_vvvvvyx.some(datadefault_vvvvvyx_SomeFunc); - - - // set this function logic - if (datadefault) - { - jQuery('#jform_datadefault_other').closest('.control-group').show(); - if (jform_vvvvvyxvyu_required) - { - updateFieldRequired('datadefault_other',0); - jQuery('#jform_datadefault_other').prop('required','required'); - jQuery('#jform_datadefault_other').attr('aria-required',true); - jQuery('#jform_datadefault_other').addClass('required'); jform_vvvvvyxvyu_required = false; } } else { - jQuery('#jform_datadefault_other').closest('.control-group').hide(); + jQuery('#jform_datalenght_other').closest('.control-group').hide(); if (!jform_vvvvvyxvyu_required) { - updateFieldRequired('datadefault_other',1); - jQuery('#jform_datadefault_other').removeAttr('required'); - jQuery('#jform_datadefault_other').removeAttr('aria-required'); - jQuery('#jform_datadefault_other').removeClass('required'); + updateFieldRequired('datalenght_other',1); + jQuery('#jform_datalenght_other').removeAttr('required'); + jQuery('#jform_datalenght_other').removeAttr('aria-required'); + jQuery('#jform_datalenght_other').removeClass('required'); jform_vvvvvyxvyu_required = true; } } } // the vvvvvyx Some function -function datadefault_vvvvvyx_SomeFunc(datadefault_vvvvvyx) +function datalenght_vvvvvyx_SomeFunc(datalenght_vvvvvyx) { // set the function logic - if (datadefault_vvvvvyx == 'Other') + if (datalenght_vvvvvyx == 'Other') { return true; } @@ -172,54 +121,54 @@ function datadefault_vvvvvyx_SomeFunc(datadefault_vvvvvyx) } // the vvvvvyy function -function vvvvvyy(datatype_vvvvvyy) +function vvvvvyy(datadefault_vvvvvyy) { - if (isSet(datatype_vvvvvyy) && datatype_vvvvvyy.constructor !== Array) + if (isSet(datadefault_vvvvvyy) && datadefault_vvvvvyy.constructor !== Array) { - var temp_vvvvvyy = datatype_vvvvvyy; - var datatype_vvvvvyy = []; - datatype_vvvvvyy.push(temp_vvvvvyy); + var temp_vvvvvyy = datadefault_vvvvvyy; + var datadefault_vvvvvyy = []; + datadefault_vvvvvyy.push(temp_vvvvvyy); } - else if (!isSet(datatype_vvvvvyy)) + else if (!isSet(datadefault_vvvvvyy)) { - var datatype_vvvvvyy = []; + var datadefault_vvvvvyy = []; } - var datatype = datatype_vvvvvyy.some(datatype_vvvvvyy_SomeFunc); + var datadefault = datadefault_vvvvvyy.some(datadefault_vvvvvyy_SomeFunc); // set this function logic - if (datatype) + if (datadefault) { - jQuery('#jform_store').closest('.control-group').show(); + jQuery('#jform_datadefault_other').closest('.control-group').show(); if (jform_vvvvvyyvyv_required) { - updateFieldRequired('store',0); - jQuery('#jform_store').prop('required','required'); - jQuery('#jform_store').attr('aria-required',true); - jQuery('#jform_store').addClass('required'); + updateFieldRequired('datadefault_other',0); + jQuery('#jform_datadefault_other').prop('required','required'); + jQuery('#jform_datadefault_other').attr('aria-required',true); + jQuery('#jform_datadefault_other').addClass('required'); jform_vvvvvyyvyv_required = false; } } else { - jQuery('#jform_store').closest('.control-group').hide(); + jQuery('#jform_datadefault_other').closest('.control-group').hide(); if (!jform_vvvvvyyvyv_required) { - updateFieldRequired('store',1); - jQuery('#jform_store').removeAttr('required'); - jQuery('#jform_store').removeAttr('aria-required'); - jQuery('#jform_store').removeClass('required'); + updateFieldRequired('datadefault_other',1); + jQuery('#jform_datadefault_other').removeAttr('required'); + jQuery('#jform_datadefault_other').removeAttr('aria-required'); + jQuery('#jform_datadefault_other').removeClass('required'); jform_vvvvvyyvyv_required = true; } } } // the vvvvvyy Some function -function datatype_vvvvvyy_SomeFunc(datatype_vvvvvyy) +function datadefault_vvvvvyy_SomeFunc(datadefault_vvvvvyy) { // set the function logic - if (datatype_vvvvvyy == 'CHAR' || datatype_vvvvvyy == 'VARCHAR' || datatype_vvvvvyy == 'TEXT' || datatype_vvvvvyy == 'MEDIUMTEXT' || datatype_vvvvvyy == 'LONGTEXT') + if (datadefault_vvvvvyy == 'Other') { return true; } @@ -227,20 +176,8 @@ function datatype_vvvvvyy_SomeFunc(datatype_vvvvvyy) } // the vvvvvyz function -function vvvvvyz(store_vvvvvyz,datatype_vvvvvyz) +function vvvvvyz(datatype_vvvvvyz) { - if (isSet(store_vvvvvyz) && store_vvvvvyz.constructor !== Array) - { - var temp_vvvvvyz = store_vvvvvyz; - var store_vvvvvyz = []; - store_vvvvvyz.push(temp_vvvvvyz); - } - else if (!isSet(store_vvvvvyz)) - { - var store_vvvvvyz = []; - } - var store = store_vvvvvyz.some(store_vvvvvyz_SomeFunc); - if (isSet(datatype_vvvvvyz) && datatype_vvvvvyz.constructor !== Array) { var temp_vvvvvyz = datatype_vvvvvyz; @@ -254,6 +191,132 @@ function vvvvvyz(store_vvvvvyz,datatype_vvvvvyz) var datatype = datatype_vvvvvyz.some(datatype_vvvvvyz_SomeFunc); + // set this function logic + if (datatype) + { + jQuery('#jform_datadefault').closest('.control-group').show(); + jQuery('#jform_datalenght').closest('.control-group').show(); + jQuery('#jform_indexes').closest('.control-group').show(); + if (jform_vvvvvyzvyw_required) + { + updateFieldRequired('indexes',0); + jQuery('#jform_indexes').prop('required','required'); + jQuery('#jform_indexes').attr('aria-required',true); + jQuery('#jform_indexes').addClass('required'); + jform_vvvvvyzvyw_required = false; + } + + } + else + { + jQuery('#jform_datadefault').closest('.control-group').hide(); + jQuery('#jform_datalenght').closest('.control-group').hide(); + jQuery('#jform_indexes').closest('.control-group').hide(); + if (!jform_vvvvvyzvyw_required) + { + updateFieldRequired('indexes',1); + jQuery('#jform_indexes').removeAttr('required'); + jQuery('#jform_indexes').removeAttr('aria-required'); + jQuery('#jform_indexes').removeClass('required'); + jform_vvvvvyzvyw_required = true; + } + } +} + +// the vvvvvyz Some function +function datatype_vvvvvyz_SomeFunc(datatype_vvvvvyz) +{ + // set the function logic + if (datatype_vvvvvyz == 'CHAR' || datatype_vvvvvyz == 'VARCHAR' || datatype_vvvvvyz == 'DATETIME' || datatype_vvvvvyz == 'DATE' || datatype_vvvvvyz == 'TIME' || datatype_vvvvvyz == 'INT' || datatype_vvvvvyz == 'TINYINT' || datatype_vvvvvyz == 'BIGINT' || datatype_vvvvvyz == 'FLOAT' || datatype_vvvvvyz == 'DECIMAL' || datatype_vvvvvyz == 'DOUBLE') + { + return true; + } + return false; +} + +// the vvvvvza function +function vvvvvza(datatype_vvvvvza) +{ + if (isSet(datatype_vvvvvza) && datatype_vvvvvza.constructor !== Array) + { + var temp_vvvvvza = datatype_vvvvvza; + var datatype_vvvvvza = []; + datatype_vvvvvza.push(temp_vvvvvza); + } + else if (!isSet(datatype_vvvvvza)) + { + var datatype_vvvvvza = []; + } + var datatype = datatype_vvvvvza.some(datatype_vvvvvza_SomeFunc); + + + // set this function logic + if (datatype) + { + jQuery('#jform_store').closest('.control-group').show(); + if (jform_vvvvvzavyx_required) + { + updateFieldRequired('store',0); + jQuery('#jform_store').prop('required','required'); + jQuery('#jform_store').attr('aria-required',true); + jQuery('#jform_store').addClass('required'); + jform_vvvvvzavyx_required = false; + } + + } + else + { + jQuery('#jform_store').closest('.control-group').hide(); + if (!jform_vvvvvzavyx_required) + { + updateFieldRequired('store',1); + jQuery('#jform_store').removeAttr('required'); + jQuery('#jform_store').removeAttr('aria-required'); + jQuery('#jform_store').removeClass('required'); + jform_vvvvvzavyx_required = true; + } + } +} + +// the vvvvvza Some function +function datatype_vvvvvza_SomeFunc(datatype_vvvvvza) +{ + // set the function logic + if (datatype_vvvvvza == 'CHAR' || datatype_vvvvvza == 'VARCHAR' || datatype_vvvvvza == 'TEXT' || datatype_vvvvvza == 'MEDIUMTEXT' || datatype_vvvvvza == 'LONGTEXT') + { + return true; + } + return false; +} + +// the vvvvvzb function +function vvvvvzb(store_vvvvvzb,datatype_vvvvvzb) +{ + if (isSet(store_vvvvvzb) && store_vvvvvzb.constructor !== Array) + { + var temp_vvvvvzb = store_vvvvvzb; + var store_vvvvvzb = []; + store_vvvvvzb.push(temp_vvvvvzb); + } + else if (!isSet(store_vvvvvzb)) + { + var store_vvvvvzb = []; + } + var store = store_vvvvvzb.some(store_vvvvvzb_SomeFunc); + + if (isSet(datatype_vvvvvzb) && datatype_vvvvvzb.constructor !== Array) + { + var temp_vvvvvzb = datatype_vvvvvzb; + var datatype_vvvvvzb = []; + datatype_vvvvvzb.push(temp_vvvvvzb); + } + else if (!isSet(datatype_vvvvvzb)) + { + var datatype_vvvvvzb = []; + } + var datatype = datatype_vvvvvzb.some(datatype_vvvvvzb_SomeFunc); + + // set this function logic if (store && datatype) { @@ -265,148 +328,148 @@ function vvvvvyz(store_vvvvvyz,datatype_vvvvvyz) } } -// the vvvvvyz Some function -function store_vvvvvyz_SomeFunc(store_vvvvvyz) +// the vvvvvzb Some function +function store_vvvvvzb_SomeFunc(store_vvvvvzb) { // set the function logic - if (store_vvvvvyz == 4) + if (store_vvvvvzb == 4) { return true; } return false; } -// the vvvvvyz Some function -function datatype_vvvvvyz_SomeFunc(datatype_vvvvvyz) +// the vvvvvzb Some function +function datatype_vvvvvzb_SomeFunc(datatype_vvvvvzb) { // set the function logic - if (datatype_vvvvvyz == 'CHAR' || datatype_vvvvvyz == 'VARCHAR' || datatype_vvvvvyz == 'TEXT' || datatype_vvvvvyz == 'MEDIUMTEXT' || datatype_vvvvvyz == 'LONGTEXT') + if (datatype_vvvvvzb == 'CHAR' || datatype_vvvvvzb == 'VARCHAR' || datatype_vvvvvzb == 'TEXT' || datatype_vvvvvzb == 'MEDIUMTEXT' || datatype_vvvvvzb == 'LONGTEXT') { return true; } return false; } -// the vvvvvzb function -function vvvvvzb(add_css_view_vvvvvzb) +// the vvvvvzd function +function vvvvvzd(add_css_view_vvvvvzd) { // set the function logic - if (add_css_view_vvvvvzb == 1) + if (add_css_view_vvvvvzd == 1) { jQuery('#jform_css_view').closest('.control-group').show(); - if (jform_vvvvvzbvyw_required) + if (jform_vvvvvzdvyy_required) { updateFieldRequired('css_view',0); jQuery('#jform_css_view').prop('required','required'); jQuery('#jform_css_view').attr('aria-required',true); jQuery('#jform_css_view').addClass('required'); - jform_vvvvvzbvyw_required = false; - } - - } - else - { - jQuery('#jform_css_view').closest('.control-group').hide(); - if (!jform_vvvvvzbvyw_required) - { - updateFieldRequired('css_view',1); - jQuery('#jform_css_view').removeAttr('required'); - jQuery('#jform_css_view').removeAttr('aria-required'); - jQuery('#jform_css_view').removeClass('required'); - jform_vvvvvzbvyw_required = true; - } - } -} - -// the vvvvvzc function -function vvvvvzc(add_css_views_vvvvvzc) -{ - // set the function logic - if (add_css_views_vvvvvzc == 1) - { - jQuery('#jform_css_views').closest('.control-group').show(); - if (jform_vvvvvzcvyx_required) - { - updateFieldRequired('css_views',0); - jQuery('#jform_css_views').prop('required','required'); - jQuery('#jform_css_views').attr('aria-required',true); - jQuery('#jform_css_views').addClass('required'); - jform_vvvvvzcvyx_required = false; - } - - } - else - { - jQuery('#jform_css_views').closest('.control-group').hide(); - if (!jform_vvvvvzcvyx_required) - { - updateFieldRequired('css_views',1); - jQuery('#jform_css_views').removeAttr('required'); - jQuery('#jform_css_views').removeAttr('aria-required'); - jQuery('#jform_css_views').removeClass('required'); - jform_vvvvvzcvyx_required = true; - } - } -} - -// the vvvvvzd function -function vvvvvzd(add_javascript_view_footer_vvvvvzd) -{ - // set the function logic - if (add_javascript_view_footer_vvvvvzd == 1) - { - jQuery('#jform_javascript_view_footer').closest('.control-group').show(); - if (jform_vvvvvzdvyy_required) - { - updateFieldRequired('javascript_view_footer',0); - jQuery('#jform_javascript_view_footer').prop('required','required'); - jQuery('#jform_javascript_view_footer').attr('aria-required',true); - jQuery('#jform_javascript_view_footer').addClass('required'); jform_vvvvvzdvyy_required = false; } } else { - jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); + jQuery('#jform_css_view').closest('.control-group').hide(); if (!jform_vvvvvzdvyy_required) { - updateFieldRequired('javascript_view_footer',1); - jQuery('#jform_javascript_view_footer').removeAttr('required'); - jQuery('#jform_javascript_view_footer').removeAttr('aria-required'); - jQuery('#jform_javascript_view_footer').removeClass('required'); + updateFieldRequired('css_view',1); + jQuery('#jform_css_view').removeAttr('required'); + jQuery('#jform_css_view').removeAttr('aria-required'); + jQuery('#jform_css_view').removeClass('required'); jform_vvvvvzdvyy_required = true; } } } // the vvvvvze function -function vvvvvze(add_javascript_views_footer_vvvvvze) +function vvvvvze(add_css_views_vvvvvze) { // set the function logic - if (add_javascript_views_footer_vvvvvze == 1) + if (add_css_views_vvvvvze == 1) { - jQuery('#jform_javascript_views_footer').closest('.control-group').show(); + jQuery('#jform_css_views').closest('.control-group').show(); if (jform_vvvvvzevyz_required) { - updateFieldRequired('javascript_views_footer',0); - jQuery('#jform_javascript_views_footer').prop('required','required'); - jQuery('#jform_javascript_views_footer').attr('aria-required',true); - jQuery('#jform_javascript_views_footer').addClass('required'); + updateFieldRequired('css_views',0); + jQuery('#jform_css_views').prop('required','required'); + jQuery('#jform_css_views').attr('aria-required',true); + jQuery('#jform_css_views').addClass('required'); jform_vvvvvzevyz_required = false; } } else { - jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); + jQuery('#jform_css_views').closest('.control-group').hide(); if (!jform_vvvvvzevyz_required) + { + updateFieldRequired('css_views',1); + jQuery('#jform_css_views').removeAttr('required'); + jQuery('#jform_css_views').removeAttr('aria-required'); + jQuery('#jform_css_views').removeClass('required'); + jform_vvvvvzevyz_required = true; + } + } +} + +// the vvvvvzf function +function vvvvvzf(add_javascript_view_footer_vvvvvzf) +{ + // set the function logic + if (add_javascript_view_footer_vvvvvzf == 1) + { + jQuery('#jform_javascript_view_footer').closest('.control-group').show(); + if (jform_vvvvvzfvza_required) + { + updateFieldRequired('javascript_view_footer',0); + jQuery('#jform_javascript_view_footer').prop('required','required'); + jQuery('#jform_javascript_view_footer').attr('aria-required',true); + jQuery('#jform_javascript_view_footer').addClass('required'); + jform_vvvvvzfvza_required = false; + } + + } + else + { + jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); + if (!jform_vvvvvzfvza_required) + { + updateFieldRequired('javascript_view_footer',1); + jQuery('#jform_javascript_view_footer').removeAttr('required'); + jQuery('#jform_javascript_view_footer').removeAttr('aria-required'); + jQuery('#jform_javascript_view_footer').removeClass('required'); + jform_vvvvvzfvza_required = true; + } + } +} + +// the vvvvvzg function +function vvvvvzg(add_javascript_views_footer_vvvvvzg) +{ + // set the function logic + if (add_javascript_views_footer_vvvvvzg == 1) + { + jQuery('#jform_javascript_views_footer').closest('.control-group').show(); + if (jform_vvvvvzgvzb_required) + { + updateFieldRequired('javascript_views_footer',0); + jQuery('#jform_javascript_views_footer').prop('required','required'); + jQuery('#jform_javascript_views_footer').attr('aria-required',true); + jQuery('#jform_javascript_views_footer').addClass('required'); + jform_vvvvvzgvzb_required = false; + } + + } + else + { + jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); + if (!jform_vvvvvzgvzb_required) { updateFieldRequired('javascript_views_footer',1); jQuery('#jform_javascript_views_footer').removeAttr('required'); jQuery('#jform_javascript_views_footer').removeAttr('aria-required'); jQuery('#jform_javascript_views_footer').removeClass('required'); - jform_vvvvvzevyz_required = true; + jform_vvvvvzgvzb_required = true; } } } diff --git a/admin/models/forms/field.xml b/admin/models/forms/field.xml index a31de33b4..7100976b7 100644 --- a/admin/models/forms/field.xml +++ b/admin/models/forms/field.xml @@ -101,6 +101,7 @@ class="text_area" readonly="false" disabled="false" + required="true" filter="STRING" message="Error! Please add name here." hint="COM_COMPONENTBUILDER_FIELD_NAME_HINT" diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js index 10c710659..f934f9748 100644 --- a/admin/models/forms/fieldtype.js +++ b/admin/models/forms/fieldtype.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.js diff --git a/admin/models/forms/fieldtype.xml b/admin/models/forms/fieldtype.xml index 25a7b6a3a..9ca8cd5dd 100644 --- a/admin/models/forms/fieldtype.xml +++ b/admin/models/forms/fieldtype.xml @@ -101,6 +101,7 @@ class="text_area" readonly="false" disabled="false" + required="true" filter="STRING" message="Error! Please add name here." hint="COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT" @@ -166,6 +167,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add name here." hint="COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT" @@ -180,6 +182,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add value/example here." hint="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_HINT" @@ -190,7 +193,8 @@ name="adjustable" label="COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_DESCRIPTION" - default="1"> + default="1" + required="false"> @@ -203,7 +207,8 @@ name="mandatory" label="COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -216,7 +221,8 @@ name="translatable" label="COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_DESCRIPTION" - default="0"> + default="0" + required="false"> @@ -234,6 +240,7 @@ class="text_area" filter="HTML" hint="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT" + required="false" /> diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 66e444956..95dc63754 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.js @@ -24,38 +24,38 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvzhvzb_required = false; -jform_vvvvvzivzc_required = false; jform_vvvvvzjvzd_required = false; jform_vvvvvzkvze_required = false; +jform_vvvvvzlvzf_required = false; +jform_vvvvvzmvzg_required = false; // Initial Script jQuery(document).ready(function() { - var location_vvvvvzf = jQuery("#jform_location input[type='radio']:checked").val(); - vvvvvzf(location_vvvvvzf); + var location_vvvvvzh = jQuery("#jform_location input[type='radio']:checked").val(); + vvvvvzh(location_vvvvvzh); - var location_vvvvvzg = jQuery("#jform_location input[type='radio']:checked").val(); - vvvvvzg(location_vvvvvzg); - - var type_vvvvvzh = jQuery("#jform_type").val(); - vvvvvzh(type_vvvvvzh); - - var type_vvvvvzi = jQuery("#jform_type").val(); - vvvvvzi(type_vvvvvzi); + var location_vvvvvzi = jQuery("#jform_location input[type='radio']:checked").val(); + vvvvvzi(location_vvvvvzi); var type_vvvvvzj = jQuery("#jform_type").val(); vvvvvzj(type_vvvvvzj); - var target_vvvvvzk = jQuery("#jform_target input[type='radio']:checked").val(); - vvvvvzk(target_vvvvvzk); + var type_vvvvvzk = jQuery("#jform_type").val(); + vvvvvzk(type_vvvvvzk); + + var type_vvvvvzl = jQuery("#jform_type").val(); + vvvvvzl(type_vvvvvzl); + + var target_vvvvvzm = jQuery("#jform_target input[type='radio']:checked").val(); + vvvvvzm(target_vvvvvzm); }); -// the vvvvvzf function -function vvvvvzf(location_vvvvvzf) +// the vvvvvzh function +function vvvvvzh(location_vvvvvzh) { // set the function logic - if (location_vvvvvzf == 1) + if (location_vvvvvzh == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -65,11 +65,11 @@ function vvvvvzf(location_vvvvvzf) } } -// the vvvvvzg function -function vvvvvzg(location_vvvvvzg) +// the vvvvvzi function +function vvvvvzi(location_vvvvvzi) { // set the function logic - if (location_vvvvvzg == 2) + if (location_vvvvvzi == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -79,116 +79,6 @@ function vvvvvzg(location_vvvvvzg) } } -// the vvvvvzh function -function vvvvvzh(type_vvvvvzh) -{ - if (isSet(type_vvvvvzh) && type_vvvvvzh.constructor !== Array) - { - var temp_vvvvvzh = type_vvvvvzh; - var type_vvvvvzh = []; - type_vvvvvzh.push(temp_vvvvvzh); - } - else if (!isSet(type_vvvvvzh)) - { - var type_vvvvvzh = []; - } - var type = type_vvvvvzh.some(type_vvvvvzh_SomeFunc); - - - // set this function logic - if (type) - { - jQuery('#jform_url').closest('.control-group').show(); - if (jform_vvvvvzhvzb_required) - { - updateFieldRequired('url',0); - jQuery('#jform_url').prop('required','required'); - jQuery('#jform_url').attr('aria-required',true); - jQuery('#jform_url').addClass('required'); - jform_vvvvvzhvzb_required = false; - } - - } - else - { - jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_vvvvvzhvzb_required) - { - updateFieldRequired('url',1); - jQuery('#jform_url').removeAttr('required'); - jQuery('#jform_url').removeAttr('aria-required'); - jQuery('#jform_url').removeClass('required'); - jform_vvvvvzhvzb_required = true; - } - } -} - -// the vvvvvzh Some function -function type_vvvvvzh_SomeFunc(type_vvvvvzh) -{ - // set the function logic - if (type_vvvvvzh == 3) - { - return true; - } - return false; -} - -// the vvvvvzi function -function vvvvvzi(type_vvvvvzi) -{ - if (isSet(type_vvvvvzi) && type_vvvvvzi.constructor !== Array) - { - var temp_vvvvvzi = type_vvvvvzi; - var type_vvvvvzi = []; - type_vvvvvzi.push(temp_vvvvvzi); - } - else if (!isSet(type_vvvvvzi)) - { - var type_vvvvvzi = []; - } - var type = type_vvvvvzi.some(type_vvvvvzi_SomeFunc); - - - // set this function logic - if (type) - { - jQuery('#jform_article').closest('.control-group').show(); - if (jform_vvvvvzivzc_required) - { - updateFieldRequired('article',0); - jQuery('#jform_article').prop('required','required'); - jQuery('#jform_article').attr('aria-required',true); - jQuery('#jform_article').addClass('required'); - jform_vvvvvzivzc_required = false; - } - - } - else - { - jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_vvvvvzivzc_required) - { - updateFieldRequired('article',1); - jQuery('#jform_article').removeAttr('required'); - jQuery('#jform_article').removeAttr('aria-required'); - jQuery('#jform_article').removeClass('required'); - jform_vvvvvzivzc_required = true; - } - } -} - -// the vvvvvzi Some function -function type_vvvvvzi_SomeFunc(type_vvvvvzi) -{ - // set the function logic - if (type_vvvvvzi == 1) - { - return true; - } - return false; -} - // the vvvvvzj function function vvvvvzj(type_vvvvvzj) { @@ -208,26 +98,26 @@ function vvvvvzj(type_vvvvvzj) // set this function logic if (type) { - jQuery('#jform_content-lbl').closest('.control-group').show(); + jQuery('#jform_url').closest('.control-group').show(); if (jform_vvvvvzjvzd_required) { - updateFieldRequired('content',0); - jQuery('#jform_content').prop('required','required'); - jQuery('#jform_content').attr('aria-required',true); - jQuery('#jform_content').addClass('required'); + updateFieldRequired('url',0); + jQuery('#jform_url').prop('required','required'); + jQuery('#jform_url').attr('aria-required',true); + jQuery('#jform_url').addClass('required'); jform_vvvvvzjvzd_required = false; } } else { - jQuery('#jform_content-lbl').closest('.control-group').hide(); + jQuery('#jform_url').closest('.control-group').hide(); if (!jform_vvvvvzjvzd_required) { - updateFieldRequired('content',1); - jQuery('#jform_content').removeAttr('required'); - jQuery('#jform_content').removeAttr('aria-required'); - jQuery('#jform_content').removeClass('required'); + updateFieldRequired('url',1); + jQuery('#jform_url').removeAttr('required'); + jQuery('#jform_url').removeAttr('aria-required'); + jQuery('#jform_url').removeClass('required'); jform_vvvvvzjvzd_required = true; } } @@ -237,7 +127,7 @@ function vvvvvzj(type_vvvvvzj) function type_vvvvvzj_SomeFunc(type_vvvvvzj) { // set the function logic - if (type_vvvvvzj == 2) + if (type_vvvvvzj == 3) { return true; } @@ -245,32 +135,142 @@ function type_vvvvvzj_SomeFunc(type_vvvvvzj) } // the vvvvvzk function -function vvvvvzk(target_vvvvvzk) +function vvvvvzk(type_vvvvvzk) { - // set the function logic - if (target_vvvvvzk == 1) + if (isSet(type_vvvvvzk) && type_vvvvvzk.constructor !== Array) { - jQuery('#jform_groups').closest('.control-group').show(); + var temp_vvvvvzk = type_vvvvvzk; + var type_vvvvvzk = []; + type_vvvvvzk.push(temp_vvvvvzk); + } + else if (!isSet(type_vvvvvzk)) + { + var type_vvvvvzk = []; + } + var type = type_vvvvvzk.some(type_vvvvvzk_SomeFunc); + + + // set this function logic + if (type) + { + jQuery('#jform_article').closest('.control-group').show(); if (jform_vvvvvzkvze_required) { - updateFieldRequired('groups',0); - jQuery('#jform_groups').prop('required','required'); - jQuery('#jform_groups').attr('aria-required',true); - jQuery('#jform_groups').addClass('required'); + updateFieldRequired('article',0); + jQuery('#jform_article').prop('required','required'); + jQuery('#jform_article').attr('aria-required',true); + jQuery('#jform_article').addClass('required'); jform_vvvvvzkvze_required = false; } } else { - jQuery('#jform_groups').closest('.control-group').hide(); + jQuery('#jform_article').closest('.control-group').hide(); if (!jform_vvvvvzkvze_required) + { + updateFieldRequired('article',1); + jQuery('#jform_article').removeAttr('required'); + jQuery('#jform_article').removeAttr('aria-required'); + jQuery('#jform_article').removeClass('required'); + jform_vvvvvzkvze_required = true; + } + } +} + +// the vvvvvzk Some function +function type_vvvvvzk_SomeFunc(type_vvvvvzk) +{ + // set the function logic + if (type_vvvvvzk == 1) + { + return true; + } + return false; +} + +// the vvvvvzl function +function vvvvvzl(type_vvvvvzl) +{ + if (isSet(type_vvvvvzl) && type_vvvvvzl.constructor !== Array) + { + var temp_vvvvvzl = type_vvvvvzl; + var type_vvvvvzl = []; + type_vvvvvzl.push(temp_vvvvvzl); + } + else if (!isSet(type_vvvvvzl)) + { + var type_vvvvvzl = []; + } + var type = type_vvvvvzl.some(type_vvvvvzl_SomeFunc); + + + // set this function logic + if (type) + { + jQuery('#jform_content-lbl').closest('.control-group').show(); + if (jform_vvvvvzlvzf_required) + { + updateFieldRequired('content',0); + jQuery('#jform_content').prop('required','required'); + jQuery('#jform_content').attr('aria-required',true); + jQuery('#jform_content').addClass('required'); + jform_vvvvvzlvzf_required = false; + } + + } + else + { + jQuery('#jform_content-lbl').closest('.control-group').hide(); + if (!jform_vvvvvzlvzf_required) + { + updateFieldRequired('content',1); + jQuery('#jform_content').removeAttr('required'); + jQuery('#jform_content').removeAttr('aria-required'); + jQuery('#jform_content').removeClass('required'); + jform_vvvvvzlvzf_required = true; + } + } +} + +// the vvvvvzl Some function +function type_vvvvvzl_SomeFunc(type_vvvvvzl) +{ + // set the function logic + if (type_vvvvvzl == 2) + { + return true; + } + return false; +} + +// the vvvvvzm function +function vvvvvzm(target_vvvvvzm) +{ + // set the function logic + if (target_vvvvvzm == 1) + { + jQuery('#jform_groups').closest('.control-group').show(); + if (jform_vvvvvzmvzg_required) + { + updateFieldRequired('groups',0); + jQuery('#jform_groups').prop('required','required'); + jQuery('#jform_groups').attr('aria-required',true); + jQuery('#jform_groups').addClass('required'); + jform_vvvvvzmvzg_required = false; + } + + } + else + { + jQuery('#jform_groups').closest('.control-group').hide(); + if (!jform_vvvvvzmvzg_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvvzkvze_required = true; + jform_vvvvvzmvzg_required = true; } } } diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js index 93336ec8f..a166530db 100644 --- a/admin/models/forms/layout.js +++ b/admin/models/forms/layout.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.js @@ -24,42 +24,42 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvxzvya_required = false; +jform_vvvvvyavyb_required = false; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvxz = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvxz(add_php_view_vvvvvxz); + var add_php_view_vvvvvya = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvya(add_php_view_vvvvvya); }); -// the vvvvvxz function -function vvvvvxz(add_php_view_vvvvvxz) +// the vvvvvya function +function vvvvvya(add_php_view_vvvvvya) { // set the function logic - if (add_php_view_vvvvvxz == 1) + if (add_php_view_vvvvvya == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvxzvya_required) + if (jform_vvvvvyavyb_required) { updateFieldRequired('php_view',0); jQuery('#jform_php_view').prop('required','required'); jQuery('#jform_php_view').attr('aria-required',true); jQuery('#jform_php_view').addClass('required'); - jform_vvvvvxzvya_required = false; + jform_vvvvvyavyb_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvxzvya_required) + if (!jform_vvvvvyavyb_required) { updateFieldRequired('php_view',1); jQuery('#jform_php_view').removeAttr('required'); jQuery('#jform_php_view').removeAttr('aria-required'); jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvxzvya_required = true; + jform_vvvvvyavyb_required = true; } } } diff --git a/admin/models/forms/layout.xml b/admin/models/forms/layout.xml index b5aa9b5a6..ee86d4024 100644 --- a/admin/models/forms/layout.xml +++ b/admin/models/forms/layout.xml @@ -101,6 +101,7 @@ class="text_area" readonly="false" disabled="false" + required="true" filter="STRING" message="Error! Please add name here." hint="COM_COMPONENTBUILDER_LAYOUT_NAME_HINT" diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js index 6e1e39bf8..383bef90f 100644 --- a/admin/models/forms/site_view.js +++ b/admin/models/forms/site_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.16 - @build 29th August, 2016 + @version 2.1.17 + @build 3rd September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.js @@ -24,7 +24,6 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvxpvxp_required = false; jform_vvvvvxqvxq_required = false; jform_vvvvvxrvxr_required = false; jform_vvvvvxsvxs_required = false; @@ -33,271 +32,272 @@ jform_vvvvvxuvxu_required = false; jform_vvvvvxvvxv_required = false; jform_vvvvvxwvxw_required = false; jform_vvvvvxxvxx_required = false; -jform_vvvvvxxvxy_required = false; +jform_vvvvvxyvxy_required = false; +jform_vvvvvxyvxz_required = false; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvxp = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvxp(add_php_view_vvvvvxp); + var add_php_view_vvvvvxq = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvxq(add_php_view_vvvvvxq); - var add_php_jview_display_vvvvvxq = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); - vvvvvxq(add_php_jview_display_vvvvvxq); + var add_php_jview_display_vvvvvxr = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); + vvvvvxr(add_php_jview_display_vvvvvxr); - var add_php_jview_vvvvvxr = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); - vvvvvxr(add_php_jview_vvvvvxr); + var add_php_jview_vvvvvxs = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); + vvvvvxs(add_php_jview_vvvvvxs); - var add_php_document_vvvvvxs = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvxs(add_php_document_vvvvvxs); + var add_php_document_vvvvvxt = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvxt(add_php_document_vvvvvxt); - var add_css_document_vvvvvxt = jQuery("#jform_add_css_document input[type='radio']:checked").val(); - vvvvvxt(add_css_document_vvvvvxt); + var add_css_document_vvvvvxu = jQuery("#jform_add_css_document input[type='radio']:checked").val(); + vvvvvxu(add_css_document_vvvvvxu); - var add_js_document_vvvvvxu = jQuery("#jform_add_js_document input[type='radio']:checked").val(); - vvvvvxu(add_js_document_vvvvvxu); + var add_js_document_vvvvvxv = jQuery("#jform_add_js_document input[type='radio']:checked").val(); + vvvvvxv(add_js_document_vvvvvxv); - var add_css_vvvvvxv = jQuery("#jform_add_css input[type='radio']:checked").val(); - vvvvvxv(add_css_vvvvvxv); + var add_css_vvvvvxw = jQuery("#jform_add_css input[type='radio']:checked").val(); + vvvvvxw(add_css_vvvvvxw); - var add_php_ajax_vvvvvxw = jQuery("#jform_add_php_ajax input[type='radio']:checked").val(); - vvvvvxw(add_php_ajax_vvvvvxw); + var add_php_ajax_vvvvvxx = jQuery("#jform_add_php_ajax input[type='radio']:checked").val(); + vvvvvxx(add_php_ajax_vvvvvxx); - var add_custom_button_vvvvvxx = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvxx(add_custom_button_vvvvvxx); + var add_custom_button_vvvvvxy = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvxy(add_custom_button_vvvvvxy); }); -// the vvvvvxp function -function vvvvvxp(add_php_view_vvvvvxp) +// the vvvvvxq function +function vvvvvxq(add_php_view_vvvvvxq) { // set the function logic - if (add_php_view_vvvvvxp == 1) + if (add_php_view_vvvvvxq == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvxpvxp_required) + if (jform_vvvvvxqvxq_required) { updateFieldRequired('php_view',0); jQuery('#jform_php_view').prop('required','required'); jQuery('#jform_php_view').attr('aria-required',true); jQuery('#jform_php_view').addClass('required'); - jform_vvvvvxpvxp_required = false; - } - - } - else - { - jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvxpvxp_required) - { - updateFieldRequired('php_view',1); - jQuery('#jform_php_view').removeAttr('required'); - jQuery('#jform_php_view').removeAttr('aria-required'); - jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvxpvxp_required = true; - } - } -} - -// the vvvvvxq function -function vvvvvxq(add_php_jview_display_vvvvvxq) -{ - // set the function logic - if (add_php_jview_display_vvvvvxq == 1) - { - jQuery('#jform_php_jview_display').closest('.control-group').show(); - if (jform_vvvvvxqvxq_required) - { - updateFieldRequired('php_jview_display',0); - jQuery('#jform_php_jview_display').prop('required','required'); - jQuery('#jform_php_jview_display').attr('aria-required',true); - jQuery('#jform_php_jview_display').addClass('required'); jform_vvvvvxqvxq_required = false; } } else { - jQuery('#jform_php_jview_display').closest('.control-group').hide(); + jQuery('#jform_php_view').closest('.control-group').hide(); if (!jform_vvvvvxqvxq_required) { - updateFieldRequired('php_jview_display',1); - jQuery('#jform_php_jview_display').removeAttr('required'); - jQuery('#jform_php_jview_display').removeAttr('aria-required'); - jQuery('#jform_php_jview_display').removeClass('required'); + updateFieldRequired('php_view',1); + jQuery('#jform_php_view').removeAttr('required'); + jQuery('#jform_php_view').removeAttr('aria-required'); + jQuery('#jform_php_view').removeClass('required'); jform_vvvvvxqvxq_required = true; } } } // the vvvvvxr function -function vvvvvxr(add_php_jview_vvvvvxr) +function vvvvvxr(add_php_jview_display_vvvvvxr) { // set the function logic - if (add_php_jview_vvvvvxr == 1) + if (add_php_jview_display_vvvvvxr == 1) { - jQuery('#jform_php_jview').closest('.control-group').show(); + jQuery('#jform_php_jview_display').closest('.control-group').show(); if (jform_vvvvvxrvxr_required) { - updateFieldRequired('php_jview',0); - jQuery('#jform_php_jview').prop('required','required'); - jQuery('#jform_php_jview').attr('aria-required',true); - jQuery('#jform_php_jview').addClass('required'); + updateFieldRequired('php_jview_display',0); + jQuery('#jform_php_jview_display').prop('required','required'); + jQuery('#jform_php_jview_display').attr('aria-required',true); + jQuery('#jform_php_jview_display').addClass('required'); jform_vvvvvxrvxr_required = false; } } else { - jQuery('#jform_php_jview').closest('.control-group').hide(); + jQuery('#jform_php_jview_display').closest('.control-group').hide(); if (!jform_vvvvvxrvxr_required) { - updateFieldRequired('php_jview',1); - jQuery('#jform_php_jview').removeAttr('required'); - jQuery('#jform_php_jview').removeAttr('aria-required'); - jQuery('#jform_php_jview').removeClass('required'); + updateFieldRequired('php_jview_display',1); + jQuery('#jform_php_jview_display').removeAttr('required'); + jQuery('#jform_php_jview_display').removeAttr('aria-required'); + jQuery('#jform_php_jview_display').removeClass('required'); jform_vvvvvxrvxr_required = true; } } } // the vvvvvxs function -function vvvvvxs(add_php_document_vvvvvxs) +function vvvvvxs(add_php_jview_vvvvvxs) { // set the function logic - if (add_php_document_vvvvvxs == 1) + if (add_php_jview_vvvvvxs == 1) { - jQuery('#jform_php_document').closest('.control-group').show(); + jQuery('#jform_php_jview').closest('.control-group').show(); if (jform_vvvvvxsvxs_required) { - updateFieldRequired('php_document',0); - jQuery('#jform_php_document').prop('required','required'); - jQuery('#jform_php_document').attr('aria-required',true); - jQuery('#jform_php_document').addClass('required'); + updateFieldRequired('php_jview',0); + jQuery('#jform_php_jview').prop('required','required'); + jQuery('#jform_php_jview').attr('aria-required',true); + jQuery('#jform_php_jview').addClass('required'); jform_vvvvvxsvxs_required = false; } } else { - jQuery('#jform_php_document').closest('.control-group').hide(); + jQuery('#jform_php_jview').closest('.control-group').hide(); if (!jform_vvvvvxsvxs_required) { - updateFieldRequired('php_document',1); - jQuery('#jform_php_document').removeAttr('required'); - jQuery('#jform_php_document').removeAttr('aria-required'); - jQuery('#jform_php_document').removeClass('required'); + updateFieldRequired('php_jview',1); + jQuery('#jform_php_jview').removeAttr('required'); + jQuery('#jform_php_jview').removeAttr('aria-required'); + jQuery('#jform_php_jview').removeClass('required'); jform_vvvvvxsvxs_required = true; } } } // the vvvvvxt function -function vvvvvxt(add_css_document_vvvvvxt) +function vvvvvxt(add_php_document_vvvvvxt) { // set the function logic - if (add_css_document_vvvvvxt == 1) + if (add_php_document_vvvvvxt == 1) { - jQuery('#jform_css_document').closest('.control-group').show(); + jQuery('#jform_php_document').closest('.control-group').show(); if (jform_vvvvvxtvxt_required) { - updateFieldRequired('css_document',0); - jQuery('#jform_css_document').prop('required','required'); - jQuery('#jform_css_document').attr('aria-required',true); - jQuery('#jform_css_document').addClass('required'); + updateFieldRequired('php_document',0); + jQuery('#jform_php_document').prop('required','required'); + jQuery('#jform_php_document').attr('aria-required',true); + jQuery('#jform_php_document').addClass('required'); jform_vvvvvxtvxt_required = false; } } else { - jQuery('#jform_css_document').closest('.control-group').hide(); + jQuery('#jform_php_document').closest('.control-group').hide(); if (!jform_vvvvvxtvxt_required) { - updateFieldRequired('css_document',1); - jQuery('#jform_css_document').removeAttr('required'); - jQuery('#jform_css_document').removeAttr('aria-required'); - jQuery('#jform_css_document').removeClass('required'); + updateFieldRequired('php_document',1); + jQuery('#jform_php_document').removeAttr('required'); + jQuery('#jform_php_document').removeAttr('aria-required'); + jQuery('#jform_php_document').removeClass('required'); jform_vvvvvxtvxt_required = true; } } } // the vvvvvxu function -function vvvvvxu(add_js_document_vvvvvxu) +function vvvvvxu(add_css_document_vvvvvxu) { // set the function logic - if (add_js_document_vvvvvxu == 1) + if (add_css_document_vvvvvxu == 1) { - jQuery('#jform_js_document').closest('.control-group').show(); + jQuery('#jform_css_document').closest('.control-group').show(); if (jform_vvvvvxuvxu_required) { - updateFieldRequired('js_document',0); - jQuery('#jform_js_document').prop('required','required'); - jQuery('#jform_js_document').attr('aria-required',true); - jQuery('#jform_js_document').addClass('required'); + updateFieldRequired('css_document',0); + jQuery('#jform_css_document').prop('required','required'); + jQuery('#jform_css_document').attr('aria-required',true); + jQuery('#jform_css_document').addClass('required'); jform_vvvvvxuvxu_required = false; } } else { - jQuery('#jform_js_document').closest('.control-group').hide(); + jQuery('#jform_css_document').closest('.control-group').hide(); if (!jform_vvvvvxuvxu_required) { - updateFieldRequired('js_document',1); - jQuery('#jform_js_document').removeAttr('required'); - jQuery('#jform_js_document').removeAttr('aria-required'); - jQuery('#jform_js_document').removeClass('required'); + updateFieldRequired('css_document',1); + jQuery('#jform_css_document').removeAttr('required'); + jQuery('#jform_css_document').removeAttr('aria-required'); + jQuery('#jform_css_document').removeClass('required'); jform_vvvvvxuvxu_required = true; } } } // the vvvvvxv function -function vvvvvxv(add_css_vvvvvxv) +function vvvvvxv(add_js_document_vvvvvxv) { // set the function logic - if (add_css_vvvvvxv == 1) + if (add_js_document_vvvvvxv == 1) { - jQuery('#jform_css').closest('.control-group').show(); + jQuery('#jform_js_document').closest('.control-group').show(); if (jform_vvvvvxvvxv_required) { - updateFieldRequired('css',0); - jQuery('#jform_css').prop('required','required'); - jQuery('#jform_css').attr('aria-required',true); - jQuery('#jform_css').addClass('required'); + updateFieldRequired('js_document',0); + jQuery('#jform_js_document').prop('required','required'); + jQuery('#jform_js_document').attr('aria-required',true); + jQuery('#jform_js_document').addClass('required'); jform_vvvvvxvvxv_required = false; } } else { - jQuery('#jform_css').closest('.control-group').hide(); + jQuery('#jform_js_document').closest('.control-group').hide(); if (!jform_vvvvvxvvxv_required) { - updateFieldRequired('css',1); - jQuery('#jform_css').removeAttr('required'); - jQuery('#jform_css').removeAttr('aria-required'); - jQuery('#jform_css').removeClass('required'); + updateFieldRequired('js_document',1); + jQuery('#jform_js_document').removeAttr('required'); + jQuery('#jform_js_document').removeAttr('aria-required'); + jQuery('#jform_js_document').removeClass('required'); jform_vvvvvxvvxv_required = true; } } } // the vvvvvxw function -function vvvvvxw(add_php_ajax_vvvvvxw) +function vvvvvxw(add_css_vvvvvxw) { // set the function logic - if (add_php_ajax_vvvvvxw == 1) + if (add_css_vvvvvxw == 1) + { + jQuery('#jform_css').closest('.control-group').show(); + if (jform_vvvvvxwvxw_required) + { + updateFieldRequired('css',0); + jQuery('#jform_css').prop('required','required'); + jQuery('#jform_css').attr('aria-required',true); + jQuery('#jform_css').addClass('required'); + jform_vvvvvxwvxw_required = false; + } + + } + else + { + jQuery('#jform_css').closest('.control-group').hide(); + if (!jform_vvvvvxwvxw_required) + { + updateFieldRequired('css',1); + jQuery('#jform_css').removeAttr('required'); + jQuery('#jform_css').removeAttr('aria-required'); + jQuery('#jform_css').removeClass('required'); + jform_vvvvvxwvxw_required = true; + } + } +} + +// the vvvvvxx function +function vvvvvxx(add_php_ajax_vvvvvxx) +{ + // set the function logic + if (add_php_ajax_vvvvvxx == 1) { jQuery('#jform_ajax_input').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod').closest('.control-group').show(); - if (jform_vvvvvxwvxw_required) + if (jform_vvvvvxxvxx_required) { updateFieldRequired('php_ajaxmethod',0); jQuery('#jform_php_ajaxmethod').prop('required','required'); jQuery('#jform_php_ajaxmethod').attr('aria-required',true); jQuery('#jform_php_ajaxmethod').addClass('required'); - jform_vvvvvxwvxw_required = false; + jform_vvvvvxxvxx_required = false; } } @@ -305,42 +305,42 @@ function vvvvvxw(add_php_ajax_vvvvvxw) { jQuery('#jform_ajax_input').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod').closest('.control-group').hide(); - if (!jform_vvvvvxwvxw_required) + if (!jform_vvvvvxxvxx_required) { updateFieldRequired('php_ajaxmethod',1); jQuery('#jform_php_ajaxmethod').removeAttr('required'); jQuery('#jform_php_ajaxmethod').removeAttr('aria-required'); jQuery('#jform_php_ajaxmethod').removeClass('required'); - jform_vvvvvxwvxw_required = true; + jform_vvvvvxxvxx_required = true; } } } -// the vvvvvxx function -function vvvvvxx(add_custom_button_vvvvvxx) +// the vvvvvxy function +function vvvvvxy(add_custom_button_vvvvvxy) { // set the function logic - if (add_custom_button_vvvvvxx == 1) + if (add_custom_button_vvvvvxy == 1) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvxxvxx_required) + if (jform_vvvvvxyvxy_required) { updateFieldRequired('php_controller',0); jQuery('#jform_php_controller').prop('required','required'); jQuery('#jform_php_controller').attr('aria-required',true); jQuery('#jform_php_controller').addClass('required'); - jform_vvvvvxxvxx_required = false; + jform_vvvvvxyvxy_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvxxvxy_required) + if (jform_vvvvvxyvxz_required) { updateFieldRequired('php_model',0); jQuery('#jform_php_model').prop('required','required'); jQuery('#jform_php_model').attr('aria-required',true); jQuery('#jform_php_model').addClass('required'); - jform_vvvvvxxvxy_required = false; + jform_vvvvvxyvxz_required = false; } } @@ -348,22 +348,22 @@ function vvvvvxx(add_custom_button_vvvvvxx) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvxxvxx_required) + if (!jform_vvvvvxyvxy_required) { updateFieldRequired('php_controller',1); jQuery('#jform_php_controller').removeAttr('required'); jQuery('#jform_php_controller').removeAttr('aria-required'); jQuery('#jform_php_controller').removeClass('required'); - jform_vvvvvxxvxx_required = true; + jform_vvvvvxyvxy_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvxxvxy_required) + if (!jform_vvvvvxyvxz_required) { updateFieldRequired('php_model',1); jQuery('#jform_php_model').removeAttr('required'); jQuery('#jform_php_model').removeAttr('aria-required'); jQuery('#jform_php_model').removeClass('required'); - jform_vvvvvxxvxy_required = true; + jform_vvvvvxyvxz_required = true; } } } diff --git a/admin/models/forms/site_view.xml b/admin/models/forms/site_view.xml index 9e570862d..34fdfbd58 100644 --- a/admin/models/forms/site_view.xml +++ b/admin/models/forms/site_view.xml @@ -114,6 +114,7 @@ class="text_area" readonly="false" disabled="false" + required="true" filter="STRING" message="Error! Please add name here." hint="COM_COMPONENTBUILDER_SITE_VIEW_NAME_HINT" @@ -219,6 +220,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add value name here." hint="COM_COMPONENTBUILDER_SITE_VIEW_VALUE_NAME_HINT" @@ -234,6 +236,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="WORD" message="Error! Please add task name here." hint="COM_COMPONENTBUILDER_SITE_VIEW_TASK_NAME_HINT" @@ -250,6 +253,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add default input value here." hint="COM_COMPONENTBUILDER_SITE_VIEW_INPUT_DEFAULT_HINT" @@ -263,6 +267,7 @@ class="list_class" multiple="false" filter="WORD" + required="false" default="INT"> @@ -543,7 +550,8 @@ label="COM_COMPONENTBUILDER_SITE_VIEW_ICOMOON_LABEL" description="COM_COMPONENTBUILDER_SITE_VIEW_ICOMOON_DESCRIPTION" class="list_class fieldMedium" - multiple="false"> + multiple="false" + required="false"> @@ -977,6 +985,7 @@ class="text_area" readonly="false" disabled="false" + required="false" filter="STRING" message="Error! Please add name here." hint="COM_COMPONENTBUILDER_SITE_VIEW_NAME_HINT" @@ -990,6 +999,7 @@ maxlength="50" description="COM_COMPONENTBUILDER_SITE_VIEW_METHOD_DESCRIPTION" class="text_area" + required="false" filter="CMD" message="Error! Please add controller method name here." hint="COM_COMPONENTBUILDER_SITE_VIEW_METHOD_HINT" @@ -1002,6 +1012,7 @@ description="COM_COMPONENTBUILDER_SITE_VIEW_TARGET_DESCRIPTION" class="list_class fieldMedium" filter="INT" + required="false" default="1">