From 4874ca0406e493454f2dd9f9b877d0767164e574 Mon Sep 17 00:00:00 2001 From: ro-ot Date: Wed, 8 Mar 2017 06:43:12 +0200 Subject: [PATCH] impoved the request linking options, fixed few bugs in compiler --- README.md | 6 +- admin/README.txt | 6 +- admin/assets/css/admin.css | 2 +- admin/assets/css/admin_view.css | 4 +- admin/assets/css/admin_views.css | 4 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/site_view.css | 4 +- admin/assets/css/site_views.css | 4 +- admin/compiler/joomla_3/Helper.php | 14 + admin/compiler/joomla_3/Helper_site.php | 14 + admin/componentbuilder.php | 2 +- admin/controller.php | 2 +- admin/controllers/admin_view.php | 4 +- admin/controllers/admin_views.php | 4 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/componentbuilder.php | 2 +- admin/controllers/help.php | 2 +- admin/controllers/import.php | 2 +- admin/controllers/site_view.php | 4 +- admin/controllers/site_views.php | 4 +- admin/helpers/compiler.php | 61 +- admin/helpers/compiler/a_Get.php | 12 +- admin/helpers/compiler/c_Fields.php | 11 +- admin/helpers/compiler/e_Interpretation.php | 119 ++-- admin/helpers/componentbuilder.php | 16 +- admin/helpers/headercheck.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/indenter.php | 2 +- admin/helpers/js.php | 2 +- admin/helpers/minify.php | 2 +- .../en-GB/en-GB.com_componentbuilder.ini | 1 + admin/layouts/admin_view/css_fullwidth.php | 2 +- .../admin_view/custom_buttons_fullwidth.php | 2 +- .../admin_view/custom_buttons_left.php | 2 +- .../admin_view/custom_import_fullwidth.php | 2 +- admin/layouts/admin_view/fields_fullwidth.php | 4 +- .../admin_view/javascript_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 4 +- admin/layouts/admin_view/mysql_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_left.php | 2 +- admin/layouts/admin_view/php_fullwidth.php | 2 +- admin/layouts/admin_view/publishing.php | 2 +- admin/layouts/admin_view/publlshing.php | 2 +- admin/layouts/admin_view/settings_above.php | 2 +- admin/layouts/admin_view/settings_left.php | 2 +- admin/layouts/admin_view/settings_right.php | 2 +- admin/layouts/admin_view/settings_under.php | 2 +- admin/layouts/batchselection.php | 2 +- .../custom_buttons_fullwidth.php | 2 +- .../custom_admin_view/custom_buttons_left.php | 2 +- .../custom_script_fullwidth.php | 2 +- .../custom_admin_view/details_above.php | 2 +- .../custom_admin_view/details_fullwidth.php | 2 +- .../custom_admin_view/details_left.php | 2 +- .../custom_admin_view/details_right.php | 2 +- .../custom_admin_view/details_rightside.php | 2 +- .../custom_admin_view/details_under.php | 2 +- .../linked_components_fullwidth.php | 4 +- .../layouts/custom_admin_view/publishing.php | 2 +- .../layouts/custom_admin_view/publlshing.php | 2 +- admin/layouts/custom_code/details_above.php | 2 +- .../layouts/custom_code/details_fullwidth.php | 2 +- admin/layouts/custom_code/details_left.php | 2 +- admin/layouts/custom_code/details_right.php | 2 +- admin/layouts/custom_code/details_under.php | 2 +- admin/layouts/custom_code/publishing.php | 2 +- admin/layouts/custom_code/publlshing.php | 2 +- .../layouts/dynamic_get/abacus_fullwidth.php | 2 +- admin/layouts/dynamic_get/abacus_left.php | 2 +- .../dynamic_get/custom_script_fullwidth.php | 2 +- admin/layouts/dynamic_get/gettable_above.php | 2 +- .../dynamic_get/gettable_fullwidth.php | 2 +- admin/layouts/dynamic_get/gettable_left.php | 2 +- admin/layouts/dynamic_get/gettable_right.php | 2 +- admin/layouts/dynamic_get/gettable_under.php | 2 +- admin/layouts/dynamic_get/publishing.php | 2 +- admin/layouts/dynamic_get/publlshing.php | 2 +- admin/layouts/field/details_fullwidth.php | 2 +- admin/layouts/field/details_left.php | 2 +- admin/layouts/field/details_right.php | 2 +- admin/layouts/field/details_under.php | 2 +- .../field/linked_admin_views_fullwidth.php | 4 +- admin/layouts/field/publishing.php | 2 +- admin/layouts/field/publlshing.php | 2 +- admin/layouts/field/scripts_left.php | 2 +- admin/layouts/field/scripts_right.php | 2 +- admin/layouts/fieldtype/details_left.php | 2 +- admin/layouts/fieldtype/details_right.php | 2 +- admin/layouts/fieldtype/fields_fullwidth.php | 4 +- admin/layouts/fieldtype/publishing.php | 2 +- admin/layouts/fieldtype/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- .../admin_views_fullwidth.php | 2 +- .../custom_admin_views_fullwidth.php | 2 +- .../joomla_component/details_above.php | 2 +- .../layouts/joomla_component/details_left.php | 2 +- .../joomla_component/details_right.php | 2 +- .../joomla_component/details_under.php | 2 +- .../dynamic_build_beta_fullwidth.php | 2 +- .../dynamic_integration_fullwidth.php | 2 +- .../libs_helpers_fullwidth.php | 2 +- .../joomla_component/mysql_fullwidth.php | 2 +- .../joomla_component/php_fullwidth.php | 2 +- admin/layouts/joomla_component/publishing.php | 2 +- admin/layouts/joomla_component/publlshing.php | 2 +- .../layouts/joomla_component/readme_left.php | 2 +- .../layouts/joomla_component/readme_right.php | 2 +- .../joomla_component/settings_left.php | 2 +- .../joomla_component/settings_right.php | 2 +- .../joomla_component/site_views_fullwidth.php | 2 +- .../layout/custom_script_fullwidth.php | 2 +- admin/layouts/layout/details_fullwidth.php | 2 +- admin/layouts/layout/details_left.php | 2 +- admin/layouts/layout/details_right.php | 2 +- admin/layouts/layout/details_rightside.php | 2 +- admin/layouts/layout/details_under.php | 2 +- admin/layouts/layout/publishing.php | 2 +- admin/layouts/layout/publlshing.php | 2 +- .../site_view/custom_buttons_fullwidth.php | 5 +- .../layouts/site_view/custom_buttons_left.php | 55 ++ .../site_view/custom_buttons_right.php | 55 ++ admin/layouts/site_view/details_above.php | 2 +- admin/layouts/site_view/details_fullwidth.php | 2 +- admin/layouts/site_view/details_left.php | 2 +- admin/layouts/site_view/details_right.php | 2 +- admin/layouts/site_view/details_rightside.php | 2 +- admin/layouts/site_view/details_under.php | 2 +- .../site_view/javascript_css_fullwidth.php | 2 +- .../site_view/linked_components_fullwidth.php | 4 +- admin/layouts/site_view/php_fullwidth.php | 2 +- admin/layouts/site_view/publishing.php | 2 +- admin/layouts/site_view/publlshing.php | 2 +- admin/layouts/snippet/details_above.php | 2 +- admin/layouts/snippet/details_left.php | 2 +- admin/layouts/snippet/details_right.php | 2 +- admin/layouts/snippet/publishing.php | 2 +- admin/layouts/snippet/publlshing.php | 2 +- .../template/custom_script_fullwidth.php | 2 +- admin/layouts/template/details_fullwidth.php | 2 +- admin/layouts/template/details_left.php | 2 +- admin/layouts/template/details_right.php | 2 +- admin/layouts/template/details_rightside.php | 2 +- admin/layouts/template/details_under.php | 2 +- admin/layouts/template/publishing.php | 2 +- admin/layouts/template/publlshing.php | 2 +- admin/models/admin_view.php | 18 +- admin/models/admin_views.php | 4 +- admin/models/ajax.php | 2 +- admin/models/componentbuilder.php | 2 +- admin/models/custom_admin_view.php | 2 +- admin/models/field.php | 2 +- admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/adminviews.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/component.php | 2 +- admin/models/fields/customadminviews.php | 2 +- admin/models/fields/customfilelist.php | 2 +- admin/models/fields/customfolderlist.php | 2 +- admin/models/fields/customgets.php | 2 +- admin/models/fields/dbtables.php | 2 +- admin/models/fields/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldsmulti.php | 2 +- admin/models/fields/fieldtypes.php | 2 +- admin/models/fields/maingets.php | 2 +- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/fields/siteviews.php | 2 +- admin/models/fields/snippets.php | 2 +- admin/models/fieldtype.php | 12 +- admin/models/forms/admin_view.js | 52 +- admin/models/forms/custom_admin_view.js | 90 +-- admin/models/forms/custom_code.js | 38 +- admin/models/forms/dynamic_get.js | 178 +++--- admin/models/forms/field.js | 80 +-- admin/models/forms/help_document.js | 60 +- admin/models/forms/layout.js | 10 +- admin/models/forms/site_view.js | 104 ++-- admin/models/forms/site_view.xml | 550 +++++++++--------- admin/models/forms/template.js | 10 +- admin/models/import.php | 2 +- admin/models/site_view.php | 162 +++--- admin/models/site_views.php | 36 +- admin/sql/install.mysql.utf8.sql | 14 +- admin/tables/admin_view.php | 4 +- admin/tables/site_view.php | 4 +- admin/views/admin_view/submitbutton.js | 4 +- admin/views/admin_view/tmpl/edit.php | 4 +- admin/views/admin_view/view.html.php | 8 +- 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/componentbuilder/tmpl/default.php | 2 +- ...sed_issues_the_closed_issues_on_github.php | 2 +- .../componentbuilder/tmpl/default_main.php | 2 +- ..._open_issues_the_open_issues_on_github.php | 2 +- .../tmpl/default_readme_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../componentbuilder/tmpl/default_vdm.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/custom_admin_view/view.html.php | 2 +- admin/views/field/view.html.php | 2 +- admin/views/fieldtype/view.html.php | 2 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- admin/views/site_view/submitbutton.js | 4 +- admin/views/site_view/tmpl/edit.php | 10 +- admin/views/site_view/view.html.php | 6 +- admin/views/site_views/tmpl/default.php | 4 +- .../site_views/tmpl/default_batch_body.php | 4 +- .../site_views/tmpl/default_batch_footer.php | 4 +- admin/views/site_views/tmpl/default_body.php | 4 +- admin/views/site_views/tmpl/default_foot.php | 4 +- admin/views/site_views/tmpl/default_head.php | 4 +- .../views/site_views/tmpl/default_toolbar.php | 4 +- admin/views/site_views/view.html.php | 4 +- componentbuilder.xml | 2 +- script.php | 10 +- 228 files changed, 1268 insertions(+), 1019 deletions(-) create mode 100644 admin/layouts/site_view/custom_buttons_left.php create mode 100644 admin/layouts/site_view/custom_buttons_right.php diff --git a/README.md b/README.md index cbeddd559..cd584bc3c 100644 --- a/README.md +++ b/README.md @@ -104,12 +104,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 6th March, 2017 ++ *Last Build*: 8th March, 2017 + *Version*: 2.3.6 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **92701** -+ *File count*: **599** ++ *Line count*: **92871** ++ *File count*: **601** + *Folder count*: **105** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/README.txt b/admin/README.txt index cbeddd559..cd584bc3c 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -104,12 +104,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 6th March, 2017 ++ *Last Build*: 8th March, 2017 + *Version*: 2.3.6 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **92701** -+ *File count*: **599** ++ *Line count*: **92871** ++ *File count*: **601** + *Folder count*: **105** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index dae403473..a3057c806 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index ce53699b8..9f724ffb1 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.css diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index e5813b416..4006ff308 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index e6f79f614..696569c36 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index f5912c03b..7b9dea87a 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.css diff --git a/admin/assets/css/site_views.css b/admin/assets/css/site_views.css index bcc9d8a49..294b3129e 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.css diff --git a/admin/compiler/joomla_3/Helper.php b/admin/compiler/joomla_3/Helper.php index 0b2aa20eb..beae06093 100644 --- a/admin/compiler/joomla_3/Helper.php +++ b/admin/compiler/joomla_3/Helper.php @@ -696,6 +696,20 @@ abstract class ###Component###Helper // 0nly continue if we have a string if (self::checkString($string)) { + // create file name without the extention that is safe + if ($type === 'filename') + { + // make sure VDM is not in the string + $string = str_replace('VDM', 'vDm', $string); + // Remove anything which isn't a word, whitespace, number + // or any of the following caracters -_() + // If you don't need to handle multi-byte characters + // you can use preg_replace rather than mb_ereg_replace + // Thanks @Łukasz Rysiak! + $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string); + // http://stackoverflow.com/a/2021729/1429677 + return preg_replace('/\s+/', ' ', $string); + } // remove all other characters $string = trim($string); $string = preg_replace('/'.$spacer.'+/', ' ', $string); diff --git a/admin/compiler/joomla_3/Helper_site.php b/admin/compiler/joomla_3/Helper_site.php index bdbc3dd01..75a830633 100644 --- a/admin/compiler/joomla_3/Helper_site.php +++ b/admin/compiler/joomla_3/Helper_site.php @@ -688,6 +688,20 @@ abstract class ###Component###Helper // 0nly continue if we have a string if (self::checkString($string)) { + // create file name without the extention that is safe + if ($type === 'filename') + { + // make sure VDM is not in the string + $string = str_replace('VDM', 'vDm', $string); + // Remove anything which isn't a word, whitespace, number + // or any of the following caracters -_() + // If you don't need to handle multi-byte characters + // you can use preg_replace rather than mb_ereg_replace + // Thanks @Łukasz Rysiak! + $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string); + // http://stackoverflow.com/a/2021729/1429677 + return preg_replace('/\s+/', ' ', $string); + } // remove all other characters $string = trim($string); $string = preg_replace('/'.$spacer.'+/', ' ', $string); diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 8607b0159..391439656 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 829406424..966ec634a 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index e3e9ccf80..5bfa65878 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index f27e03e2f..b70976663 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 190859591..4ed3a71ad 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index c54189821..a70acfbe3 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 3069f4542..7a7eae85a 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 2fb21b70d..7a350ac13 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index b9f581b24..c1c4274a8 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index 9ea3e8fbd..818cb5c06 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php index 08560867b..a1773314d 100644 --- a/admin/helpers/compiler.php +++ b/admin/helpers/compiler.php @@ -107,6 +107,8 @@ class Compiler extends Infusion $this->setLangFileData(); // move the update server into place $this->setUpdateServer(); + // set the global counters + $this->setCountingStuff(); // build read me $this->buildReadMe(); // zip the component @@ -302,6 +304,38 @@ class Compiler extends Infusion $this->fileContentStatic['###BUILDDATE###'] = $this->fileContentStatic['###BUILDDATE###GLOBAL']; $this->fileContentStatic['###VERSION###'] = $this->fileContentStatic['###VERSION###GLOBAL']; } + + // set all global numbers + protected function setCountingStuff() + { + // what is the size in terms of an A4 book + $this->pageCount = round($this->lineCount / 56); + // setup the unrealistic numbers + $this->folderSeconds = $this->folderCount * 5; + $this->fileSeconds = $this->fileCount * 5; + $this->lineSeconds = $this->lineCount * 10; + $this->seconds = $this->folderSeconds + $this->fileSeconds + $this->lineSeconds; + $this->totalHours = round($this->seconds / 3600); + $this->totalDays = round($this->totalHours / 8); + // setup the more realistic numbers + $this->secondsDebugging = $this->seconds / 4; + $this->secondsPlanning = $this->seconds / 7; + $this->secondsMapping = $this->seconds / 10; + $this->secondsOffice = $this->seconds / 6; + $this->actualSeconds = $this->folderSeconds + $this->fileSeconds + $this->lineSeconds + $this->secondsDebugging + $this->secondsPlanning + $this->secondsMapping + $this->secondsOffice; + $this->actualTotalHours = round($this->actualSeconds / 3600); + $this->actualTotalDays = round($this->actualTotalHours / 8); + $this->debuggingHours = round($this->secondsDebugging / 3600); + $this->planningHours = round($this->secondsPlanning / 3600); + $this->mappingHours = round($this->secondsMapping / 3600); + $this->officeHours = round($this->secondsOffice / 3600); + // the actual time spent + $this->actualHoursSpent = $this->actualTotalHours - $this->totalHours; + $this->actualDaysSpent = $this->actualTotalDays - $this->totalDays; + // calculate the projects actual time frame of completion + $this->projectWeekTime = round($this->actualTotalDays / 5,1); + $this->projectMonthTime = round($this->actualTotalDays / 24,1); + } private function buildReadMe() { @@ -339,33 +373,6 @@ class Compiler extends Infusion private function buildReadMeData() { - // what is the size in terms of an A4 book - $this->pageCount = round($this->lineCount / 56); - // setup the unrealistic numbers - $this->folderSeconds = $this->folderCount * 5; - $this->fileSeconds = $this->fileCount * 5; - $this->lineSeconds = $this->lineCount * 10; - $this->seconds = $this->folderSeconds + $this->fileSeconds + $this->lineSeconds; - $this->totalHours = round($this->seconds / 3600); - $this->totalDays = round($this->totalHours / 8); - // setup the more realistic numbers - $this->secondsDebugging = $this->seconds / 4; - $this->secondsPlanning = $this->seconds / 7; - $this->secondsMapping = $this->seconds / 10; - $this->secondsOffice = $this->seconds / 6; - $this->actualSeconds = $this->folderSeconds + $this->fileSeconds + $this->lineSeconds + $this->secondsDebugging + $this->secondsPlanning + $this->secondsMapping + $this->secondsOffice; - $this->actualTotalHours = round($this->actualSeconds / 3600); - $this->actualTotalDays = round($this->actualTotalHours / 8); - $this->debuggingHours = round($this->secondsDebugging / 3600); - $this->planningHours = round($this->secondsPlanning / 3600); - $this->mappingHours = round($this->secondsMapping / 3600); - $this->officeHours = round($this->secondsOffice / 3600); - // the actual time spent - $this->actualHoursSpent = $this->actualTotalHours - $this->totalHours; - $this->actualDaysSpent = $this->actualTotalDays - $this->totalDays; - // calculate the projects actual time frame of completion - $this->projectWeekTime = round($this->actualTotalDays / 5,1); - $this->projectMonthTime = round($this->actualTotalDays / 24,1); // set some defaults $this->fileContentStatic['###LINE_COUNT###'] = $this->lineCount; $this->fileContentStatic['###FILE_COUNT###'] = $this->fileCount; diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index b167d327c..f9138277f 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -2318,7 +2318,11 @@ class Get $langHolders["JText::sprintf('".$string."',"] = "JText::sprintf('".$keyLang."',"; $langHolders['JText::sprintf("'.$string.'",'] = 'JText::sprintf("'.$keyLang.'",'; } - $content = $this->setPlaceholders($content, $langHolders); + // only continue if we have value to replace + if (isset($langHolders) && ComponentbuilderHelper::checkArray($langHolders)) + { + $content = $this->setPlaceholders($content, $langHolders); + } } } return $content; @@ -2733,7 +2737,11 @@ class Get */ public function setDynamicValues($string) { - return $this->setLangStrings($this->setCustomCodeData($string)); + if (ComponentbuilderHelper::checkString($string)) + { + return $this->setLangStrings($this->setCustomCodeData($string)); + } + return $string; } /** diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php index 6490df68d..9a58c05ab 100644 --- a/admin/helpers/compiler/c_Fields.php +++ b/admin/helpers/compiler/c_Fields.php @@ -455,18 +455,13 @@ class Fields extends Structure } // start adding dynamc fields $dynamcfields = ''; - // place holders - $placeholders = array( - '###component###' => $component, - '###view###' => $viewName, - '###views###' => $listViewName); $spacerCounter = 'a'; // set the custom table key $dbkey = 'g'; // TODO we should add the global and local view switch if field for front end foreach ($view['settings']->fields as $field) { - $dynamcfields .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $placeholders, $dbkey, true); + $dynamcfields .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $this->placeholders, $dbkey, true); } // set the defautl fields @@ -1247,7 +1242,7 @@ class Fields extends Structure { // quick check if this is a category linked to view page $requeSt_id = ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"'); - if (strpos($requeSt_id, '_request_id') !== false) + if (strpos($requeSt_id, '_request_id') !== false || strpos($requeSt_id, '_request_catid') !== false) { // keep it then, don't change $xmlValue = $requeSt_id; @@ -1301,7 +1296,7 @@ class Fields extends Structure { // make sure the XML name is uniqe, so we can add one field multiple times $xmlValue = $this->uniqueName($xmlValue, $viewName); - $name = $this->setPlaceholders($xmlValue); + $name = $this->setPlaceholders($xmlValue, $placeholders); } } elseif ($property['name'] === 'extension' || $property['name'] === 'directory') diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 954d71af4..c9f08f46c 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -48,6 +48,9 @@ class Interpretation extends Fields public $otherWhere = array(); public $DashboardGetCustomData = array(); public $customAdminAdded = array(); + + protected $hasCatIdRequest = array(); + protected $hasIdRequest = array(); /** * Constructor @@ -1073,15 +1076,27 @@ class Interpretation extends Fields $xml .= PHP_EOL."\t\t\t".''; $xml .= PHP_EOL."\t\t".''; $xml .= PHP_EOL."\t".''; - if (isset($this->hasIdRequest[$view['settings']->code])) + if (isset($this->hasIdRequest[$view['settings']->code]) || isset($this->hasCatIdRequest[$view['settings']->code])) { - $requestField = str_replace($view['settings']->code.'_request_id', 'id', $this->hasIdRequest[$view['settings']->code]); $xml .= PHP_EOL."\t".''; $xml .= PHP_EOL."\t".''; $xml .= PHP_EOL."\t\t".'
fileContentStatic['###component###'].'/models/fields">'; - $xml .= PHP_EOL."\t\t\t".$requestField; + if (isset($this->hasIdRequest[$view['settings']->code]) && ComponentbuilderHelper::checkArray($this->hasIdRequest[$view['settings']->code])) + { + foreach($this->hasIdRequest[$view['settings']->code] as $requestFieldXML) + { + $xml .= PHP_EOL."\t\t\t".$requestFieldXML; + } + } + if (isset($this->hasCatIdRequest[$view['settings']->code]) && ComponentbuilderHelper::checkArray($this->hasCatIdRequest[$view['settings']->code])) + { + foreach($this->hasCatIdRequest[$view['settings']->code] as $requestFieldXML) + { + $xml .= PHP_EOL."\t\t\t".$requestFieldXML; + } + } $xml .= PHP_EOL."\t\t".'
'; $xml .= PHP_EOL."\t".''; } @@ -2804,7 +2819,14 @@ class Interpretation extends Fields $keyCode = ComponentbuilderHelper::safeString($custom_button['name']); $this->langContent[$this->lang][$keyLang] = trim($custom_button['name']); // add cpanel button TODO does not work well on site with permissions - $buttons[] = "\t".$tab."\tif (\$this->canDo->get('".$viewName.".".$keyCode."'))"; + if ($custom_button['target'] == 2) + { + $buttons[] = "\t".$tab."\tif (\$this->user->authorise('".$viewName.".".$keyCode."'))"; + } + else + { + $buttons[] = "\t".$tab."\tif (\$this->canDo->get('".$viewName.".".$keyCode."'))"; + } $buttons[] = "\t".$tab."\t{"; $buttons[] = "\t".$tab."\t\t//".$this->setLine(__LINE__)." add ".$custom_button['name']." button."; $buttons[] = "\t".$tab."\t\tJToolBarHelper::custom('".$viewName.".".$custom_button['method']."', '".$custom_button['icomoon']."', '', '".$keyLang."', false);"; @@ -2818,7 +2840,7 @@ class Interpretation extends Fields $keyCode = ComponentbuilderHelper::safeString($custom_button['name']); $this->langContent[$this->lang][$keyLang] = trim($custom_button['name']); // add cpanel button TODO does not work well on site with permissions - $buttons[] = "\t".$tab."\tif (\$this->canDo->get('".$viewName.".".$keyCode."'))"; + $buttons[] = "\t".$tab."\tif (\$this->user->authorise('".$viewName.".".$keyCode."'))"; $buttons[] = "\t".$tab."\t{"; $buttons[] = "\t".$tab."\t\t//".$this->setLine(__LINE__)." add ".$custom_button['name']." button."; $buttons[] = "\t".$tab."\t\tJToolBarHelper::custom('".$viewsName.".".$custom_button['method']."', '".$custom_button['icomoon']."', '', '".$keyLang."', false);"; @@ -2850,7 +2872,7 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkString($view['settings']->php_controller) && $view['settings']->php_controller != '//') { // set the custom buttons ###CUSTOM_BUTTONS_CONTROLLER### - $this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER'.$list.'###'] = + $this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] = PHP_EOL.PHP_EOL.$this->setPlaceholders($view['settings']->php_controller, $this->placeholders); if ('site' === $this->target) { @@ -2865,7 +2887,7 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkString($view['settings']->php_model) && $view['settings']->php_model != '//') { // set the custom buttons ###CUSTOM_BUTTONS_METHOD### - $this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD'.$list.'###'] = + $this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD###'] = PHP_EOL.PHP_EOL.$this->setPlaceholders($view['settings']->php_model, $this->placeholders); } } @@ -11883,25 +11905,43 @@ class Interpretation extends Fields $tabCode = ComponentbuilderHelper::safeString($tab).'_custom_config'; $tabUpper = ComponentbuilderHelper::safeString($tab,'U'); $tabLower = ComponentbuilderHelper::safeString($tab); - // load the regust id setters for menu views - $viewRequest = 'name="'.$tabLower.'_request_id"'; + // load the request id setters for menu views + $viewRequest = 'name="'.$tabLower.'_request_id'; foreach($tabFields as $et => $id_field) { if(strpos($id_field,$viewRequest) !== false) { - // set the values needed to insure route is done correclty - $this->hasIdRequest[$tabLower] = $id_field; + $this->setRequestValues($tabLower, $id_field, $viewRequest, 'id', 'hasIdRequest'); unset($tabFields[$et]); } - elseif (strpos($id_field,'_request_id"') !== false) + elseif (strpos($id_field,'_request_id') !== false) { // not loaded to a tab "view" name - $_viewRequest = ComponentbuilderHelper::getBetween($id_field,'name="','_request_id"'); - // set the values needed to insure route is done correclty - $this->hasIdRequest[$_viewRequest] = $id_field; + $_viewRequest = ComponentbuilderHelper::getBetween($id_field,'name="','_request_id'); + $searchIdKe = 'name="'.$_viewRequest.'_request_id'; + $this->setRequestValues($_viewRequest, $id_field, $searchIdKe, 'id', 'hasIdRequest'); unset($tabFields[$et]); } } + // load the request catid setters for menu views + $viewRequestC = 'name="'.$tabLower.'_request_catid'; + foreach($tabFields as $ci => $catid_field) + { + if(strpos($catid_field,$viewRequestC) !== false) + { + + $this->setRequestValues($tabLower, $catid_field, $viewRequestC, 'catid', 'hasCatIdRequest'); + unset($tabFields[$ci]); + } + elseif (strpos($catid_field,'_request_catid') !== false) + { + // not loaded to a tab "view" name + $_viewRequestC = ComponentbuilderHelper::getBetween($catid_field,'name="','_request_catid'); + $searchCatidKe = 'name="'.$_viewRequestC.'_request_catid'; + $this->setRequestValues($_viewRequestC, $catid_field, $searchCatidKe, 'catid', 'hasCatIdRequest'); + unset($tabFields[$ci]); + } + } // load the global menu setters for single fields $menuSetter = $tabLower.'_menu'; $pageSettings = array(); @@ -11932,6 +11972,29 @@ class Interpretation extends Fields } } } + + protected function setRequestValues($view, $field, $search, $target, $store) + { + $key = ComponentbuilderHelper::getBetween($field, $search, '"'); + if (!ComponentbuilderHelper::checkString($key)) + { + // is not having special var + $key = $target; + // update field + $field = str_replace($search . '"', 'name="'. $key . '"', $field); + } + else + { + // update field + $field = str_replace($search . $key . '"', 'name="'. $key . '"', $field); + } + if (!isset($this->{$store}[$view])) + { + $this->{$store}[$view] = array(); + } + // set the values needed for view requests to be made + $this->{$store}[$view][$key] = $field; + } public function setCustomControlConfigFieldsets($lang) { @@ -13391,30 +13454,8 @@ function vdm_dkim() { $this->langContent['admin'][$siteDesc] = ' Allows the users in this group to access site '.ComponentbuilderHelper::safeString($siteName,'w').'.'; $this->componentGlobal[$sortKey] = "\t\t".''; } - // add the custom permissions to use the buttons of this view - /* if (ComponentbuilderHelper::checkArray($site_view['settings']->custom_buttons)) - { - foreach ($site_view['settings']->custom_buttons as $custom_buttons) - { - $siteButtonName = $custom_buttons['name']; - $siteButtonCode = ComponentbuilderHelper::safeString($siteButtonName); - $siteButtonTitle = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($siteName.' '.$siteButtonName.' Button Access','U'); - $siteButtonDesc = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($siteName.' '.$siteButtonName.' Button Access','U').'_DESC'; - $sortButtonKey = ComponentbuilderHelper::safeString($siteButtonTitle); - $this->langContent['admin'][$siteButtonTitle] = $siteName.' '.$siteButtonName.' Button Access'; - $this->langContent['admin'][$siteButtonDesc] = ' Allows the users in this group to access the '.ComponentbuilderHelper::safeString($siteButtonName,'w').' button.'; - $this->componentGlobal[$sortButtonKey] = "\t\t".''; - } - } - // add menu controll view that has menus options - foreach ($menuControllers as $menuController) - { - // add menu controll view that has menus options - if ($site_view[$menuController]) - { - // TODO for CUSTOM MENUS!!! - } - } */ + // add the custom permissions to use the buttons of this view + $this->addCustomButtonPermissions($site_view['settings'], $siteName, $siteCode); } } if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views)) diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 4def2c76a..e42cd1a63 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -1348,6 +1348,20 @@ abstract class ComponentbuilderHelper // 0nly continue if we have a string if (self::checkString($string)) { + // create file name without the extention that is safe + if ($type === 'filename') + { + // make sure VDM is not in the string + $string = str_replace('VDM', 'vDm', $string); + // Remove anything which isn't a word, whitespace, number + // or any of the following caracters -_() + // If you don't need to handle multi-byte characters + // you can use preg_replace rather than mb_ereg_replace + // Thanks @Łukasz Rysiak! + $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string); + // http://stackoverflow.com/a/2021729/1429677 + return preg_replace('/\s+/', ' ', $string); + } // remove all other characters $string = trim($string); $string = preg_replace('/'.$spacer.'+/', ' ', $string); diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index d0d0439e4..0d9a0c2f5 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 461a06bc5..33ea36499 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index fe5cb72c7..60f160896 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index 9d6c3496c..89bdb7be7 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 7a658d0f9..c69eb225c 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 50a9968cd..2a3cb15f3 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -3319,6 +3319,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_NO="No" COM_COMPONENTBUILDER_SITE_VIEW_NONE="None" COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION="<?php echo JText::_('Text'); ?>" COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL="Add Language String" +COM_COMPONENTBUILDER_SITE_VIEW_NOTE_CUSTOM_TOOLBAR_PLACEHOLDER_DESCRIPTION="Use this placeholder in the body [[[SITE_TOOLBAR]]] to add the custom position of the toolbar." COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL="Snippet Usage" COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL="Snippet Details" COM_COMPONENTBUILDER_SITE_VIEW_NOTIFICATION="Notification" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 46520df21..4aa201bf2 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php index 508a33354..3b3c4849e 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index 1419cfbb3..5085f400f 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index 289a96608..1ccbe4127 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php index 20d9cee72..0704bf224 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vxtfields; +$items = $displayData->vxvfields; $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 29bf7b9ad..0f1ba225c 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php index 565880e8f..18151dedd 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vxulinked_components; +$items = $displayData->vxwlinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index 488b74032..b5bb0d469 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index 18ab556ed..d9ed418aa 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index 8807ca47e..a9758fe1b 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index 985681f2c..3818662f4 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index 890419a16..f3aabd645 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php index 13e1dfe1b..901ea70e6 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_above.php diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php index c9fbdfc63..6d54d9396 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php index acdecea46..20c66d100 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index 26a827488..9f5daeacc 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_under.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 007c9fee0..a590fe3ac 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index bb928e636..2bd1cd79c 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index 1419cfbb3..5085f400f 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index 1b8edd21f..a9219d2ef 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index 5fb9ba377..de739a9ac 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index a069569e5..c14c06f78 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index a0350375a..73dae2062 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index 0b8ca767d..c1cff82c1 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index 13c4df5b2..f3feb8cc2 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index d20a3fe48..19bc21015 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index 8548b0b76..d48f775cc 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vyelinked_components; +$items = $displayData->vyglinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 985681f2c..3818662f4 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index 890419a16..f3aabd645 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index 61b7d4708..65de3c721 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index 9af8d6969..780dccb08 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index 28552005b..186bf7f86 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index 6bfc7da1e..886b345b7 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php index d20a3fe48..19bc21015 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index 985681f2c..3818662f4 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index 890419a16..f3aabd645 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index 4416303f1..e5f0a708f 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index 88830a04c..d7f8dbcd9 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index 879f18fa1..44474f440 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index 709653ef6..72b7900fd 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_above.php diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index 4f7488495..e74e556a9 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index 50f70afd6..d79f0e58f 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_left.php diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index 961ebd683..6e5b6801e 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_right.php diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index 6a884e93a..11fdcf625 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 985681f2c..3818662f4 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index 890419a16..f3aabd645 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index 8f11b3fb0..fb2e72d4d 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index 1d671518c..adcbffb60 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index d08184a69..0c510419e 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index d20a3fe48..19bc21015 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php index 96b208acd..c1d0895c6 100644 --- a/admin/layouts/field/linked_admin_views_fullwidth.php +++ b/admin/layouts/field/linked_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_admin_views_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vzwlinked_admin_views; +$items = $displayData->vzylinked_admin_views; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit"; diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 985681f2c..3818662f4 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index 890419a16..f3aabd645 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index 7947ea6e4..8e08f96f0 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index 49ac7cfec..d1b395c6c 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 0031381e4..dfa9c964a 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index a58f42bfb..c8db6c3e4 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 13e982c34..24f0998d4 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vzxfields; +$items = $displayData->vzzfields; $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 985681f2c..3818662f4 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index 890419a16..f3aabd645 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 0dbf5db98..7be8e628f 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 717e8b8ae..0bb5b2ac6 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index ee64471fa..bf68effd9 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 4e9ab4d50..7be58c353 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index d20a3fe48..19bc21015 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 985681f2c..3818662f4 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 48ad267a4..0ce74648a 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php index 35c38d862..7e0aca383 100644 --- a/admin/layouts/joomla_component/admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index 95c8e23a7..e109b3bc1 100644 --- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index 5fb9ba377..de739a9ac 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index a783165ee..7f68a716d 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index 10d7e486c..6953be4d4 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php index d20a3fe48..19bc21015 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php index 6d8fafac5..6a2fe8ef7 100644 --- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index 00cf76232..02981e189 100644 --- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php index 3060ea7f5..aa48ab1c5 100644 --- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php +++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index 0a45d0522..0c91eebbd 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php index 722752b0d..7e0719a05 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php index 985681f2c..3818662f4 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/publlshing.php b/admin/layouts/joomla_component/publlshing.php index 890419a16..f3aabd645 100644 --- a/admin/layouts/joomla_component/publlshing.php +++ b/admin/layouts/joomla_component/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index 6ec3d0c57..e7e3a24bb 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php index 339c95b7c..3b8c2be2b 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php index cd4b0cfdf..657fbf5d2 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index 5ba008f7b..3837590af 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index 4eb4ccb1a..71c89430f 100644 --- a/admin/layouts/joomla_component/site_views_fullwidth.php +++ b/admin/layouts/joomla_component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index af2f95c89..c455900ab 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index 6e64326e3..4f1ab6e79 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index 4d213fcc9..1373919a2 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index 26e61f8d6..85817b73e 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index 3d38b3ce9..9eec2f183 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index d20a3fe48..19bc21015 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index 985681f2c..3818662f4 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index 890419a16..f3aabd645 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index 8011b97fb..2bd1cd79c 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php @@ -30,9 +30,6 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'button_position', - 'add_custom_button', - 'custom_button', 'php_controller', 'php_model' ); diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php new file mode 100644 index 000000000..94a897005 --- /dev/null +++ b/admin/layouts/site_view/custom_buttons_left.php @@ -0,0 +1,55 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'button_position', + 'add_custom_button' +); + +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + +foreach ($fields as $field) +{ + $field = is_array($field) ? $field : array($field); + foreach ($field as $f) + { + if ($form->getField($f)) + { + if (in_array($f, $hiddenFields)) + { + $form->setFieldAttribute($f, 'type', 'hidden'); + } + + echo $form->renderField($f); + break; + } + } +} diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php new file mode 100644 index 000000000..1786338ca --- /dev/null +++ b/admin/layouts/site_view/custom_buttons_right.php @@ -0,0 +1,55 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'note_custom_toolbar_placeholder', + 'custom_button' +); + +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + +foreach ($fields as $field) +{ + $field = is_array($field) ? $field : array($field); + foreach ($field as $f) + { + if ($form->getField($f)) + { + if (in_array($f, $hiddenFields)) + { + $form->setFieldAttribute($f, 'type', 'hidden'); + } + + echo $form->renderField($f); + break; + } + } +} diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index 5fb9ba377..de739a9ac 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index a069569e5..c14c06f78 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index a0350375a..73dae2062 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index 26e61f8d6..85817b73e 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index 13c4df5b2..f3feb8cc2 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index d20a3fe48..19bc21015 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index fded4aa01..bd2f092d8 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index e131f5561..987b6ae74 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vyplinked_components; +$items = $displayData->vyrlinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 0e0950b34..dfd48e67a 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index 985681f2c..3818662f4 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index 890419a16..f3aabd645 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index 569e78aa7..aadeef866 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index 0ee608e19..1880ab4fa 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index fca95769b..06a78f9fc 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index 985681f2c..3818662f4 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index 890419a16..f3aabd645 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index af2f95c89..c455900ab 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index 133f82caf..c1df34ff9 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index 4d213fcc9..1373919a2 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index 26e61f8d6..85817b73e 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index 3d38b3ce9..9eec2f183 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index d20a3fe48..19bc21015 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index 985681f2c..3818662f4 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index 890419a16..f3aabd645 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 9adc618e9..fc0acdb08 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -298,7 +298,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxtfields() + public function getVxvfields() { // Get the user object. $user = JFactory::getUser(); @@ -367,13 +367,13 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVxtfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVxvfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVxtfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVxvfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVxtfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVxvfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVxtfields($item->store, 'store'); + $item->store = $this->selectionTranslationVxvfields($item->store, 'store'); } } @@ -413,7 +413,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVxtfields($value,$name) + public function selectionTranslationVxvfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') @@ -491,7 +491,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxulinked_components() + public function getVxwlinked_components() { // Get the user object. $user = JFactory::getUser(); diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 4954c680f..c948a0f9d 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 41926a1ca..30260dc08 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 18f0b29e3..007b98131 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 7488b902d..973222d18 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -179,7 +179,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVyelinked_components() + public function getVyglinked_components() { // Get the user object. $user = JFactory::getUser(); diff --git a/admin/models/field.php b/admin/models/field.php index 2073c0ca4..cbf16e108 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -141,7 +141,7 @@ class ComponentbuilderModelField extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVzwlinked_admin_views() + public function getVzylinked_admin_views() { // Get the user object. $user = JFactory::getUser(); diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 46f04d461..620891241 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 6f448e46e..fabe36dc5 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 114e46dfb..e439ccb19 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index 04a81f36b..c1bcd4ce9 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 091e82330..63ef33448 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index c99d664e1..76dd63728 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 680e76974..830692962 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index 140dc6762..1f014b44d 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index ec7aa8fe5..6bf82d70d 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @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 c2dd59b02..a34b156a1 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index ac4ae00f6..710be345d 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index 9d58286ef..239ed3c1e 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 91e595964..23f32ae8a 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @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 6fb7caeee..9704cdb4b 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index c9155b893..ae3e04901 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index ed6e89b5c..e8387810f 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index d19a23bd0..d6e506a91 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 2de6f33fb..ed766c54f 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -111,7 +111,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVzxfields() + public function getVzzfields() { // Get the user object. $user = JFactory::getUser(); @@ -195,13 +195,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVzxfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVzzfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVzxfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVzzfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVzxfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVzzfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVzxfields($item->store, 'store'); + $item->store = $this->selectionTranslationVzzfields($item->store, 'store'); } } @@ -215,7 +215,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVzxfields($value,$name) + public function selectionTranslationVzzfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 5d799b9a2..513323382 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js @@ -53,6 +53,8 @@ jform_vvvvvxwvxp_required = false; jform_vvvvvxwvxq_required = false; jform_vvvvvxyvxr_required = false; jform_vvvvvxyvxs_required = false; +jform_vvvvvxyvxt_required = false; +jform_vvvvvxyvxu_required = false; // Initial Script jQuery(document).ready(function() @@ -1010,14 +1012,34 @@ function vvvvvxy(add_custom_button_vvvvvxy) jform_vvvvvxyvxr_required = false; } - jQuery('#jform_php_model').closest('.control-group').show(); + jQuery('#jform_php_controller_list').closest('.control-group').show(); if (jform_vvvvvxyvxs_required) + { + updateFieldRequired('php_controller_list',0); + jQuery('#jform_php_controller_list').prop('required','required'); + jQuery('#jform_php_controller_list').attr('aria-required',true); + jQuery('#jform_php_controller_list').addClass('required'); + jform_vvvvvxyvxs_required = false; + } + + jQuery('#jform_php_model').closest('.control-group').show(); + if (jform_vvvvvxyvxt_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_vvvvvxyvxs_required = false; + jform_vvvvvxyvxt_required = false; + } + + jQuery('#jform_php_model_list').closest('.control-group').show(); + if (jform_vvvvvxyvxu_required) + { + updateFieldRequired('php_model_list',0); + jQuery('#jform_php_model_list').prop('required','required'); + jQuery('#jform_php_model_list').attr('aria-required',true); + jQuery('#jform_php_model_list').addClass('required'); + jform_vvvvvxyvxu_required = false; } } @@ -1033,14 +1055,32 @@ function vvvvvxy(add_custom_button_vvvvvxy) jQuery('#jform_php_controller').removeClass('required'); jform_vvvvvxyvxr_required = true; } - jQuery('#jform_php_model').closest('.control-group').hide(); + jQuery('#jform_php_controller_list').closest('.control-group').hide(); if (!jform_vvvvvxyvxs_required) + { + updateFieldRequired('php_controller_list',1); + jQuery('#jform_php_controller_list').removeAttr('required'); + jQuery('#jform_php_controller_list').removeAttr('aria-required'); + jQuery('#jform_php_controller_list').removeClass('required'); + jform_vvvvvxyvxs_required = true; + } + jQuery('#jform_php_model').closest('.control-group').hide(); + if (!jform_vvvvvxyvxt_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_vvvvvxyvxs_required = true; + jform_vvvvvxyvxt_required = true; + } + jQuery('#jform_php_model_list').closest('.control-group').hide(); + if (!jform_vvvvvxyvxu_required) + { + updateFieldRequired('php_model_list',1); + jQuery('#jform_php_model_list').removeAttr('required'); + jQuery('#jform_php_model_list').removeAttr('aria-required'); + jQuery('#jform_php_model_list').removeClass('required'); + jform_vvvvvxyvxu_required = true; } } } diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js index 4799ff794..4032c3c19 100644 --- a/admin/models/forms/custom_admin_view.js +++ b/admin/models/forms/custom_admin_view.js @@ -23,15 +23,15 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvxzvxv_required = false; -jform_vvvvvyavxw_required = false; -jform_vvvvvybvxx_required = false; -jform_vvvvvycvxy_required = false; -jform_vvvvvydvxz_required = false; -jform_vvvvvyevya_required = false; -jform_vvvvvyfvyb_required = false; -jform_vvvvvyfvyc_required = false; -jform_vvvvvygvyd_required = false; +jform_vvvvvxzvxx_required = false; +jform_vvvvvyavxy_required = false; +jform_vvvvvybvxz_required = false; +jform_vvvvvycvya_required = false; +jform_vvvvvydvyb_required = false; +jform_vvvvvyevyc_required = false; +jform_vvvvvyfvyd_required = false; +jform_vvvvvyfvye_required = false; +jform_vvvvvygvyf_required = false; // Initial Script jQuery(document).ready(function() @@ -68,26 +68,26 @@ function vvvvvxz(add_php_view_vvvvvxz) if (add_php_view_vvvvvxz == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvxzvxv_required) + if (jform_vvvvvxzvxx_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_vvvvvxzvxv_required = false; + jform_vvvvvxzvxx_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvxzvxv_required) + if (!jform_vvvvvxzvxx_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_vvvvvxzvxv_required = true; + jform_vvvvvxzvxx_required = true; } } } @@ -99,26 +99,26 @@ function vvvvvya(add_php_jview_display_vvvvvya) if (add_php_jview_display_vvvvvya == 1) { jQuery('#jform_php_jview_display').closest('.control-group').show(); - if (jform_vvvvvyavxw_required) + if (jform_vvvvvyavxy_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_vvvvvyavxw_required = false; + jform_vvvvvyavxy_required = false; } } else { jQuery('#jform_php_jview_display').closest('.control-group').hide(); - if (!jform_vvvvvyavxw_required) + if (!jform_vvvvvyavxy_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_vvvvvyavxw_required = true; + jform_vvvvvyavxy_required = true; } } } @@ -130,26 +130,26 @@ function vvvvvyb(add_php_jview_vvvvvyb) if (add_php_jview_vvvvvyb == 1) { jQuery('#jform_php_jview').closest('.control-group').show(); - if (jform_vvvvvybvxx_required) + if (jform_vvvvvybvxz_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_vvvvvybvxx_required = false; + jform_vvvvvybvxz_required = false; } } else { jQuery('#jform_php_jview').closest('.control-group').hide(); - if (!jform_vvvvvybvxx_required) + if (!jform_vvvvvybvxz_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_vvvvvybvxx_required = true; + jform_vvvvvybvxz_required = true; } } } @@ -161,26 +161,26 @@ function vvvvvyc(add_php_document_vvvvvyc) if (add_php_document_vvvvvyc == 1) { jQuery('#jform_php_document').closest('.control-group').show(); - if (jform_vvvvvycvxy_required) + if (jform_vvvvvycvya_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_vvvvvycvxy_required = false; + jform_vvvvvycvya_required = false; } } else { jQuery('#jform_php_document').closest('.control-group').hide(); - if (!jform_vvvvvycvxy_required) + if (!jform_vvvvvycvya_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_vvvvvycvxy_required = true; + jform_vvvvvycvya_required = true; } } } @@ -192,26 +192,26 @@ function vvvvvyd(add_css_document_vvvvvyd) if (add_css_document_vvvvvyd == 1) { jQuery('#jform_css_document').closest('.control-group').show(); - if (jform_vvvvvydvxz_required) + if (jform_vvvvvydvyb_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_vvvvvydvxz_required = false; + jform_vvvvvydvyb_required = false; } } else { jQuery('#jform_css_document').closest('.control-group').hide(); - if (!jform_vvvvvydvxz_required) + if (!jform_vvvvvydvyb_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_vvvvvydvxz_required = true; + jform_vvvvvydvyb_required = true; } } } @@ -223,26 +223,26 @@ function vvvvvye(add_js_document_vvvvvye) if (add_js_document_vvvvvye == 1) { jQuery('#jform_js_document').closest('.control-group').show(); - if (jform_vvvvvyevya_required) + if (jform_vvvvvyevyc_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_vvvvvyevya_required = false; + jform_vvvvvyevyc_required = false; } } else { jQuery('#jform_js_document').closest('.control-group').hide(); - if (!jform_vvvvvyevya_required) + if (!jform_vvvvvyevyc_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_vvvvvyevya_required = true; + jform_vvvvvyevyc_required = true; } } } @@ -255,23 +255,23 @@ function vvvvvyf(add_custom_button_vvvvvyf) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvyfvyb_required) + if (jform_vvvvvyfvyd_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_vvvvvyfvyb_required = false; + jform_vvvvvyfvyd_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvyfvyc_required) + if (jform_vvvvvyfvye_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_vvvvvyfvyc_required = false; + jform_vvvvvyfvye_required = false; } } @@ -279,22 +279,22 @@ function vvvvvyf(add_custom_button_vvvvvyf) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvyfvyb_required) + if (!jform_vvvvvyfvyd_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_vvvvvyfvyb_required = true; + jform_vvvvvyfvyd_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvyfvyc_required) + if (!jform_vvvvvyfvye_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_vvvvvyfvyc_required = true; + jform_vvvvvyfvye_required = true; } } } @@ -306,26 +306,26 @@ function vvvvvyg(add_css_vvvvvyg) if (add_css_vvvvvyg == 1) { jQuery('#jform_css').closest('.control-group').show(); - if (jform_vvvvvygvyd_required) + if (jform_vvvvvygvyf_required) { updateFieldRequired('css',0); jQuery('#jform_css').prop('required','required'); jQuery('#jform_css').attr('aria-required',true); jQuery('#jform_css').addClass('required'); - jform_vvvvvygvyd_required = false; + jform_vvvvvygvyf_required = false; } } else { jQuery('#jform_css').closest('.control-group').hide(); - if (!jform_vvvvvygvyd_required) + if (!jform_vvvvvygvyf_required) { updateFieldRequired('css',1); jQuery('#jform_css').removeAttr('required'); jQuery('#jform_css').removeAttr('aria-required'); jQuery('#jform_css').removeClass('required'); - jform_vvvvvygvyd_required = true; + jform_vvvvvygvyf_required = true; } } } diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js index b48f77afd..637db7877 100644 --- a/admin/models/forms/custom_code.js +++ b/admin/models/forms/custom_code.js @@ -23,10 +23,10 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvzovzk_required = false; -jform_vvvvvzpvzl_required = false; -jform_vvvvvzpvzm_required = false; +jform_vvvvvzovzm_required = false; jform_vvvvvzpvzn_required = false; +jform_vvvvvzpvzo_required = false; +jform_vvvvvzpvzp_required = false; // Initial Script jQuery(document).ready(function() @@ -53,13 +53,13 @@ function vvvvvzo(target_vvvvvzo) if (target_vvvvvzo == 2) { jQuery('#jform_function_name').closest('.control-group').show(); - if (jform_vvvvvzovzk_required) + if (jform_vvvvvzovzm_required) { updateFieldRequired('function_name',0); jQuery('#jform_function_name').prop('required','required'); jQuery('#jform_function_name').attr('aria-required',true); jQuery('#jform_function_name').addClass('required'); - jform_vvvvvzovzk_required = false; + jform_vvvvvzovzm_required = false; } jQuery('.note_jcb_placeholder').closest('.control-group').show(); @@ -68,13 +68,13 @@ function vvvvvzo(target_vvvvvzo) else { jQuery('#jform_function_name').closest('.control-group').hide(); - if (!jform_vvvvvzovzk_required) + if (!jform_vvvvvzovzm_required) { updateFieldRequired('function_name',1); jQuery('#jform_function_name').removeAttr('required'); jQuery('#jform_function_name').removeAttr('aria-required'); jQuery('#jform_function_name').removeClass('required'); - jform_vvvvvzovzk_required = true; + jform_vvvvvzovzm_required = true; } jQuery('.note_jcb_placeholder').closest('.control-group').hide(); jQuery('#jform_system_name').closest('.control-group').hide(); @@ -88,70 +88,70 @@ function vvvvvzp(target_vvvvvzp) if (target_vvvvvzp == 1) { jQuery('#jform_component').closest('.control-group').show(); - if (jform_vvvvvzpvzl_required) + if (jform_vvvvvzpvzn_required) { updateFieldRequired('component',0); jQuery('#jform_component').prop('required','required'); jQuery('#jform_component').attr('aria-required',true); jQuery('#jform_component').addClass('required'); - jform_vvvvvzpvzl_required = false; + jform_vvvvvzpvzn_required = false; } jQuery('#jform_path').closest('.control-group').show(); - if (jform_vvvvvzpvzm_required) + if (jform_vvvvvzpvzo_required) { updateFieldRequired('path',0); jQuery('#jform_path').prop('required','required'); jQuery('#jform_path').attr('aria-required',true); jQuery('#jform_path').addClass('required'); - jform_vvvvvzpvzm_required = false; + jform_vvvvvzpvzo_required = false; } jQuery('#jform_from_line').closest('.control-group').show(); jQuery('#jform_hashtarget').closest('.control-group').show(); jQuery('#jform_to_line').closest('.control-group').show(); jQuery('#jform_type').closest('.control-group').show(); - if (jform_vvvvvzpvzn_required) + if (jform_vvvvvzpvzp_required) { updateFieldRequired('type',0); jQuery('#jform_type').prop('required','required'); jQuery('#jform_type').attr('aria-required',true); jQuery('#jform_type').addClass('required'); - jform_vvvvvzpvzn_required = false; + jform_vvvvvzpvzp_required = false; } } else { jQuery('#jform_component').closest('.control-group').hide(); - if (!jform_vvvvvzpvzl_required) + if (!jform_vvvvvzpvzn_required) { updateFieldRequired('component',1); jQuery('#jform_component').removeAttr('required'); jQuery('#jform_component').removeAttr('aria-required'); jQuery('#jform_component').removeClass('required'); - jform_vvvvvzpvzl_required = true; + jform_vvvvvzpvzn_required = true; } jQuery('#jform_path').closest('.control-group').hide(); - if (!jform_vvvvvzpvzm_required) + if (!jform_vvvvvzpvzo_required) { updateFieldRequired('path',1); jQuery('#jform_path').removeAttr('required'); jQuery('#jform_path').removeAttr('aria-required'); jQuery('#jform_path').removeClass('required'); - jform_vvvvvzpvzm_required = true; + jform_vvvvvzpvzo_required = true; } jQuery('#jform_from_line').closest('.control-group').hide(); jQuery('#jform_hashtarget').closest('.control-group').hide(); jQuery('#jform_to_line').closest('.control-group').hide(); jQuery('#jform_type').closest('.control-group').hide(); - if (!jform_vvvvvzpvzn_required) + if (!jform_vvvvvzpvzp_required) { updateFieldRequired('type',1); jQuery('#jform_type').removeAttr('required'); jQuery('#jform_type').removeAttr('aria-required'); jQuery('#jform_type').removeClass('required'); - jform_vvvvvzpvzn_required = true; + jform_vvvvvzpvzp_required = true; } } } diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js index ca6923208..2a2fbdb1c 100644 --- a/admin/models/forms/dynamic_get.js +++ b/admin/models/forms/dynamic_get.js @@ -23,24 +23,24 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvysvys_required = false; -jform_vvvvvytvyt_required = false; -jform_vvvvvyuvyu_required = false; -jform_vvvvvyvvyv_required = false; -jform_vvvvvywvyw_required = false; -jform_vvvvvyxvyx_required = false; -jform_vvvvvzcvyy_required = false; -jform_vvvvvzevyz_required = false; -jform_vvvvvzfvza_required = false; -jform_vvvvvzhvzb_required = false; -jform_vvvvvzhvzc_required = false; -jform_vvvvvzivzd_required = false; -jform_vvvvvzjvze_required = false; -jform_vvvvvzkvzf_required = false; -jform_vvvvvzmvzg_required = false; -jform_vvvvvzmvzh_required = false; +jform_vvvvvysvyu_required = false; +jform_vvvvvytvyv_required = false; +jform_vvvvvyuvyw_required = false; +jform_vvvvvyvvyx_required = false; +jform_vvvvvywvyy_required = false; +jform_vvvvvyxvyz_required = false; +jform_vvvvvzcvza_required = false; +jform_vvvvvzevzb_required = false; +jform_vvvvvzfvzc_required = false; +jform_vvvvvzhvzd_required = false; +jform_vvvvvzhvze_required = false; +jform_vvvvvzivzf_required = false; +jform_vvvvvzjvzg_required = false; +jform_vvvvvzkvzh_required = false; jform_vvvvvzmvzi_required = false; -jform_vvvvvznvzj_required = false; +jform_vvvvvzmvzj_required = false; +jform_vvvvvzmvzk_required = false; +jform_vvvvvznvzl_required = false; // Initial Script jQuery(document).ready(function() @@ -127,26 +127,26 @@ function vvvvvys(gettype_vvvvvys) if (gettype) { jQuery('#jform_getcustom').closest('.control-group').show(); - if (jform_vvvvvysvys_required) + if (jform_vvvvvysvyu_required) { updateFieldRequired('getcustom',0); jQuery('#jform_getcustom').prop('required','required'); jQuery('#jform_getcustom').attr('aria-required',true); jQuery('#jform_getcustom').addClass('required'); - jform_vvvvvysvys_required = false; + jform_vvvvvysvyu_required = false; } } else { jQuery('#jform_getcustom').closest('.control-group').hide(); - if (!jform_vvvvvysvys_required) + if (!jform_vvvvvysvyu_required) { updateFieldRequired('getcustom',1); jQuery('#jform_getcustom').removeAttr('required'); jQuery('#jform_getcustom').removeAttr('aria-required'); jQuery('#jform_getcustom').removeClass('required'); - jform_vvvvvysvys_required = true; + jform_vvvvvysvyu_required = true; } } } @@ -182,26 +182,26 @@ function vvvvvyt(main_source_vvvvvyt) if (main_source) { jQuery('#jform_view_table_main').closest('.control-group').show(); - if (jform_vvvvvytvyt_required) + if (jform_vvvvvytvyv_required) { updateFieldRequired('view_table_main',0); jQuery('#jform_view_table_main').prop('required','required'); jQuery('#jform_view_table_main').attr('aria-required',true); jQuery('#jform_view_table_main').addClass('required'); - jform_vvvvvytvyt_required = false; + jform_vvvvvytvyv_required = false; } } else { jQuery('#jform_view_table_main').closest('.control-group').hide(); - if (!jform_vvvvvytvyt_required) + if (!jform_vvvvvytvyv_required) { updateFieldRequired('view_table_main',1); jQuery('#jform_view_table_main').removeAttr('required'); jQuery('#jform_view_table_main').removeAttr('aria-required'); jQuery('#jform_view_table_main').removeClass('required'); - jform_vvvvvytvyt_required = true; + jform_vvvvvytvyv_required = true; } } } @@ -237,26 +237,26 @@ function vvvvvyu(main_source_vvvvvyu) if (main_source) { jQuery('#jform_view_selection').closest('.control-group').show(); - if (jform_vvvvvyuvyu_required) + if (jform_vvvvvyuvyw_required) { updateFieldRequired('view_selection',0); jQuery('#jform_view_selection').prop('required','required'); jQuery('#jform_view_selection').attr('aria-required',true); jQuery('#jform_view_selection').addClass('required'); - jform_vvvvvyuvyu_required = false; + jform_vvvvvyuvyw_required = false; } } else { jQuery('#jform_view_selection').closest('.control-group').hide(); - if (!jform_vvvvvyuvyu_required) + if (!jform_vvvvvyuvyw_required) { updateFieldRequired('view_selection',1); jQuery('#jform_view_selection').removeAttr('required'); jQuery('#jform_view_selection').removeAttr('aria-required'); jQuery('#jform_view_selection').removeClass('required'); - jform_vvvvvyuvyu_required = true; + jform_vvvvvyuvyw_required = true; } } } @@ -292,26 +292,26 @@ function vvvvvyv(main_source_vvvvvyv) if (main_source) { jQuery('#jform_db_table_main').closest('.control-group').show(); - if (jform_vvvvvyvvyv_required) + if (jform_vvvvvyvvyx_required) { updateFieldRequired('db_table_main',0); jQuery('#jform_db_table_main').prop('required','required'); jQuery('#jform_db_table_main').attr('aria-required',true); jQuery('#jform_db_table_main').addClass('required'); - jform_vvvvvyvvyv_required = false; + jform_vvvvvyvvyx_required = false; } } else { jQuery('#jform_db_table_main').closest('.control-group').hide(); - if (!jform_vvvvvyvvyv_required) + if (!jform_vvvvvyvvyx_required) { updateFieldRequired('db_table_main',1); jQuery('#jform_db_table_main').removeAttr('required'); jQuery('#jform_db_table_main').removeAttr('aria-required'); jQuery('#jform_db_table_main').removeClass('required'); - jform_vvvvvyvvyv_required = true; + jform_vvvvvyvvyx_required = true; } } } @@ -347,26 +347,26 @@ function vvvvvyw(main_source_vvvvvyw) if (main_source) { jQuery('#jform_db_selection').closest('.control-group').show(); - if (jform_vvvvvywvyw_required) + if (jform_vvvvvywvyy_required) { updateFieldRequired('db_selection',0); jQuery('#jform_db_selection').prop('required','required'); jQuery('#jform_db_selection').attr('aria-required',true); jQuery('#jform_db_selection').addClass('required'); - jform_vvvvvywvyw_required = false; + jform_vvvvvywvyy_required = false; } } else { jQuery('#jform_db_selection').closest('.control-group').hide(); - if (!jform_vvvvvywvyw_required) + if (!jform_vvvvvywvyy_required) { updateFieldRequired('db_selection',1); jQuery('#jform_db_selection').removeAttr('required'); jQuery('#jform_db_selection').removeAttr('aria-required'); jQuery('#jform_db_selection').removeClass('required'); - jform_vvvvvywvyw_required = true; + jform_vvvvvywvyy_required = true; } } } @@ -389,26 +389,26 @@ function vvvvvyx(addcalculation_vvvvvyx) if (addcalculation_vvvvvyx == 1) { jQuery('#jform_php_calculation').closest('.control-group').show(); - if (jform_vvvvvyxvyx_required) + if (jform_vvvvvyxvyz_required) { updateFieldRequired('php_calculation',0); jQuery('#jform_php_calculation').prop('required','required'); jQuery('#jform_php_calculation').attr('aria-required',true); jQuery('#jform_php_calculation').addClass('required'); - jform_vvvvvyxvyx_required = false; + jform_vvvvvyxvyz_required = false; } } else { jQuery('#jform_php_calculation').closest('.control-group').hide(); - if (!jform_vvvvvyxvyx_required) + if (!jform_vvvvvyxvyz_required) { updateFieldRequired('php_calculation',1); jQuery('#jform_php_calculation').removeAttr('required'); jQuery('#jform_php_calculation').removeAttr('aria-required'); jQuery('#jform_php_calculation').removeClass('required'); - jform_vvvvvyxvyx_required = true; + jform_vvvvvyxvyz_required = true; } } } @@ -555,26 +555,26 @@ function vvvvvzc(main_source_vvvvvzc) if (main_source) { jQuery('#jform_php_custom_get').closest('.control-group').show(); - if (jform_vvvvvzcvyy_required) + if (jform_vvvvvzcvza_required) { updateFieldRequired('php_custom_get',0); jQuery('#jform_php_custom_get').prop('required','required'); jQuery('#jform_php_custom_get').attr('aria-required',true); jQuery('#jform_php_custom_get').addClass('required'); - jform_vvvvvzcvyy_required = false; + jform_vvvvvzcvza_required = false; } } else { jQuery('#jform_php_custom_get').closest('.control-group').hide(); - if (!jform_vvvvvzcvyy_required) + if (!jform_vvvvvzcvza_required) { updateFieldRequired('php_custom_get',1); jQuery('#jform_php_custom_get').removeAttr('required'); jQuery('#jform_php_custom_get').removeAttr('aria-required'); jQuery('#jform_php_custom_get').removeClass('required'); - jform_vvvvvzcvyy_required = true; + jform_vvvvvzcvza_required = true; } } } @@ -668,26 +668,26 @@ function vvvvvze(add_php_before_getitem_vvvvvze,gettype_vvvvvze) if (add_php_before_getitem && gettype) { jQuery('#jform_php_before_getitem').closest('.control-group').show(); - if (jform_vvvvvzevyz_required) + if (jform_vvvvvzevzb_required) { updateFieldRequired('php_before_getitem',0); jQuery('#jform_php_before_getitem').prop('required','required'); jQuery('#jform_php_before_getitem').attr('aria-required',true); jQuery('#jform_php_before_getitem').addClass('required'); - jform_vvvvvzevyz_required = false; + jform_vvvvvzevzb_required = false; } } else { jQuery('#jform_php_before_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzevyz_required) + if (!jform_vvvvvzevzb_required) { updateFieldRequired('php_before_getitem',1); jQuery('#jform_php_before_getitem').removeAttr('required'); jQuery('#jform_php_before_getitem').removeAttr('aria-required'); jQuery('#jform_php_before_getitem').removeClass('required'); - jform_vvvvvzevyz_required = true; + jform_vvvvvzevzb_required = true; } } } @@ -746,26 +746,26 @@ function vvvvvzf(add_php_after_getitem_vvvvvzf,gettype_vvvvvzf) if (add_php_after_getitem && gettype) { jQuery('#jform_php_after_getitem').closest('.control-group').show(); - if (jform_vvvvvzfvza_required) + if (jform_vvvvvzfvzc_required) { updateFieldRequired('php_after_getitem',0); jQuery('#jform_php_after_getitem').prop('required','required'); jQuery('#jform_php_after_getitem').attr('aria-required',true); jQuery('#jform_php_after_getitem').addClass('required'); - jform_vvvvvzfvza_required = false; + jform_vvvvvzfvzc_required = false; } } else { jQuery('#jform_php_after_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzfvza_required) + if (!jform_vvvvvzfvzc_required) { updateFieldRequired('php_after_getitem',1); jQuery('#jform_php_after_getitem').removeAttr('required'); jQuery('#jform_php_after_getitem').removeAttr('aria-required'); jQuery('#jform_php_after_getitem').removeClass('required'); - jform_vvvvvzfvza_required = true; + jform_vvvvvzfvzc_required = true; } } } @@ -812,45 +812,45 @@ function vvvvvzh(gettype_vvvvvzh) if (gettype) { jQuery('#jform_add_php_after_getitem').closest('.control-group').show(); - if (jform_vvvvvzhvzb_required) + if (jform_vvvvvzhvzd_required) { updateFieldRequired('add_php_after_getitem',0); jQuery('#jform_add_php_after_getitem').prop('required','required'); jQuery('#jform_add_php_after_getitem').attr('aria-required',true); jQuery('#jform_add_php_after_getitem').addClass('required'); - jform_vvvvvzhvzb_required = false; + jform_vvvvvzhvzd_required = false; } jQuery('#jform_add_php_before_getitem').closest('.control-group').show(); - if (jform_vvvvvzhvzc_required) + if (jform_vvvvvzhvze_required) { updateFieldRequired('add_php_before_getitem',0); jQuery('#jform_add_php_before_getitem').prop('required','required'); jQuery('#jform_add_php_before_getitem').attr('aria-required',true); jQuery('#jform_add_php_before_getitem').addClass('required'); - jform_vvvvvzhvzc_required = false; + jform_vvvvvzhvze_required = false; } } else { jQuery('#jform_add_php_after_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzhvzb_required) + if (!jform_vvvvvzhvzd_required) { updateFieldRequired('add_php_after_getitem',1); jQuery('#jform_add_php_after_getitem').removeAttr('required'); jQuery('#jform_add_php_after_getitem').removeAttr('aria-required'); jQuery('#jform_add_php_after_getitem').removeClass('required'); - jform_vvvvvzhvzb_required = true; + jform_vvvvvzhvzd_required = true; } jQuery('#jform_add_php_before_getitem').closest('.control-group').hide(); - if (!jform_vvvvvzhvzc_required) + if (!jform_vvvvvzhvze_required) { updateFieldRequired('add_php_before_getitem',1); jQuery('#jform_add_php_before_getitem').removeAttr('required'); jQuery('#jform_add_php_before_getitem').removeAttr('aria-required'); jQuery('#jform_add_php_before_getitem').removeClass('required'); - jform_vvvvvzhvzc_required = true; + jform_vvvvvzhvze_required = true; } } } @@ -898,26 +898,26 @@ function vvvvvzi(add_php_getlistquery_vvvvvzi,gettype_vvvvvzi) if (add_php_getlistquery && gettype) { jQuery('#jform_php_getlistquery').closest('.control-group').show(); - if (jform_vvvvvzivzd_required) + if (jform_vvvvvzivzf_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_vvvvvzivzd_required = false; + jform_vvvvvzivzf_required = false; } } else { jQuery('#jform_php_getlistquery').closest('.control-group').hide(); - if (!jform_vvvvvzivzd_required) + if (!jform_vvvvvzivzf_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_vvvvvzivzd_required = true; + jform_vvvvvzivzf_required = true; } } } @@ -976,26 +976,26 @@ function vvvvvzj(add_php_before_getitems_vvvvvzj,gettype_vvvvvzj) if (add_php_before_getitems && gettype) { jQuery('#jform_php_before_getitems').closest('.control-group').show(); - if (jform_vvvvvzjvze_required) + if (jform_vvvvvzjvzg_required) { updateFieldRequired('php_before_getitems',0); jQuery('#jform_php_before_getitems').prop('required','required'); jQuery('#jform_php_before_getitems').attr('aria-required',true); jQuery('#jform_php_before_getitems').addClass('required'); - jform_vvvvvzjvze_required = false; + jform_vvvvvzjvzg_required = false; } } else { jQuery('#jform_php_before_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzjvze_required) + if (!jform_vvvvvzjvzg_required) { updateFieldRequired('php_before_getitems',1); jQuery('#jform_php_before_getitems').removeAttr('required'); jQuery('#jform_php_before_getitems').removeAttr('aria-required'); jQuery('#jform_php_before_getitems').removeClass('required'); - jform_vvvvvzjvze_required = true; + jform_vvvvvzjvzg_required = true; } } } @@ -1054,26 +1054,26 @@ function vvvvvzk(add_php_after_getitems_vvvvvzk,gettype_vvvvvzk) if (add_php_after_getitems && gettype) { jQuery('#jform_php_after_getitems').closest('.control-group').show(); - if (jform_vvvvvzkvzf_required) + if (jform_vvvvvzkvzh_required) { updateFieldRequired('php_after_getitems',0); jQuery('#jform_php_after_getitems').prop('required','required'); jQuery('#jform_php_after_getitems').attr('aria-required',true); jQuery('#jform_php_after_getitems').addClass('required'); - jform_vvvvvzkvzf_required = false; + jform_vvvvvzkvzh_required = false; } } else { jQuery('#jform_php_after_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzkvzf_required) + if (!jform_vvvvvzkvzh_required) { updateFieldRequired('php_after_getitems',1); jQuery('#jform_php_after_getitems').removeAttr('required'); jQuery('#jform_php_after_getitems').removeAttr('aria-required'); jQuery('#jform_php_after_getitems').removeClass('required'); - jform_vvvvvzkvzf_required = true; + jform_vvvvvzkvzh_required = true; } } } @@ -1120,64 +1120,64 @@ function vvvvvzm(gettype_vvvvvzm) if (gettype) { jQuery('#jform_add_php_after_getitems').closest('.control-group').show(); - if (jform_vvvvvzmvzg_required) + if (jform_vvvvvzmvzi_required) { updateFieldRequired('add_php_after_getitems',0); jQuery('#jform_add_php_after_getitems').prop('required','required'); jQuery('#jform_add_php_after_getitems').attr('aria-required',true); jQuery('#jform_add_php_after_getitems').addClass('required'); - jform_vvvvvzmvzg_required = false; + jform_vvvvvzmvzi_required = false; } jQuery('#jform_add_php_before_getitems').closest('.control-group').show(); - if (jform_vvvvvzmvzh_required) + if (jform_vvvvvzmvzj_required) { updateFieldRequired('add_php_before_getitems',0); jQuery('#jform_add_php_before_getitems').prop('required','required'); jQuery('#jform_add_php_before_getitems').attr('aria-required',true); jQuery('#jform_add_php_before_getitems').addClass('required'); - jform_vvvvvzmvzh_required = false; + jform_vvvvvzmvzj_required = false; } jQuery('#jform_add_php_getlistquery').closest('.control-group').show(); - if (jform_vvvvvzmvzi_required) + if (jform_vvvvvzmvzk_required) { updateFieldRequired('add_php_getlistquery',0); jQuery('#jform_add_php_getlistquery').prop('required','required'); jQuery('#jform_add_php_getlistquery').attr('aria-required',true); jQuery('#jform_add_php_getlistquery').addClass('required'); - jform_vvvvvzmvzi_required = false; + jform_vvvvvzmvzk_required = false; } } else { jQuery('#jform_add_php_after_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzmvzg_required) + if (!jform_vvvvvzmvzi_required) { updateFieldRequired('add_php_after_getitems',1); jQuery('#jform_add_php_after_getitems').removeAttr('required'); jQuery('#jform_add_php_after_getitems').removeAttr('aria-required'); jQuery('#jform_add_php_after_getitems').removeClass('required'); - jform_vvvvvzmvzg_required = true; + jform_vvvvvzmvzi_required = true; } jQuery('#jform_add_php_before_getitems').closest('.control-group').hide(); - if (!jform_vvvvvzmvzh_required) + if (!jform_vvvvvzmvzj_required) { updateFieldRequired('add_php_before_getitems',1); jQuery('#jform_add_php_before_getitems').removeAttr('required'); jQuery('#jform_add_php_before_getitems').removeAttr('aria-required'); jQuery('#jform_add_php_before_getitems').removeClass('required'); - jform_vvvvvzmvzh_required = true; + jform_vvvvvzmvzj_required = true; } jQuery('#jform_add_php_getlistquery').closest('.control-group').hide(); - if (!jform_vvvvvzmvzi_required) + if (!jform_vvvvvzmvzk_required) { updateFieldRequired('add_php_getlistquery',1); jQuery('#jform_add_php_getlistquery').removeAttr('required'); jQuery('#jform_add_php_getlistquery').removeAttr('aria-required'); jQuery('#jform_add_php_getlistquery').removeClass('required'); - jform_vvvvvzmvzi_required = true; + jform_vvvvvzmvzk_required = true; } } } @@ -1213,26 +1213,26 @@ function vvvvvzn(gettype_vvvvvzn) if (gettype) { jQuery('#jform_pagination').closest('.control-group').show(); - if (jform_vvvvvznvzj_required) + if (jform_vvvvvznvzl_required) { updateFieldRequired('pagination',0); jQuery('#jform_pagination').prop('required','required'); jQuery('#jform_pagination').attr('aria-required',true); jQuery('#jform_pagination').addClass('required'); - jform_vvvvvznvzj_required = false; + jform_vvvvvznvzl_required = false; } } else { jQuery('#jform_pagination').closest('.control-group').hide(); - if (!jform_vvvvvznvzj_required) + if (!jform_vvvvvznvzl_required) { updateFieldRequired('pagination',1); jQuery('#jform_pagination').removeAttr('required'); jQuery('#jform_pagination').removeAttr('aria-required'); jQuery('#jform_pagination').removeClass('required'); - jform_vvvvvznvzj_required = true; + jform_vvvvvznvzl_required = true; } } } diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js index e56007d06..43adc8eab 100644 --- a/admin/models/forms/field.js +++ b/admin/models/forms/field.js @@ -23,14 +23,14 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvzsvzo_required = false; -jform_vvvvvztvzp_required = false; -jform_vvvvvzuvzq_required = false; -jform_vvvvvzvvzr_required = false; -jform_vvvvvzyvzs_required = false; -jform_vvvvvzzvzt_required = false; -jform_vvvvwaavzu_required = false; -jform_vvvvwabvzv_required = false; +jform_vvvvvzsvzq_required = false; +jform_vvvvvztvzr_required = false; +jform_vvvvvzuvzs_required = false; +jform_vvvvvzvvzt_required = false; +jform_vvvvvzyvzu_required = false; +jform_vvvvvzzvzv_required = false; +jform_vvvvwaavzw_required = false; +jform_vvvvwabvzx_required = false; // Initial Script jQuery(document).ready(function() @@ -84,26 +84,26 @@ function vvvvvzs(datalenght_vvvvvzs) if (datalenght) { jQuery('#jform_datalenght_other').closest('.control-group').show(); - if (jform_vvvvvzsvzo_required) + if (jform_vvvvvzsvzq_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_vvvvvzsvzo_required = false; + jform_vvvvvzsvzq_required = false; } } else { jQuery('#jform_datalenght_other').closest('.control-group').hide(); - if (!jform_vvvvvzsvzo_required) + if (!jform_vvvvvzsvzq_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_vvvvvzsvzo_required = true; + jform_vvvvvzsvzq_required = true; } } } @@ -139,26 +139,26 @@ function vvvvvzt(datadefault_vvvvvzt) if (datadefault) { jQuery('#jform_datadefault_other').closest('.control-group').show(); - if (jform_vvvvvztvzp_required) + if (jform_vvvvvztvzr_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_vvvvvztvzp_required = false; + jform_vvvvvztvzr_required = false; } } else { jQuery('#jform_datadefault_other').closest('.control-group').hide(); - if (!jform_vvvvvztvzp_required) + if (!jform_vvvvvztvzr_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_vvvvvztvzp_required = true; + jform_vvvvvztvzr_required = true; } } } @@ -196,13 +196,13 @@ function vvvvvzu(datatype_vvvvvzu) jQuery('#jform_datadefault').closest('.control-group').show(); jQuery('#jform_datalenght').closest('.control-group').show(); jQuery('#jform_indexes').closest('.control-group').show(); - if (jform_vvvvvzuvzq_required) + if (jform_vvvvvzuvzs_required) { updateFieldRequired('indexes',0); jQuery('#jform_indexes').prop('required','required'); jQuery('#jform_indexes').attr('aria-required',true); jQuery('#jform_indexes').addClass('required'); - jform_vvvvvzuvzq_required = false; + jform_vvvvvzuvzs_required = false; } } @@ -211,13 +211,13 @@ function vvvvvzu(datatype_vvvvvzu) jQuery('#jform_datadefault').closest('.control-group').hide(); jQuery('#jform_datalenght').closest('.control-group').hide(); jQuery('#jform_indexes').closest('.control-group').hide(); - if (!jform_vvvvvzuvzq_required) + if (!jform_vvvvvzuvzs_required) { updateFieldRequired('indexes',1); jQuery('#jform_indexes').removeAttr('required'); jQuery('#jform_indexes').removeAttr('aria-required'); jQuery('#jform_indexes').removeClass('required'); - jform_vvvvvzuvzq_required = true; + jform_vvvvvzuvzs_required = true; } } } @@ -253,26 +253,26 @@ function vvvvvzv(datatype_vvvvvzv) if (datatype) { jQuery('#jform_store').closest('.control-group').show(); - if (jform_vvvvvzvvzr_required) + if (jform_vvvvvzvvzt_required) { updateFieldRequired('store',0); jQuery('#jform_store').prop('required','required'); jQuery('#jform_store').attr('aria-required',true); jQuery('#jform_store').addClass('required'); - jform_vvvvvzvvzr_required = false; + jform_vvvvvzvvzt_required = false; } } else { jQuery('#jform_store').closest('.control-group').hide(); - if (!jform_vvvvvzvvzr_required) + if (!jform_vvvvvzvvzt_required) { updateFieldRequired('store',1); jQuery('#jform_store').removeAttr('required'); jQuery('#jform_store').removeAttr('aria-required'); jQuery('#jform_store').removeClass('required'); - jform_vvvvvzvvzr_required = true; + jform_vvvvvzvvzt_required = true; } } } @@ -356,26 +356,26 @@ function vvvvvzy(add_css_view_vvvvvzy) if (add_css_view_vvvvvzy == 1) { jQuery('#jform_css_view').closest('.control-group').show(); - if (jform_vvvvvzyvzs_required) + if (jform_vvvvvzyvzu_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_vvvvvzyvzs_required = false; + jform_vvvvvzyvzu_required = false; } } else { jQuery('#jform_css_view').closest('.control-group').hide(); - if (!jform_vvvvvzyvzs_required) + if (!jform_vvvvvzyvzu_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_vvvvvzyvzs_required = true; + jform_vvvvvzyvzu_required = true; } } } @@ -387,26 +387,26 @@ function vvvvvzz(add_css_views_vvvvvzz) if (add_css_views_vvvvvzz == 1) { jQuery('#jform_css_views').closest('.control-group').show(); - if (jform_vvvvvzzvzt_required) + if (jform_vvvvvzzvzv_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_vvvvvzzvzt_required = false; + jform_vvvvvzzvzv_required = false; } } else { jQuery('#jform_css_views').closest('.control-group').hide(); - if (!jform_vvvvvzzvzt_required) + if (!jform_vvvvvzzvzv_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_vvvvvzzvzt_required = true; + jform_vvvvvzzvzv_required = true; } } } @@ -418,26 +418,26 @@ function vvvvwaa(add_javascript_view_footer_vvvvwaa) if (add_javascript_view_footer_vvvvwaa == 1) { jQuery('#jform_javascript_view_footer').closest('.control-group').show(); - if (jform_vvvvwaavzu_required) + if (jform_vvvvwaavzw_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_vvvvwaavzu_required = false; + jform_vvvvwaavzw_required = false; } } else { jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); - if (!jform_vvvvwaavzu_required) + if (!jform_vvvvwaavzw_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_vvvvwaavzu_required = true; + jform_vvvvwaavzw_required = true; } } } @@ -449,26 +449,26 @@ function vvvvwab(add_javascript_views_footer_vvvvwab) if (add_javascript_views_footer_vvvvwab == 1) { jQuery('#jform_javascript_views_footer').closest('.control-group').show(); - if (jform_vvvvwabvzv_required) + if (jform_vvvvwabvzx_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_vvvvwabvzv_required = false; + jform_vvvvwabvzx_required = false; } } else { jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); - if (!jform_vvvvwabvzv_required) + if (!jform_vvvvwabvzx_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_vvvvwabvzv_required = true; + jform_vvvvwabvzx_required = true; } } } diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index cac8ff931..8d914335c 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -23,12 +23,12 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvwacvzy_required = false; -jform_vvvvwadvzz_required = false; -jform_vvvvwaewaa_required = false; -jform_vvvvwafwab_required = false; -jform_vvvvwagwac_required = false; -jform_vvvvwahwad_required = false; +jform_vvvvwacwaa_required = false; +jform_vvvvwadwab_required = false; +jform_vvvvwaewac_required = false; +jform_vvvvwafwad_required = false; +jform_vvvvwagwae_required = false; +jform_vvvvwahwaf_required = false; // Initial Script jQuery(document).ready(function() @@ -59,26 +59,26 @@ function vvvvwac(location_vvvvwac) if (location_vvvvwac == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); - if (jform_vvvvwacvzy_required) + if (jform_vvvvwacwaa_required) { updateFieldRequired('admin_view',0); jQuery('#jform_admin_view').prop('required','required'); jQuery('#jform_admin_view').attr('aria-required',true); jQuery('#jform_admin_view').addClass('required'); - jform_vvvvwacvzy_required = false; + jform_vvvvwacwaa_required = false; } } else { jQuery('#jform_admin_view').closest('.control-group').hide(); - if (!jform_vvvvwacvzy_required) + if (!jform_vvvvwacwaa_required) { updateFieldRequired('admin_view',1); jQuery('#jform_admin_view').removeAttr('required'); jQuery('#jform_admin_view').removeAttr('aria-required'); jQuery('#jform_admin_view').removeClass('required'); - jform_vvvvwacvzy_required = true; + jform_vvvvwacwaa_required = true; } } } @@ -90,26 +90,26 @@ function vvvvwad(location_vvvvwad) if (location_vvvvwad == 2) { jQuery('#jform_site_view').closest('.control-group').show(); - if (jform_vvvvwadvzz_required) + if (jform_vvvvwadwab_required) { updateFieldRequired('site_view',0); jQuery('#jform_site_view').prop('required','required'); jQuery('#jform_site_view').attr('aria-required',true); jQuery('#jform_site_view').addClass('required'); - jform_vvvvwadvzz_required = false; + jform_vvvvwadwab_required = false; } } else { jQuery('#jform_site_view').closest('.control-group').hide(); - if (!jform_vvvvwadvzz_required) + if (!jform_vvvvwadwab_required) { updateFieldRequired('site_view',1); jQuery('#jform_site_view').removeAttr('required'); jQuery('#jform_site_view').removeAttr('aria-required'); jQuery('#jform_site_view').removeClass('required'); - jform_vvvvwadvzz_required = true; + jform_vvvvwadwab_required = true; } } } @@ -134,26 +134,26 @@ function vvvvwae(type_vvvvwae) if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_vvvvwaewaa_required) + if (jform_vvvvwaewac_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_vvvvwaewaa_required = false; + jform_vvvvwaewac_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_vvvvwaewaa_required) + if (!jform_vvvvwaewac_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_vvvvwaewaa_required = true; + jform_vvvvwaewac_required = true; } } } @@ -189,26 +189,26 @@ function vvvvwaf(type_vvvvwaf) if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_vvvvwafwab_required) + if (jform_vvvvwafwad_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_vvvvwafwab_required = false; + jform_vvvvwafwad_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_vvvvwafwab_required) + if (!jform_vvvvwafwad_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_vvvvwafwab_required = true; + jform_vvvvwafwad_required = true; } } } @@ -244,26 +244,26 @@ function vvvvwag(type_vvvvwag) if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_vvvvwagwac_required) + if (jform_vvvvwagwae_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_vvvvwagwac_required = false; + jform_vvvvwagwae_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_vvvvwagwac_required) + if (!jform_vvvvwagwae_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_vvvvwagwac_required = true; + jform_vvvvwagwae_required = true; } } } @@ -286,26 +286,26 @@ function vvvvwah(target_vvvvwah) if (target_vvvvwah == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_vvvvwahwad_required) + if (jform_vvvvwahwaf_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_vvvvwahwad_required = false; + jform_vvvvwahwaf_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_vvvvwahwad_required) + if (!jform_vvvvwahwaf_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvwahwad_required = true; + jform_vvvvwahwaf_required = true; } } } diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js index 234813ebb..262b5ceca 100644 --- a/admin/models/forms/layout.js +++ b/admin/models/forms/layout.js @@ -23,7 +23,7 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvyrvyr_required = false; +jform_vvvvvyrvyt_required = false; // Initial Script jQuery(document).ready(function() @@ -39,26 +39,26 @@ function vvvvvyr(add_php_view_vvvvvyr) if (add_php_view_vvvvvyr == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvyrvyr_required) + if (jform_vvvvvyrvyt_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_vvvvvyrvyr_required = false; + jform_vvvvvyrvyt_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvyrvyr_required) + if (!jform_vvvvvyrvyt_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_vvvvvyrvyr_required = true; + jform_vvvvvyrvyt_required = true; } } } diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js index c80c55d70..da0626f5a 100644 --- a/admin/models/forms/site_view.js +++ b/admin/models/forms/site_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.js @@ -23,16 +23,16 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvyhvyf_required = false; -jform_vvvvvyivyg_required = false; -jform_vvvvvyjvyh_required = false; -jform_vvvvvykvyi_required = false; -jform_vvvvvylvyj_required = false; -jform_vvvvvymvyk_required = false; -jform_vvvvvynvyl_required = false; -jform_vvvvvyovym_required = false; -jform_vvvvvypvyn_required = false; -jform_vvvvvypvyo_required = false; +jform_vvvvvyhvyh_required = false; +jform_vvvvvyivyi_required = false; +jform_vvvvvyjvyj_required = false; +jform_vvvvvykvyk_required = false; +jform_vvvvvylvyl_required = false; +jform_vvvvvymvym_required = false; +jform_vvvvvynvyn_required = false; +jform_vvvvvyovyo_required = false; +jform_vvvvvypvyp_required = false; +jform_vvvvvypvyq_required = false; // Initial Script jQuery(document).ready(function() @@ -72,26 +72,26 @@ function vvvvvyh(add_php_view_vvvvvyh) if (add_php_view_vvvvvyh == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvyhvyf_required) + if (jform_vvvvvyhvyh_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_vvvvvyhvyf_required = false; + jform_vvvvvyhvyh_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvyhvyf_required) + if (!jform_vvvvvyhvyh_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_vvvvvyhvyf_required = true; + jform_vvvvvyhvyh_required = true; } } } @@ -103,26 +103,26 @@ function vvvvvyi(add_php_jview_display_vvvvvyi) if (add_php_jview_display_vvvvvyi == 1) { jQuery('#jform_php_jview_display').closest('.control-group').show(); - if (jform_vvvvvyivyg_required) + if (jform_vvvvvyivyi_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_vvvvvyivyg_required = false; + jform_vvvvvyivyi_required = false; } } else { jQuery('#jform_php_jview_display').closest('.control-group').hide(); - if (!jform_vvvvvyivyg_required) + if (!jform_vvvvvyivyi_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_vvvvvyivyg_required = true; + jform_vvvvvyivyi_required = true; } } } @@ -134,26 +134,26 @@ function vvvvvyj(add_php_jview_vvvvvyj) if (add_php_jview_vvvvvyj == 1) { jQuery('#jform_php_jview').closest('.control-group').show(); - if (jform_vvvvvyjvyh_required) + if (jform_vvvvvyjvyj_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_vvvvvyjvyh_required = false; + jform_vvvvvyjvyj_required = false; } } else { jQuery('#jform_php_jview').closest('.control-group').hide(); - if (!jform_vvvvvyjvyh_required) + if (!jform_vvvvvyjvyj_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_vvvvvyjvyh_required = true; + jform_vvvvvyjvyj_required = true; } } } @@ -165,26 +165,26 @@ function vvvvvyk(add_php_document_vvvvvyk) if (add_php_document_vvvvvyk == 1) { jQuery('#jform_php_document').closest('.control-group').show(); - if (jform_vvvvvykvyi_required) + if (jform_vvvvvykvyk_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_vvvvvykvyi_required = false; + jform_vvvvvykvyk_required = false; } } else { jQuery('#jform_php_document').closest('.control-group').hide(); - if (!jform_vvvvvykvyi_required) + if (!jform_vvvvvykvyk_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_vvvvvykvyi_required = true; + jform_vvvvvykvyk_required = true; } } } @@ -196,26 +196,26 @@ function vvvvvyl(add_css_document_vvvvvyl) if (add_css_document_vvvvvyl == 1) { jQuery('#jform_css_document').closest('.control-group').show(); - if (jform_vvvvvylvyj_required) + if (jform_vvvvvylvyl_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_vvvvvylvyj_required = false; + jform_vvvvvylvyl_required = false; } } else { jQuery('#jform_css_document').closest('.control-group').hide(); - if (!jform_vvvvvylvyj_required) + if (!jform_vvvvvylvyl_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_vvvvvylvyj_required = true; + jform_vvvvvylvyl_required = true; } } } @@ -227,26 +227,26 @@ function vvvvvym(add_js_document_vvvvvym) if (add_js_document_vvvvvym == 1) { jQuery('#jform_js_document').closest('.control-group').show(); - if (jform_vvvvvymvyk_required) + if (jform_vvvvvymvym_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_vvvvvymvyk_required = false; + jform_vvvvvymvym_required = false; } } else { jQuery('#jform_js_document').closest('.control-group').hide(); - if (!jform_vvvvvymvyk_required) + if (!jform_vvvvvymvym_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_vvvvvymvyk_required = true; + jform_vvvvvymvym_required = true; } } } @@ -258,26 +258,26 @@ function vvvvvyn(add_css_vvvvvyn) if (add_css_vvvvvyn == 1) { jQuery('#jform_css').closest('.control-group').show(); - if (jform_vvvvvynvyl_required) + if (jform_vvvvvynvyn_required) { updateFieldRequired('css',0); jQuery('#jform_css').prop('required','required'); jQuery('#jform_css').attr('aria-required',true); jQuery('#jform_css').addClass('required'); - jform_vvvvvynvyl_required = false; + jform_vvvvvynvyn_required = false; } } else { jQuery('#jform_css').closest('.control-group').hide(); - if (!jform_vvvvvynvyl_required) + if (!jform_vvvvvynvyn_required) { updateFieldRequired('css',1); jQuery('#jform_css').removeAttr('required'); jQuery('#jform_css').removeAttr('aria-required'); jQuery('#jform_css').removeClass('required'); - jform_vvvvvynvyl_required = true; + jform_vvvvvynvyn_required = true; } } } @@ -290,13 +290,13 @@ function vvvvvyo(add_php_ajax_vvvvvyo) { jQuery('#jform_ajax_input').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod').closest('.control-group').show(); - if (jform_vvvvvyovym_required) + if (jform_vvvvvyovyo_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_vvvvvyovym_required = false; + jform_vvvvvyovyo_required = false; } } @@ -304,13 +304,13 @@ function vvvvvyo(add_php_ajax_vvvvvyo) { jQuery('#jform_ajax_input').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod').closest('.control-group').hide(); - if (!jform_vvvvvyovym_required) + if (!jform_vvvvvyovyo_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_vvvvvyovym_required = true; + jform_vvvvvyovyo_required = true; } } } @@ -323,23 +323,23 @@ function vvvvvyp(add_custom_button_vvvvvyp) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvypvyn_required) + if (jform_vvvvvypvyp_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_vvvvvypvyn_required = false; + jform_vvvvvypvyp_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvypvyo_required) + if (jform_vvvvvypvyq_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_vvvvvypvyo_required = false; + jform_vvvvvypvyq_required = false; } } @@ -347,22 +347,22 @@ function vvvvvyp(add_custom_button_vvvvvyp) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvypvyn_required) + if (!jform_vvvvvypvyp_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_vvvvvypvyn_required = true; + jform_vvvvvypvyp_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvypvyo_required) + if (!jform_vvvvvypvyq_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_vvvvvypvyo_required = true; + jform_vvvvvypvyq_required = true; } } } diff --git a/admin/models/forms/site_view.xml b/admin/models/forms/site_view.xml index e70899a1d..c915daa59 100644 --- a/admin/models/forms/site_view.xml +++ b/admin/models/forms/site_view.xml @@ -158,6 +158,52 @@ required="false" button="true" /> + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - COM_COMPONENTBUILDER_SITE_VIEW_NO - + - - - - + type="textarea" + name="php_document" + label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL" + rows="17" + cols="5" + description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_HINT" + required="true" + /> + + + + - + - - - - - - - - - - - - - - - - - - - - + /> - - - - - - - + - - diff --git a/admin/models/forms/template.js b/admin/models/forms/template.js index bb8e7dca2..b8e495702 100644 --- a/admin/models/forms/template.js +++ b/admin/models/forms/template.js @@ -23,7 +23,7 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvyqvyq_required = false; +jform_vvvvvyqvys_required = false; // Initial Script jQuery(document).ready(function() @@ -39,26 +39,26 @@ function vvvvvyq(add_php_view_vvvvvyq) if (add_php_view_vvvvvyq == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvyqvyq_required) + if (jform_vvvvvyqvys_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_vvvvvyqvyq_required = false; + jform_vvvvvyqvys_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvyqvyq_required) + if (!jform_vvvvvyqvys_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_vvvvvyqvyq_required = true; + jform_vvvvvyqvys_required = true; } } } diff --git a/admin/models/import.php b/admin/models/import.php index 257ee08c3..12a0745b4 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/site_view.php b/admin/models/site_view.php index b5d9653bf..df704c045 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.php @@ -103,34 +103,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin $item->custom_get = $custom_get->toArray(); } - if (!empty($item->css_document)) + if (!empty($item->css)) { - // base64 Decode css_document. - $item->css_document = base64_decode($item->css_document); - } - - if (!empty($item->php_view)) - { - // base64 Decode php_view. - $item->php_view = base64_decode($item->php_view); - } - - if (!empty($item->php_jview)) - { - // base64 Decode php_jview. - $item->php_jview = base64_decode($item->php_jview); - } - - if (!empty($item->php_document)) - { - // base64 Decode php_document. - $item->php_document = base64_decode($item->php_document); - } - - if (!empty($item->php_jview_display)) - { - // base64 Decode php_jview_display. - $item->php_jview_display = base64_decode($item->php_jview_display); + // base64 Decode css. + $item->css = base64_decode($item->css); } if (!empty($item->js_document)) @@ -139,16 +115,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin $item->js_document = base64_decode($item->js_document); } - if (!empty($item->css)) + if (!empty($item->css_document)) { - // base64 Decode css. - $item->css = base64_decode($item->css); - } - - if (!empty($item->php_ajaxmethod)) - { - // base64 Decode php_ajaxmethod. - $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); + // base64 Decode css_document. + $item->css_document = base64_decode($item->css_document); } if (!empty($item->default)) @@ -157,16 +127,46 @@ class ComponentbuilderModelSite_view extends JModelAdmin $item->default = base64_decode($item->default); } - if (!empty($item->php_controller)) + if (!empty($item->php_ajaxmethod)) { - // base64 Decode php_controller. - $item->php_controller = base64_decode($item->php_controller); + // base64 Decode php_ajaxmethod. + $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); } if (!empty($item->php_model)) { // base64 Decode php_model. $item->php_model = base64_decode($item->php_model); + } + + if (!empty($item->php_document)) + { + // base64 Decode php_document. + $item->php_document = base64_decode($item->php_document); + } + + if (!empty($item->php_view)) + { + // base64 Decode php_view. + $item->php_view = base64_decode($item->php_view); + } + + if (!empty($item->php_jview_display)) + { + // base64 Decode php_jview_display. + $item->php_jview_display = base64_decode($item->php_jview_display); + } + + if (!empty($item->php_controller)) + { + // base64 Decode php_controller. + $item->php_controller = base64_decode($item->php_controller); + } + + if (!empty($item->php_jview)) + { + // base64 Decode php_jview. + $item->php_jview = base64_decode($item->php_jview); } if (!empty($item->id)) @@ -185,7 +185,7 @@ class ComponentbuilderModelSite_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVyplinked_components() + public function getVyrlinked_components() { // Get the user object. $user = JFactory::getUser(); @@ -981,34 +981,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin $data['custom_get'] = ''; } - // Set the css_document string to base64 string. - if (isset($data['css_document'])) + // Set the css string to base64 string. + if (isset($data['css'])) { - $data['css_document'] = base64_encode($data['css_document']); - } - - // Set the php_view string to base64 string. - if (isset($data['php_view'])) - { - $data['php_view'] = base64_encode($data['php_view']); - } - - // Set the php_jview string to base64 string. - if (isset($data['php_jview'])) - { - $data['php_jview'] = base64_encode($data['php_jview']); - } - - // Set the php_document string to base64 string. - if (isset($data['php_document'])) - { - $data['php_document'] = base64_encode($data['php_document']); - } - - // Set the php_jview_display string to base64 string. - if (isset($data['php_jview_display'])) - { - $data['php_jview_display'] = base64_encode($data['php_jview_display']); + $data['css'] = base64_encode($data['css']); } // Set the js_document string to base64 string. @@ -1017,16 +993,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin $data['js_document'] = base64_encode($data['js_document']); } - // Set the css string to base64 string. - if (isset($data['css'])) + // Set the css_document string to base64 string. + if (isset($data['css_document'])) { - $data['css'] = base64_encode($data['css']); - } - - // Set the php_ajaxmethod string to base64 string. - if (isset($data['php_ajaxmethod'])) - { - $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); + $data['css_document'] = base64_encode($data['css_document']); } // Set the default string to base64 string. @@ -1035,16 +1005,46 @@ class ComponentbuilderModelSite_view extends JModelAdmin $data['default'] = base64_encode($data['default']); } - // Set the php_controller string to base64 string. - if (isset($data['php_controller'])) + // Set the php_ajaxmethod string to base64 string. + if (isset($data['php_ajaxmethod'])) { - $data['php_controller'] = base64_encode($data['php_controller']); + $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); } // Set the php_model string to base64 string. if (isset($data['php_model'])) { $data['php_model'] = base64_encode($data['php_model']); + } + + // Set the php_document string to base64 string. + if (isset($data['php_document'])) + { + $data['php_document'] = base64_encode($data['php_document']); + } + + // Set the php_view string to base64 string. + if (isset($data['php_view'])) + { + $data['php_view'] = base64_encode($data['php_view']); + } + + // Set the php_jview_display string to base64 string. + if (isset($data['php_jview_display'])) + { + $data['php_jview_display'] = base64_encode($data['php_jview_display']); + } + + // Set the php_controller string to base64 string. + if (isset($data['php_controller'])) + { + $data['php_controller'] = base64_encode($data['php_controller']); + } + + // Set the php_jview string to base64 string. + if (isset($data['php_jview'])) + { + $data['php_jview'] = base64_encode($data['php_jview']); } // Set the Params Items to data diff --git a/admin/models/site_views.php b/admin/models/site_views.php index dc435deb2..70c2feb5e 100644 --- a/admin/models/site_views.php +++ b/admin/models/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_views.php @@ -266,28 +266,28 @@ class ComponentbuilderModelSite_views extends JModelList continue; } - // decode css_document - $item->css_document = base64_decode($item->css_document); - // decode php_view - $item->php_view = base64_decode($item->php_view); - // decode php_jview - $item->php_jview = base64_decode($item->php_jview); - // decode php_document - $item->php_document = base64_decode($item->php_document); - // decode php_jview_display - $item->php_jview_display = base64_decode($item->php_jview_display); - // decode js_document - $item->js_document = base64_decode($item->js_document); // decode css $item->css = base64_decode($item->css); - // decode php_ajaxmethod - $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); + // decode js_document + $item->js_document = base64_decode($item->js_document); + // decode css_document + $item->css_document = base64_decode($item->css_document); // decode default $item->default = base64_decode($item->default); - // decode php_controller - $item->php_controller = base64_decode($item->php_controller); + // decode php_ajaxmethod + $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); // decode php_model $item->php_model = base64_decode($item->php_model); + // decode php_document + $item->php_document = base64_decode($item->php_document); + // decode php_view + $item->php_view = base64_decode($item->php_view); + // decode php_jview_display + $item->php_jview_display = base64_decode($item->php_jview_display); + // decode php_controller + $item->php_controller = base64_decode($item->php_controller); + // decode php_jview + $item->php_jview = base64_decode($item->php_jview); // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index eadaff1a0..8d363eb21 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -371,18 +371,18 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` ( KEY `idx_state` (`published`), KEY `idx_name` (`name`), KEY `idx_codename` (`codename`), - KEY `idx_add_php_ajax` (`add_php_ajax`), - KEY `idx_main_get` (`main_get`), - KEY `idx_dynamic_get` (`dynamic_get`), KEY `idx_add_php_document` (`add_php_document`), - KEY `idx_add_php_view` (`add_php_view`), KEY `idx_add_php_jview_display` (`add_php_jview_display`), - KEY `idx_add_custom_button` (`add_custom_button`), + KEY `idx_add_php_view` (`add_php_view`), KEY `idx_add_php_jview` (`add_php_jview`), KEY `idx_add_js_document` (`add_js_document`), - KEY `idx_button_position` (`button_position`), + KEY `idx_main_get` (`main_get`), KEY `idx_add_css_document` (`add_css_document`), - KEY `idx_add_css` (`add_css`) + KEY `idx_dynamic_get` (`dynamic_get`), + KEY `idx_add_css` (`add_css`), + KEY `idx_add_php_ajax` (`add_php_ajax`), + KEY `idx_button_position` (`button_position`), + KEY `idx_add_custom_button` (`add_custom_button`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` ( diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index c84057e9f..ddeb783c8 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/tables/site_view.php b/admin/tables/site_view.php index 075e4f76e..bd9d1b009 100644 --- a/admin/tables/site_view.php +++ b/admin/tables/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index e7297a25e..d14ddba38 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index a8adad994..807de803d 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index 83a5d7f78..be228a9b1 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -71,10 +71,10 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy } // Get Linked view data - $this->vxtfields = $this->get('Vxtfields'); + $this->vxvfields = $this->get('Vxvfields'); // Get Linked view data - $this->vxulinked_components = $this->get('Vxulinked_components'); + $this->vxwlinked_components = $this->get('Vxwlinked_components'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 9780983e3..0d8e4b739 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index 0f0b7f6ec..126169a0c 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index c9b25f6f8..1ec7f22b3 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 702a8c408..9cc4e9fb4 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index 74f5779d6..c6e36cb7f 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index d37c1d740..0c219669a 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index 61fc1230b..4eda046f6 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 7b2141fb9..20bed4dcb 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 103 of this MVC - @build 3rd March, 2017 + @version @update number 104 of this MVC + @build 6th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index e5f0ee35a..0c9d15916 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php index 5aedf5a90..492140de2 100644 --- a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_closed_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index fa9976468..98b62659c 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php index 4cb2df1db..84856c881 100644 --- a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_open_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index aaeef9f99..ef64e20a3 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index 557763713..583af3ed2 100644 --- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index a14e6e0fc..17423c54c 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index da452cabd..9c30694ee 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index 77467597e..33a14ac68 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -71,7 +71,7 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy } // Get Linked view data - $this->vyelinked_components = $this->get('Vyelinked_components'); + $this->vyglinked_components = $this->get('Vyglinked_components'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php index 1d07918f5..a0b7299bb 100644 --- a/admin/views/field/view.html.php +++ b/admin/views/field/view.html.php @@ -71,7 +71,7 @@ class ComponentbuilderViewField extends JViewLegacy } // Get Linked view data - $this->vzwlinked_admin_views = $this->get('Vzwlinked_admin_views'); + $this->vzylinked_admin_views = $this->get('Vzylinked_admin_views'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php index 69f18d7c0..bd72e0c61 100644 --- a/admin/views/fieldtype/view.html.php +++ b/admin/views/fieldtype/view.html.php @@ -71,7 +71,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy } // Get Linked view data - $this->vzxfields = $this->get('Vzxfields'); + $this->vzzfields = $this->get('Vzzfields'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 900d48338..ad792ee09 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 66deefe59..534f1c737 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/site_view/submitbutton.js b/admin/views/site_view/submitbutton.js index 275766e5b..ae75a313c 100644 --- a/admin/views/site_view/submitbutton.js +++ b/admin/views/site_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php index fe238eb5b..1b2f49f97 100644 --- a/admin/views/site_view/tmpl/edit.php +++ b/admin/views/site_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage edit.php @@ -80,6 +80,12 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+
+ +
+
+ +
diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php index 5a0eae8cf..9a0a1b551 100644 --- a/admin/views/site_view/view.html.php +++ b/admin/views/site_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage view.html.php @@ -71,7 +71,7 @@ class ComponentbuilderViewSite_view extends JViewLegacy } // Get Linked view data - $this->vyplinked_components = $this->get('Vyplinked_components'); + $this->vyrlinked_components = $this->get('Vyrlinked_components'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/site_views/tmpl/default.php b/admin/views/site_views/tmpl/default.php index 399846025..2a73df18c 100644 --- a/admin/views/site_views/tmpl/default.php +++ b/admin/views/site_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/site_views/tmpl/default_batch_body.php b/admin/views/site_views/tmpl/default_batch_body.php index dc58f6d4a..221c5b6e1 100644 --- a/admin/views/site_views/tmpl/default_batch_body.php +++ b/admin/views/site_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/site_views/tmpl/default_batch_footer.php b/admin/views/site_views/tmpl/default_batch_footer.php index 5a2b2c896..1b74f6b81 100644 --- a/admin/views/site_views/tmpl/default_batch_footer.php +++ b/admin/views/site_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/site_views/tmpl/default_body.php b/admin/views/site_views/tmpl/default_body.php index cf74a08af..a14865cf4 100644 --- a/admin/views/site_views/tmpl/default_body.php +++ b/admin/views/site_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/site_views/tmpl/default_foot.php b/admin/views/site_views/tmpl/default_foot.php index e9928db53..a5ad546de 100644 --- a/admin/views/site_views/tmpl/default_foot.php +++ b/admin/views/site_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/site_views/tmpl/default_head.php b/admin/views/site_views/tmpl/default_head.php index 09d3c81d2..0ab991111 100644 --- a/admin/views/site_views/tmpl/default_head.php +++ b/admin/views/site_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/site_views/tmpl/default_toolbar.php b/admin/views/site_views/tmpl/default_toolbar.php index 35ece4f9e..9c68e1eaf 100644 --- a/admin/views/site_views/tmpl/default_toolbar.php +++ b/admin/views/site_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php index 2fbb32fc3..a6fbbbed5 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 48 of this MVC - @build 1st March, 2017 + @version @update number 51 of this MVC + @build 6th March, 2017 @created 29th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/componentbuilder.xml b/componentbuilder.xml index 619ed4462..04b263b0e 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 6th March, 2017 + 8th March, 2017 Llewellyn van der Merwe joomla@vdm.io http://vdm.bz/component-builder diff --git a/script.php b/script.php index aaad678b7..cb3b7e840 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 6th March, 2017 + @build 8th March, 2017 @created 30th April, 2015 @package Component Builder @subpackage script.php @@ -1385,9 +1385,9 @@ class com_componentbuilderInstallerScript $site_view->type_title = 'Componentbuilder Site_view'; $site_view->type_alias = 'com_componentbuilder.site_view'; $site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css_document":"css_document","php_view":"php_view","php_jview":"php_jview","php_document":"php_document","php_jview_display":"php_jview_display","custom_get":"custom_get","js_document":"js_document","add_php_ajax":"add_php_ajax","css":"css","main_get":"main_get","dynamic_get":"dynamic_get","php_ajaxmethod":"php_ajaxmethod","add_php_document":"add_php_document","add_php_view":"add_php_view","default":"default","add_php_jview_display":"add_php_jview_display","add_custom_button":"add_custom_button","add_php_jview":"add_php_jview","add_js_document":"add_js_document","button_position":"button_position","add_css_document":"add_css_document","php_controller":"php_controller","add_css":"add_css","php_model":"php_model","not_required":"not_required"}}'; + $site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css":"css","add_php_document":"add_php_document","js_document":"js_document","css_document":"css_document","default":"default","php_ajaxmethod":"php_ajaxmethod","add_php_jview_display":"add_php_jview_display","add_php_view":"add_php_view","php_model":"php_model","add_php_jview":"add_php_jview","not_required":"not_required","custom_get":"custom_get","add_js_document":"add_js_document","main_get":"main_get","add_css_document":"add_css_document","dynamic_get":"dynamic_get","add_css":"add_css","add_php_ajax":"add_php_ajax","button_position":"button_position","add_custom_button":"add_custom_button","php_document":"php_document","php_view":"php_view","php_jview_display":"php_jview_display","php_controller":"php_controller","php_jview":"php_jview"}}'; $site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute'; - $site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_ajax","main_get","dynamic_get","add_php_document","add_php_view","add_php_jview_display","add_custom_button","add_php_jview","add_js_document","button_position","add_css_document","add_css","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; + $site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_js_document","main_get","add_css_document","dynamic_get","add_css","add_php_ajax","button_position","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $site_view_Inserted = $db->insertObject('#__content_types', $site_view); @@ -1632,9 +1632,9 @@ class com_componentbuilderInstallerScript $site_view->type_title = 'Componentbuilder Site_view'; $site_view->type_alias = 'com_componentbuilder.site_view'; $site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css_document":"css_document","php_view":"php_view","php_jview":"php_jview","php_document":"php_document","php_jview_display":"php_jview_display","custom_get":"custom_get","js_document":"js_document","add_php_ajax":"add_php_ajax","css":"css","main_get":"main_get","dynamic_get":"dynamic_get","php_ajaxmethod":"php_ajaxmethod","add_php_document":"add_php_document","add_php_view":"add_php_view","default":"default","add_php_jview_display":"add_php_jview_display","add_custom_button":"add_custom_button","add_php_jview":"add_php_jview","add_js_document":"add_js_document","button_position":"button_position","add_css_document":"add_css_document","php_controller":"php_controller","add_css":"add_css","php_model":"php_model","not_required":"not_required"}}'; + $site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css":"css","add_php_document":"add_php_document","js_document":"js_document","css_document":"css_document","default":"default","php_ajaxmethod":"php_ajaxmethod","add_php_jview_display":"add_php_jview_display","add_php_view":"add_php_view","php_model":"php_model","add_php_jview":"add_php_jview","not_required":"not_required","custom_get":"custom_get","add_js_document":"add_js_document","main_get":"main_get","add_css_document":"add_css_document","dynamic_get":"dynamic_get","add_css":"add_css","add_php_ajax":"add_php_ajax","button_position":"button_position","add_custom_button":"add_custom_button","php_document":"php_document","php_view":"php_view","php_jview_display":"php_jview_display","php_controller":"php_controller","php_jview":"php_jview"}}'; $site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute'; - $site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_ajax","main_get","dynamic_get","add_php_document","add_php_view","add_php_jview_display","add_custom_button","add_php_jview","add_js_document","button_position","add_css_document","add_css","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; + $site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_js_document","main_get","add_css_document","dynamic_get","add_css","add_php_ajax","button_position","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}'; // Check if site_view type is already in content_type DB. $site_view_id = null; -- 2.40.1