From f900f65baab332b8897b1ef9e51b2779474ee315 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sun, 10 Dec 2017 21:17:26 +0200 Subject: [PATCH] Renamed the uikit lib folders. Resolved the gh-188 by updateing the note. Resolved gh-92 by implementation of the library manager in the compiler. --- README.md | 6 +- admin/README.txt | 6 +- admin/compiler/joomla_3/Helper.php | 25 + admin/compiler/joomla_3/Helper_site.php | 25 + .../joomla_3/JViewLegacy_custom_admin.php | 2 +- admin/compiler/joomla_3/JViewLegacy_edit.php | 13 +- .../joomla_3/JViewLegacy_edit_site.php | 17 +- admin/compiler/joomla_3/JViewLegacy_list.php | 9 +- .../JViewLegacy_list_custom_admin.php | 2 +- .../joomla_3/JViewLegacy_list_site.php | 2 +- admin/compiler/joomla_3/JViewLegacy_site.php | 2 +- admin/config.xml | 619 ++- .../custom/{footable2 => footable-v2}/LICENSE | 0 .../css/fonts/footable.eot | Bin .../css/fonts/footable.svg | 0 .../css/fonts/footable.ttf | Bin .../css/fonts/footable.woff | Bin .../css/fonts/index.html | 0 .../css/footable.core.css | 0 .../css/footable.core.min.css | 0 .../css/footable.metro.css | 0 .../css/footable.metro.min.css | 0 .../css/footable.standalone.css | 0 .../css/footable.standalone.min.css | 0 .../{footable2 => footable-v2}/css/index.html | 0 .../dist/footable.all.min.js | 0 .../dist/footable.bookmarkable.min.js | 0 .../dist/footable.filter.min.js | 0 .../dist/footable.grid.min.js | 0 .../dist/footable.min.js | 0 .../dist/footable.paginate.min.js | 0 .../dist/footable.sort.min.js | 0 .../dist/footable.striping.min.js | 0 .../dist/index.html | 0 .../icomoon/footable.json | 0 .../icomoon/index.html | 0 .../{footable2 => footable-v2}/index.html | 0 .../{footable2 => footable-v2}/js/.jshintrc | 0 .../js/footable.bookmarkable.js | 0 .../js/footable.filter.js | 0 .../js/footable.grid.js | 0 .../{footable2 => footable-v2}/js/footable.js | 0 .../js/footable.memory.js | 0 .../js/footable.paginate.js | 0 .../js/footable.plugin.template.js | 0 .../js/footable.sort.js | 0 .../js/footable.striping.js | 0 .../{footable2 => footable-v2}/js/index.html | 0 .../{footable3 => footable-v3}/LICENSE-GPLv3 | 0 .../css/footable.bootstrap.css | 0 .../css/footable.bootstrap.min.css | 0 .../css/footable.core.bootstrap.css | 0 .../css/footable.core.bootstrap.min.css | 0 .../css/footable.core.standalone.css | 0 .../css/footable.core.standalone.min.css | 0 .../css/footable.editing.css | 0 .../css/footable.editing.min.css | 0 .../css/footable.filtering.css | 0 .../css/footable.filtering.min.css | 0 .../css/footable.paging.css | 0 .../css/footable.paging.min.css | 0 .../css/footable.sorting.css | 0 .../css/footable.sorting.min.css | 0 .../css/footable.standalone.css | 0 .../css/footable.standalone.min.css | 0 .../{footable3 => footable-v3}/css/index.html | 0 .../{footable3 => footable-v3}/index.html | 0 .../js/footable.core.js | 0 .../js/footable.core.min.js | 0 .../js/footable.editing.js | 0 .../js/footable.editing.min.js | 0 .../js/footable.filtering.js | 0 .../js/footable.filtering.min.js | 0 .../js/footable.min.js | 0 .../js/footable.paging.js | 0 .../js/footable.paging.min.js | 0 .../js/footable.sorting.js | 0 .../js/footable.sorting.min.js | 0 .../js/footable.state.js | 0 .../js/footable.state.min.js | 0 .../{footable3 => footable-v3}/js/index.html | 0 .../css/components/accordion.almost-flat.css | 0 .../components/accordion.almost-flat.min.css | 0 .../css/components/accordion.css | 0 .../css/components/accordion.gradient.css | 0 .../css/components/accordion.gradient.min.css | 0 .../css/components/accordion.min.css | 0 .../components/autocomplete.almost-flat.css | 0 .../autocomplete.almost-flat.min.css | 0 .../css/components/autocomplete.css | 0 .../css/components/autocomplete.gradient.css | 0 .../components/autocomplete.gradient.min.css | 0 .../css/components/autocomplete.min.css | 0 .../css/components/datepicker.almost-flat.css | 0 .../components/datepicker.almost-flat.min.css | 0 .../css/components/datepicker.css | 0 .../css/components/datepicker.gradient.css | 0 .../components/datepicker.gradient.min.css | 0 .../css/components/datepicker.min.css | 0 .../css/components/dotnav.almost-flat.css | 0 .../css/components/dotnav.almost-flat.min.css | 0 .../css/components/dotnav.css | 0 .../css/components/dotnav.gradient.css | 0 .../css/components/dotnav.gradient.min.css | 0 .../css/components/dotnav.min.css | 0 .../components/form-advanced.almost-flat.css | 0 .../form-advanced.almost-flat.min.css | 0 .../css/components/form-advanced.css | 0 .../css/components/form-advanced.gradient.css | 0 .../components/form-advanced.gradient.min.css | 0 .../css/components/form-advanced.min.css | 0 .../css/components/form-file.almost-flat.css | 0 .../components/form-file.almost-flat.min.css | 0 .../css/components/form-file.css | 0 .../css/components/form-file.gradient.css | 0 .../css/components/form-file.gradient.min.css | 0 .../css/components/form-file.min.css | 0 .../components/form-password.almost-flat.css | 0 .../form-password.almost-flat.min.css | 0 .../css/components/form-password.css | 0 .../css/components/form-password.gradient.css | 0 .../components/form-password.gradient.min.css | 0 .../css/components/form-password.min.css | 0 .../components/form-select.almost-flat.css | 0 .../form-select.almost-flat.min.css | 0 .../css/components/form-select.css | 0 .../css/components/form-select.gradient.css | 0 .../components/form-select.gradient.min.css | 0 .../css/components/form-select.min.css | 0 .../css/components/htmleditor.almost-flat.css | 0 .../components/htmleditor.almost-flat.min.css | 0 .../css/components/htmleditor.css | 0 .../css/components/htmleditor.gradient.css | 0 .../components/htmleditor.gradient.min.css | 0 .../css/components/htmleditor.min.css | 0 .../css/components/index.html | 0 .../css/components/nestable.almost-flat.css | 0 .../components/nestable.almost-flat.min.css | 0 .../css/components/nestable.css | 0 .../css/components/nestable.gradient.css | 0 .../css/components/nestable.gradient.min.css | 0 .../css/components/nestable.min.css | 0 .../css/components/notify.almost-flat.css | 0 .../css/components/notify.almost-flat.min.css | 0 .../css/components/notify.css | 0 .../css/components/notify.gradient.css | 0 .../css/components/notify.gradient.min.css | 0 .../css/components/notify.min.css | 0 .../components/placeholder.almost-flat.css | 0 .../placeholder.almost-flat.min.css | 0 .../css/components/placeholder.css | 0 .../css/components/placeholder.gradient.css | 0 .../components/placeholder.gradient.min.css | 0 .../css/components/placeholder.min.css | 0 .../css/components/progress.almost-flat.css | 0 .../components/progress.almost-flat.min.css | 0 .../css/components/progress.css | 0 .../css/components/progress.gradient.css | 0 .../css/components/progress.gradient.min.css | 0 .../css/components/progress.min.css | 0 .../css/components/search.almost-flat.css | 0 .../css/components/search.almost-flat.min.css | 0 .../css/components/search.css | 0 .../css/components/search.gradient.css | 0 .../css/components/search.gradient.min.css | 0 .../css/components/search.min.css | 0 .../css/components/slidenav.almost-flat.css | 0 .../components/slidenav.almost-flat.min.css | 0 .../css/components/slidenav.css | 0 .../css/components/slidenav.gradient.css | 0 .../css/components/slidenav.gradient.min.css | 0 .../css/components/slidenav.min.css | 0 .../css/components/slider.almost-flat.css | 0 .../css/components/slider.almost-flat.min.css | 0 .../css/components/slider.css | 0 .../css/components/slider.gradient.css | 0 .../css/components/slider.gradient.min.css | 0 .../css/components/slider.min.css | 0 .../css/components/slideshow.almost-flat.css | 0 .../components/slideshow.almost-flat.min.css | 0 .../css/components/slideshow.css | 0 .../css/components/slideshow.gradient.css | 0 .../css/components/slideshow.gradient.min.css | 0 .../css/components/slideshow.min.css | 0 .../css/components/sortable.almost-flat.css | 0 .../components/sortable.almost-flat.min.css | 0 .../css/components/sortable.css | 0 .../css/components/sortable.gradient.css | 0 .../css/components/sortable.gradient.min.css | 0 .../css/components/sortable.min.css | 0 .../css/components/sticky.almost-flat.css | 0 .../css/components/sticky.almost-flat.min.css | 0 .../css/components/sticky.css | 0 .../css/components/sticky.gradient.css | 0 .../css/components/sticky.gradient.min.css | 0 .../css/components/sticky.min.css | 0 .../css/components/tooltip.almost-flat.css | 0 .../components/tooltip.almost-flat.min.css | 0 .../css/components/tooltip.css | 0 .../css/components/tooltip.gradient.css | 0 .../css/components/tooltip.gradient.min.css | 0 .../css/components/tooltip.min.css | 0 .../css/components/upload.almost-flat.css | 0 .../css/components/upload.almost-flat.min.css | 0 .../css/components/upload.css | 0 .../css/components/upload.gradient.css | 0 .../css/components/upload.gradient.min.css | 0 .../css/components/upload.min.css | 0 .../custom/{uikit => uikit-v2}/css/index.html | 0 .../css/uikit.almost-flat.css | 0 .../css/uikit.almost-flat.min.css | 0 .../custom/{uikit => uikit-v2}/css/uikit.css | 0 .../css/uikit.gradient.css | 0 .../css/uikit.gradient.min.css | 0 .../{uikit => uikit-v2}/css/uikit.min.css | 0 .../{uikit => uikit-v2}/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../{uikit => uikit-v2}/fonts/index.html | 0 admin/custom/{uikit => uikit-v2}/index.html | 0 .../js/components/accordion.js | 0 .../js/components/accordion.min.js | 0 .../js/components/autocomplete.js | 0 .../js/components/autocomplete.min.js | 0 .../js/components/datepicker.js | 0 .../js/components/datepicker.min.js | 0 .../js/components/form-password.js | 0 .../js/components/form-password.min.js | 0 .../js/components/form-select.js | 0 .../js/components/form-select.min.js | 0 .../js/components/grid-parallax.js | 0 .../js/components/grid-parallax.min.js | 0 .../{uikit => uikit-v2}/js/components/grid.js | 0 .../js/components/grid.min.js | 0 .../js/components/htmleditor.js | 0 .../js/components/htmleditor.min.js | 0 .../js/components/index.html | 0 .../js/components/lightbox.js | 0 .../js/components/lightbox.min.js | 0 .../js/components/nestable.js | 0 .../js/components/nestable.min.js | 0 .../js/components/notify.js | 0 .../js/components/notify.min.js | 0 .../js/components/pagination.js | 0 .../js/components/pagination.min.js | 0 .../js/components/parallax.js | 0 .../js/components/parallax.min.js | 0 .../js/components/search.js | 0 .../js/components/search.min.js | 0 .../js/components/slider.js | 0 .../js/components/slider.min.js | 0 .../js/components/slideset.js | 0 .../js/components/slideset.min.js | 0 .../js/components/slideshow-fx.js | 0 .../js/components/slideshow-fx.min.js | 0 .../js/components/slideshow.js | 0 .../js/components/slideshow.min.js | 0 .../js/components/sortable.js | 0 .../js/components/sortable.min.js | 0 .../js/components/sticky.js | 0 .../js/components/sticky.min.js | 0 .../js/components/timepicker.js | 0 .../js/components/timepicker.min.js | 0 .../js/components/tooltip.js | 0 .../js/components/tooltip.min.js | 0 .../js/components/upload.js | 0 .../js/components/upload.min.js | 0 .../{uikit => uikit-v2}/js/core/alert.js | 0 .../{uikit => uikit-v2}/js/core/alert.min.js | 0 .../{uikit => uikit-v2}/js/core/button.js | 0 .../{uikit => uikit-v2}/js/core/button.min.js | 0 .../{uikit => uikit-v2}/js/core/core.js | 0 .../{uikit => uikit-v2}/js/core/core.min.js | 0 .../{uikit => uikit-v2}/js/core/cover.js | 0 .../{uikit => uikit-v2}/js/core/cover.min.js | 0 .../{uikit => uikit-v2}/js/core/dropdown.js | 0 .../js/core/dropdown.min.js | 0 .../{uikit => uikit-v2}/js/core/grid.js | 0 .../{uikit => uikit-v2}/js/core/grid.min.js | 0 .../{uikit => uikit-v2}/js/core/index.html | 0 .../{uikit => uikit-v2}/js/core/modal.js | 0 .../{uikit => uikit-v2}/js/core/modal.min.js | 0 .../custom/{uikit => uikit-v2}/js/core/nav.js | 0 .../{uikit => uikit-v2}/js/core/nav.min.js | 0 .../{uikit => uikit-v2}/js/core/offcanvas.js | 0 .../js/core/offcanvas.min.js | 0 .../{uikit => uikit-v2}/js/core/scrollspy.js | 0 .../js/core/scrollspy.min.js | 0 .../js/core/smooth-scroll.js | 0 .../js/core/smooth-scroll.min.js | 0 .../{uikit => uikit-v2}/js/core/switcher.js | 0 .../js/core/switcher.min.js | 0 .../custom/{uikit => uikit-v2}/js/core/tab.js | 0 .../{uikit => uikit-v2}/js/core/tab.min.js | 0 .../{uikit => uikit-v2}/js/core/toggle.js | 0 .../{uikit => uikit-v2}/js/core/toggle.min.js | 0 .../{uikit => uikit-v2}/js/core/touch.js | 0 .../{uikit => uikit-v2}/js/core/touch.min.js | 0 .../{uikit => uikit-v2}/js/core/utility.js | 0 .../js/core/utility.min.js | 0 .../custom/{uikit => uikit-v2}/js/index.html | 0 admin/custom/{uikit => uikit-v2}/js/uikit.js | 0 .../{uikit => uikit-v2}/js/uikit.min.js | 0 .../{uikit-3 => uikit-v3}/css/uikit-rtl.css | 0 .../css/uikit-rtl.min.css | 0 .../{uikit-3 => uikit-v3}/css/uikit.css | 0 .../{uikit-3 => uikit-v3}/css/uikit.min.css | 0 .../{uikit-3 => uikit-v3}/js/uikit-icons.js | 0 .../js/uikit-icons.min.js | 0 .../custom/{uikit-3 => uikit-v3}/js/uikit.js | 0 .../{uikit-3 => uikit-v3}/js/uikit.min.js | 0 admin/helpers/compiler/a_Get.php | 265 +- admin/helpers/compiler/b_Structure.php | 126 +- admin/helpers/compiler/c_Fields.php | 11 +- admin/helpers/compiler/e_Interpretation.php | 383 +- admin/helpers/compiler/f_Infusion.php | 1 + admin/helpers/componentbuilder.php | 172 +- .../en-GB/en-GB.com_componentbuilder.ini | 35 +- admin/layouts/fieldtype/fields_fullwidth.php | 2 +- .../ftp/linked_components_fullwidth.php | 2 +- admin/layouts/library/behaviour_fullwidth.php | 4 +- admin/layouts/library/config_fullwidth.php | 1 + .../library/files_folders_urls_fullwidth.php | 1 + admin/models/ajax.php | 8 + admin/models/compiler.php | 12 +- admin/models/custom_codes.php | 2 +- admin/models/fields.php | 2 +- admin/models/fields/filebehaviour.php | 168 + admin/models/fieldtype.php | 12 +- admin/models/forms/admin_fields.xml | 512 ++- .../models/forms/admin_fields_conditions.xml | 405 +- admin/models/forms/admin_view.xml | 3348 +++++++---------- admin/models/forms/component_admin_views.xml | 1110 +++--- admin/models/forms/component_config.xml | 289 +- .../forms/component_custom_admin_menus.xml | 392 +- .../forms/component_custom_admin_views.xml | 1030 ++--- admin/models/forms/component_dashboard.xml | 318 +- .../models/forms/component_files_folders.xml | 395 +- admin/models/forms/component_mysql_tweaks.xml | 319 +- admin/models/forms/component_site_views.xml | 337 +- admin/models/forms/component_updates.xml | 294 +- admin/models/forms/custom_admin_view.xml | 1662 ++++---- admin/models/forms/custom_code.js | 4 +- admin/models/forms/custom_code.xml | 486 ++- admin/models/forms/dynamic_get.xml | 2335 +++++------- admin/models/forms/field.js | 388 +- admin/models/forms/field.xml | 796 ++-- admin/models/forms/fieldtype.xml | 429 +-- admin/models/forms/ftp.xml | 230 +- admin/models/forms/help_document.js | 236 +- admin/models/forms/help_document.xml | 424 +-- admin/models/forms/joomla_component.xml | 2434 ++++++------ admin/models/forms/language.xml | 217 +- admin/models/forms/language_translation.xml | 282 +- admin/models/forms/layout.xml | 431 ++- admin/models/forms/library.js | 83 +- admin/models/forms/library.xml | 642 ++-- admin/models/forms/library_config.xml | 289 +- .../forms/library_files_folders_urls.xml | 493 ++- admin/models/forms/site_view.xml | 1988 +++++----- admin/models/forms/snippet.xml | 468 ++- admin/models/forms/snippet_type.xml | 223 +- admin/models/forms/template.xml | 431 ++- admin/models/ftp.php | 2 +- admin/models/get_snippets.php | 5 +- admin/models/help_documents.php | 2 +- admin/models/layouts.php | 2 +- admin/models/libraries.php | 41 +- admin/models/library.php | 12 - admin/models/snippets.php | 2 +- admin/sql/install.mysql.utf8.sql | 23 +- admin/views/admin_fields/view.html.php | 13 +- .../admin_fields_conditions/view.html.php | 15 +- admin/views/admin_view/view.html.php | 27 +- admin/views/admin_views/view.html.php | 9 +- admin/views/admins_fields/view.html.php | 9 +- .../admins_fields_conditions/view.html.php | 9 +- admin/views/compiler/view.html.php | 14 +- .../views/component_admin_views/view.html.php | 13 +- admin/views/component_config/view.html.php | 13 +- .../view.html.php | 13 +- .../view.html.php | 13 +- admin/views/component_dashboard/view.html.php | 13 +- .../component_files_folders/view.html.php | 13 +- .../component_mysql_tweaks/view.html.php | 13 +- .../views/component_site_views/view.html.php | 13 +- admin/views/component_updates/view.html.php | 13 +- .../components_admin_views/view.html.php | 9 +- admin/views/components_config/view.html.php | 9 +- .../view.html.php | 9 +- .../view.html.php | 9 +- .../views/components_dashboard/view.html.php | 9 +- .../components_files_folders/view.html.php | 9 +- .../components_mysql_tweaks/view.html.php | 9 +- .../views/components_site_views/view.html.php | 9 +- admin/views/components_updates/view.html.php | 9 +- admin/views/custom_admin_view/view.html.php | 15 +- admin/views/custom_admin_views/view.html.php | 9 +- admin/views/custom_code/view.html.php | 23 +- admin/views/custom_codes/view.html.php | 9 +- admin/views/dynamic_get/view.html.php | 15 +- admin/views/dynamic_gets/view.html.php | 9 +- admin/views/field/tmpl/edit.php | 132 +- admin/views/field/view.html.php | 15 +- admin/views/fields/view.html.php | 9 +- admin/views/fieldtype/view.html.php | 23 +- admin/views/fieldtypes/view.html.php | 9 +- admin/views/ftp/view.html.php | 23 +- admin/views/ftps/view.html.php | 9 +- admin/views/get_snippets/view.html.php | 14 +- admin/views/help_document/tmpl/edit.php | 54 +- admin/views/help_document/view.html.php | 13 +- admin/views/help_documents/view.html.php | 9 +- admin/views/joomla_component/view.html.php | 35 +- admin/views/joomla_components/view.html.php | 9 +- admin/views/language/view.html.php | 13 +- .../views/language_translation/view.html.php | 27 +- .../views/language_translations/view.html.php | 9 +- admin/views/languages/view.html.php | 9 +- admin/views/layout/view.html.php | 15 +- admin/views/layouts/view.html.php | 9 +- admin/views/libraries/tmpl/default_body.php | 2 +- admin/views/libraries/view.html.php | 47 +- admin/views/libraries_config/view.html.php | 9 +- .../view.html.php | 9 +- admin/views/library/tmpl/edit.php | 25 +- admin/views/library/view.html.php | 27 +- admin/views/library_config/view.html.php | 13 +- .../library_files_folders_urls/view.html.php | 13 +- admin/views/site_view/view.html.php | 15 +- admin/views/site_views/view.html.php | 9 +- admin/views/snippet/view.html.php | 15 +- admin/views/snippet_type/view.html.php | 13 +- admin/views/snippet_types/view.html.php | 9 +- admin/views/snippets/view.html.php | 9 +- admin/views/template/view.html.php | 15 +- admin/views/templates/view.html.php | 9 +- componentbuilder.xml | 6 +- media/{footable => footable-v3}/LICENSE-GPLv3 | 0 .../css/footable.bootstrap.css | 0 .../css/footable.bootstrap.min.css | 0 .../css/footable.core.bootstrap.css | 0 .../css/footable.core.bootstrap.min.css | 0 .../css/footable.core.standalone.css | 0 .../css/footable.core.standalone.min.css | 0 .../css/footable.editing.css | 0 .../css/footable.editing.min.css | 0 .../css/footable.filtering.css | 0 .../css/footable.filtering.min.css | 0 .../css/footable.paging.css | 0 .../css/footable.paging.min.css | 0 .../css/footable.sorting.css | 0 .../css/footable.sorting.min.css | 0 .../css/footable.standalone.css | 0 .../css/footable.standalone.min.css | 0 .../{footable => footable-v3}/css/index.html | 0 media/{footable => footable-v3}/index.html | 0 .../js/footable.core.js | 0 .../js/footable.core.min.js | 0 .../js/footable.editing.js | 0 .../js/footable.editing.min.js | 0 .../js/footable.filtering.js | 0 .../js/footable.filtering.min.js | 0 .../js/footable.min.js | 0 .../js/footable.paging.js | 0 .../js/footable.paging.min.js | 0 .../js/footable.sorting.js | 0 .../js/footable.sorting.min.js | 0 .../js/footable.state.js | 0 .../js/footable.state.min.js | 0 media/{footable => footable-v3}/js/index.html | 0 .../css/components/accordion.almost-flat.css | 0 .../components/accordion.almost-flat.min.css | 0 .../css/components/accordion.css | 0 .../css/components/accordion.gradient.css | 0 .../css/components/accordion.gradient.min.css | 0 .../css/components/accordion.min.css | 0 .../components/autocomplete.almost-flat.css | 0 .../autocomplete.almost-flat.min.css | 0 .../css/components/autocomplete.css | 0 .../css/components/autocomplete.gradient.css | 0 .../components/autocomplete.gradient.min.css | 0 .../css/components/autocomplete.min.css | 0 .../css/components/datepicker.almost-flat.css | 0 .../components/datepicker.almost-flat.min.css | 0 .../css/components/datepicker.css | 0 .../css/components/datepicker.gradient.css | 0 .../components/datepicker.gradient.min.css | 0 .../css/components/datepicker.min.css | 0 .../css/components/dotnav.almost-flat.css | 0 .../css/components/dotnav.almost-flat.min.css | 0 .../css/components/dotnav.css | 0 .../css/components/dotnav.gradient.css | 0 .../css/components/dotnav.gradient.min.css | 0 .../css/components/dotnav.min.css | 0 .../components/form-advanced.almost-flat.css | 0 .../form-advanced.almost-flat.min.css | 0 .../css/components/form-advanced.css | 0 .../css/components/form-advanced.gradient.css | 0 .../components/form-advanced.gradient.min.css | 0 .../css/components/form-advanced.min.css | 0 .../css/components/form-file.almost-flat.css | 0 .../components/form-file.almost-flat.min.css | 0 .../css/components/form-file.css | 0 .../css/components/form-file.gradient.css | 0 .../css/components/form-file.gradient.min.css | 0 .../css/components/form-file.min.css | 0 .../components/form-password.almost-flat.css | 0 .../form-password.almost-flat.min.css | 0 .../css/components/form-password.css | 0 .../css/components/form-password.gradient.css | 0 .../components/form-password.gradient.min.css | 0 .../css/components/form-password.min.css | 0 .../components/form-select.almost-flat.css | 0 .../form-select.almost-flat.min.css | 0 .../css/components/form-select.css | 0 .../css/components/form-select.gradient.css | 0 .../components/form-select.gradient.min.css | 0 .../css/components/form-select.min.css | 0 .../css/components/htmleditor.almost-flat.css | 0 .../components/htmleditor.almost-flat.min.css | 0 .../css/components/htmleditor.css | 0 .../css/components/htmleditor.gradient.css | 0 .../components/htmleditor.gradient.min.css | 0 .../css/components/htmleditor.min.css | 0 .../css/components/index.html | 0 .../css/components/nestable.almost-flat.css | 0 .../components/nestable.almost-flat.min.css | 0 .../css/components/nestable.css | 0 .../css/components/nestable.gradient.css | 0 .../css/components/nestable.gradient.min.css | 0 .../css/components/nestable.min.css | 0 .../css/components/notify.almost-flat.css | 0 .../css/components/notify.almost-flat.min.css | 0 .../css/components/notify.css | 0 .../css/components/notify.gradient.css | 0 .../css/components/notify.gradient.min.css | 0 .../css/components/notify.min.css | 0 .../components/placeholder.almost-flat.css | 0 .../placeholder.almost-flat.min.css | 0 .../css/components/placeholder.css | 0 .../css/components/placeholder.gradient.css | 0 .../components/placeholder.gradient.min.css | 0 .../css/components/placeholder.min.css | 0 .../css/components/progress.almost-flat.css | 0 .../components/progress.almost-flat.min.css | 0 .../css/components/progress.css | 0 .../css/components/progress.gradient.css | 0 .../css/components/progress.gradient.min.css | 0 .../css/components/progress.min.css | 0 .../css/components/search.almost-flat.css | 0 .../css/components/search.almost-flat.min.css | 0 .../css/components/search.css | 0 .../css/components/search.gradient.css | 0 .../css/components/search.gradient.min.css | 0 .../css/components/search.min.css | 0 .../css/components/slidenav.almost-flat.css | 0 .../components/slidenav.almost-flat.min.css | 0 .../css/components/slidenav.css | 0 .../css/components/slidenav.gradient.css | 0 .../css/components/slidenav.gradient.min.css | 0 .../css/components/slidenav.min.css | 0 .../css/components/slider.almost-flat.css | 0 .../css/components/slider.almost-flat.min.css | 0 .../css/components/slider.css | 0 .../css/components/slider.gradient.css | 0 .../css/components/slider.gradient.min.css | 0 .../css/components/slider.min.css | 0 .../css/components/slideshow.almost-flat.css | 0 .../components/slideshow.almost-flat.min.css | 0 .../css/components/slideshow.css | 0 .../css/components/slideshow.gradient.css | 0 .../css/components/slideshow.gradient.min.css | 0 .../css/components/slideshow.min.css | 0 .../css/components/sortable.almost-flat.css | 0 .../components/sortable.almost-flat.min.css | 0 .../css/components/sortable.css | 0 .../css/components/sortable.gradient.css | 0 .../css/components/sortable.gradient.min.css | 0 .../css/components/sortable.min.css | 0 .../css/components/sticky.almost-flat.css | 0 .../css/components/sticky.almost-flat.min.css | 0 .../css/components/sticky.css | 0 .../css/components/sticky.gradient.css | 0 .../css/components/sticky.gradient.min.css | 0 .../css/components/sticky.min.css | 0 .../css/components/tooltip.almost-flat.css | 0 .../components/tooltip.almost-flat.min.css | 0 .../css/components/tooltip.css | 0 .../css/components/tooltip.gradient.css | 0 .../css/components/tooltip.gradient.min.css | 0 .../css/components/tooltip.min.css | 0 .../css/components/upload.almost-flat.css | 0 .../css/components/upload.almost-flat.min.css | 0 .../css/components/upload.css | 0 .../css/components/upload.gradient.css | 0 .../css/components/upload.gradient.min.css | 0 .../css/components/upload.min.css | 0 media/{uikit => uikit-v2}/css/index.html | 0 .../css/uikit.almost-flat.css | 0 .../css/uikit.almost-flat.min.css | 0 media/{uikit => uikit-v2}/css/uikit.css | 0 .../css/uikit.gradient.css | 0 .../css/uikit.gradient.min.css | 0 media/{uikit => uikit-v2}/css/uikit.min.css | 0 .../{uikit => uikit-v2}/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin media/{uikit => uikit-v2}/fonts/index.html | 0 media/{uikit => uikit-v2}/index.html | 0 .../js/components/accordion.js | 0 .../js/components/accordion.min.js | 0 .../js/components/autocomplete.js | 0 .../js/components/autocomplete.min.js | 0 .../js/components/datepicker.js | 0 .../js/components/datepicker.min.js | 0 .../js/components/form-password.js | 0 .../js/components/form-password.min.js | 0 .../js/components/form-select.js | 0 .../js/components/form-select.min.js | 0 .../js/components/grid-parallax.js | 0 .../js/components/grid-parallax.min.js | 0 .../{uikit => uikit-v2}/js/components/grid.js | 0 .../js/components/grid.min.js | 0 .../js/components/htmleditor.js | 0 .../js/components/htmleditor.min.js | 0 .../js/components/index.html | 0 .../js/components/lightbox.js | 0 .../js/components/lightbox.min.js | 0 .../js/components/nestable.js | 0 .../js/components/nestable.min.js | 0 .../js/components/notify.js | 0 .../js/components/notify.min.js | 0 .../js/components/pagination.js | 0 .../js/components/pagination.min.js | 0 .../js/components/parallax.js | 0 .../js/components/parallax.min.js | 0 .../js/components/search.js | 0 .../js/components/search.min.js | 0 .../js/components/slider.js | 0 .../js/components/slider.min.js | 0 .../js/components/slideset.js | 0 .../js/components/slideset.min.js | 0 .../js/components/slideshow-fx.js | 0 .../js/components/slideshow-fx.min.js | 0 .../js/components/slideshow.js | 0 .../js/components/slideshow.min.js | 0 .../js/components/sortable.js | 0 .../js/components/sortable.min.js | 0 .../js/components/sticky.js | 0 .../js/components/sticky.min.js | 0 .../js/components/timepicker.js | 0 .../js/components/timepicker.min.js | 0 .../js/components/tooltip.js | 0 .../js/components/tooltip.min.js | 0 .../js/components/upload.js | 0 .../js/components/upload.min.js | 0 media/{uikit => uikit-v2}/js/core/alert.js | 0 .../{uikit => uikit-v2}/js/core/alert.min.js | 0 media/{uikit => uikit-v2}/js/core/button.js | 0 .../{uikit => uikit-v2}/js/core/button.min.js | 0 media/{uikit => uikit-v2}/js/core/core.js | 0 media/{uikit => uikit-v2}/js/core/core.min.js | 0 media/{uikit => uikit-v2}/js/core/cover.js | 0 .../{uikit => uikit-v2}/js/core/cover.min.js | 0 media/{uikit => uikit-v2}/js/core/dropdown.js | 0 .../js/core/dropdown.min.js | 0 media/{uikit => uikit-v2}/js/core/grid.js | 0 media/{uikit => uikit-v2}/js/core/grid.min.js | 0 media/{uikit => uikit-v2}/js/core/index.html | 0 media/{uikit => uikit-v2}/js/core/modal.js | 0 .../{uikit => uikit-v2}/js/core/modal.min.js | 0 media/{uikit => uikit-v2}/js/core/nav.js | 0 media/{uikit => uikit-v2}/js/core/nav.min.js | 0 .../{uikit => uikit-v2}/js/core/offcanvas.js | 0 .../js/core/offcanvas.min.js | 0 .../{uikit => uikit-v2}/js/core/scrollspy.js | 0 .../js/core/scrollspy.min.js | 0 .../js/core/smooth-scroll.js | 0 .../js/core/smooth-scroll.min.js | 0 media/{uikit => uikit-v2}/js/core/switcher.js | 0 .../js/core/switcher.min.js | 0 media/{uikit => uikit-v2}/js/core/tab.js | 0 media/{uikit => uikit-v2}/js/core/tab.min.js | 0 media/{uikit => uikit-v2}/js/core/toggle.js | 0 .../{uikit => uikit-v2}/js/core/toggle.min.js | 0 media/{uikit => uikit-v2}/js/core/touch.js | 0 .../{uikit => uikit-v2}/js/core/touch.min.js | 0 media/{uikit => uikit-v2}/js/core/utility.js | 0 .../js/core/utility.min.js | 0 media/{uikit => uikit-v2}/js/index.html | 0 media/{uikit => uikit-v2}/js/uikit.js | 0 media/{uikit => uikit-v2}/js/uikit.min.js | 0 script.php | 4 +- site/helpers/componentbuilder.php | 172 +- .../en-GB/en-GB.com_componentbuilder.ini | 7 +- site/models/api.php | 3 + site/views/api/view.html.php | 6 +- 700 files changed, 12837 insertions(+), 14154 deletions(-) rename admin/custom/{footable2 => footable-v2}/LICENSE (100%) rename admin/custom/{footable2 => footable-v2}/css/fonts/footable.eot (100%) rename admin/custom/{footable2 => footable-v2}/css/fonts/footable.svg (100%) rename admin/custom/{footable2 => footable-v2}/css/fonts/footable.ttf (100%) rename admin/custom/{footable2 => footable-v2}/css/fonts/footable.woff (100%) rename admin/custom/{footable2 => footable-v2}/css/fonts/index.html (100%) rename admin/custom/{footable2 => footable-v2}/css/footable.core.css (100%) rename admin/custom/{footable2 => footable-v2}/css/footable.core.min.css (100%) rename admin/custom/{footable2 => footable-v2}/css/footable.metro.css (100%) rename admin/custom/{footable2 => footable-v2}/css/footable.metro.min.css (100%) rename admin/custom/{footable2 => footable-v2}/css/footable.standalone.css (100%) rename admin/custom/{footable2 => footable-v2}/css/footable.standalone.min.css (100%) rename admin/custom/{footable2 => footable-v2}/css/index.html (100%) rename admin/custom/{footable2 => footable-v2}/dist/footable.all.min.js (100%) rename admin/custom/{footable2 => footable-v2}/dist/footable.bookmarkable.min.js (100%) rename admin/custom/{footable2 => footable-v2}/dist/footable.filter.min.js (100%) rename admin/custom/{footable2 => footable-v2}/dist/footable.grid.min.js (100%) rename admin/custom/{footable2 => footable-v2}/dist/footable.min.js (100%) rename admin/custom/{footable2 => footable-v2}/dist/footable.paginate.min.js (100%) rename admin/custom/{footable2 => footable-v2}/dist/footable.sort.min.js (100%) rename admin/custom/{footable2 => footable-v2}/dist/footable.striping.min.js (100%) rename admin/custom/{footable2 => footable-v2}/dist/index.html (100%) rename admin/custom/{footable2 => footable-v2}/icomoon/footable.json (100%) rename admin/custom/{footable2 => footable-v2}/icomoon/index.html (100%) rename admin/custom/{footable2 => footable-v2}/index.html (100%) rename admin/custom/{footable2 => footable-v2}/js/.jshintrc (100%) rename admin/custom/{footable2 => footable-v2}/js/footable.bookmarkable.js (100%) rename admin/custom/{footable2 => footable-v2}/js/footable.filter.js (100%) rename admin/custom/{footable2 => footable-v2}/js/footable.grid.js (100%) rename admin/custom/{footable2 => footable-v2}/js/footable.js (100%) rename admin/custom/{footable2 => footable-v2}/js/footable.memory.js (100%) rename admin/custom/{footable2 => footable-v2}/js/footable.paginate.js (100%) rename admin/custom/{footable2 => footable-v2}/js/footable.plugin.template.js (100%) rename admin/custom/{footable2 => footable-v2}/js/footable.sort.js (100%) rename admin/custom/{footable2 => footable-v2}/js/footable.striping.js (100%) rename admin/custom/{footable2 => footable-v2}/js/index.html (100%) rename admin/custom/{footable3 => footable-v3}/LICENSE-GPLv3 (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.bootstrap.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.bootstrap.min.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.core.bootstrap.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.core.bootstrap.min.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.core.standalone.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.core.standalone.min.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.editing.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.editing.min.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.filtering.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.filtering.min.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.paging.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.paging.min.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.sorting.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.sorting.min.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.standalone.css (100%) rename admin/custom/{footable3 => footable-v3}/css/footable.standalone.min.css (100%) rename admin/custom/{footable3 => footable-v3}/css/index.html (100%) rename admin/custom/{footable3 => footable-v3}/index.html (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.core.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.core.min.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.editing.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.editing.min.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.filtering.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.filtering.min.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.min.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.paging.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.paging.min.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.sorting.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.sorting.min.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.state.js (100%) rename admin/custom/{footable3 => footable-v3}/js/footable.state.min.js (100%) rename admin/custom/{footable3 => footable-v3}/js/index.html (100%) rename admin/custom/{uikit => uikit-v2}/css/components/accordion.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/accordion.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/accordion.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/accordion.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/accordion.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/accordion.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/autocomplete.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/autocomplete.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/autocomplete.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/autocomplete.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/autocomplete.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/autocomplete.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/datepicker.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/datepicker.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/datepicker.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/datepicker.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/datepicker.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/datepicker.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/dotnav.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/dotnav.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/dotnav.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/dotnav.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/dotnav.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/dotnav.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-advanced.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-advanced.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-advanced.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-advanced.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-advanced.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-advanced.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-file.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-file.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-file.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-file.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-file.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-file.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-password.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-password.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-password.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-password.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-password.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-password.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-select.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-select.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-select.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-select.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-select.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/form-select.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/htmleditor.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/htmleditor.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/htmleditor.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/htmleditor.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/htmleditor.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/htmleditor.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/index.html (100%) rename admin/custom/{uikit => uikit-v2}/css/components/nestable.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/nestable.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/nestable.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/nestable.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/nestable.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/nestable.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/notify.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/notify.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/notify.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/notify.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/notify.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/notify.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/placeholder.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/placeholder.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/placeholder.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/placeholder.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/placeholder.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/placeholder.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/progress.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/progress.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/progress.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/progress.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/progress.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/progress.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/search.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/search.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/search.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/search.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/search.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/search.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slidenav.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slidenav.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slidenav.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slidenav.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slidenav.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slidenav.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slider.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slider.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slider.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slider.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slider.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slider.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slideshow.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slideshow.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slideshow.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slideshow.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slideshow.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/slideshow.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sortable.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sortable.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sortable.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sortable.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sortable.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sortable.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sticky.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sticky.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sticky.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sticky.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sticky.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/sticky.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/tooltip.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/tooltip.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/tooltip.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/tooltip.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/tooltip.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/tooltip.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/upload.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/upload.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/upload.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/upload.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/upload.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/components/upload.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/index.html (100%) rename admin/custom/{uikit => uikit-v2}/css/uikit.almost-flat.css (100%) rename admin/custom/{uikit => uikit-v2}/css/uikit.almost-flat.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/uikit.css (100%) rename admin/custom/{uikit => uikit-v2}/css/uikit.gradient.css (100%) rename admin/custom/{uikit => uikit-v2}/css/uikit.gradient.min.css (100%) rename admin/custom/{uikit => uikit-v2}/css/uikit.min.css (100%) rename admin/custom/{uikit => uikit-v2}/fonts/FontAwesome.otf (100%) rename admin/custom/{uikit => uikit-v2}/fonts/fontawesome-webfont.ttf (100%) rename admin/custom/{uikit => uikit-v2}/fonts/fontawesome-webfont.woff (100%) rename admin/custom/{uikit => uikit-v2}/fonts/fontawesome-webfont.woff2 (100%) rename admin/custom/{uikit => uikit-v2}/fonts/index.html (100%) rename admin/custom/{uikit => uikit-v2}/index.html (100%) rename admin/custom/{uikit => uikit-v2}/js/components/accordion.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/accordion.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/autocomplete.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/autocomplete.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/datepicker.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/datepicker.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/form-password.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/form-password.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/form-select.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/form-select.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/grid-parallax.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/grid-parallax.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/grid.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/grid.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/htmleditor.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/htmleditor.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/index.html (100%) rename admin/custom/{uikit => uikit-v2}/js/components/lightbox.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/lightbox.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/nestable.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/nestable.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/notify.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/notify.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/pagination.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/pagination.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/parallax.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/parallax.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/search.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/search.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/slider.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/slider.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/slideset.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/slideset.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/slideshow-fx.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/slideshow-fx.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/slideshow.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/slideshow.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/sortable.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/sortable.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/sticky.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/sticky.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/timepicker.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/timepicker.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/tooltip.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/tooltip.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/upload.js (100%) rename admin/custom/{uikit => uikit-v2}/js/components/upload.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/alert.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/alert.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/button.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/button.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/core.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/core.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/cover.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/cover.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/dropdown.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/dropdown.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/grid.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/grid.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/index.html (100%) rename admin/custom/{uikit => uikit-v2}/js/core/modal.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/modal.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/nav.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/nav.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/offcanvas.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/offcanvas.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/scrollspy.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/scrollspy.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/smooth-scroll.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/smooth-scroll.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/switcher.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/switcher.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/tab.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/tab.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/toggle.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/toggle.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/touch.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/touch.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/utility.js (100%) rename admin/custom/{uikit => uikit-v2}/js/core/utility.min.js (100%) rename admin/custom/{uikit => uikit-v2}/js/index.html (100%) rename admin/custom/{uikit => uikit-v2}/js/uikit.js (100%) rename admin/custom/{uikit => uikit-v2}/js/uikit.min.js (100%) rename admin/custom/{uikit-3 => uikit-v3}/css/uikit-rtl.css (100%) rename admin/custom/{uikit-3 => uikit-v3}/css/uikit-rtl.min.css (100%) rename admin/custom/{uikit-3 => uikit-v3}/css/uikit.css (100%) rename admin/custom/{uikit-3 => uikit-v3}/css/uikit.min.css (100%) rename admin/custom/{uikit-3 => uikit-v3}/js/uikit-icons.js (100%) rename admin/custom/{uikit-3 => uikit-v3}/js/uikit-icons.min.js (100%) rename admin/custom/{uikit-3 => uikit-v3}/js/uikit.js (100%) rename admin/custom/{uikit-3 => uikit-v3}/js/uikit.min.js (100%) create mode 100644 admin/models/fields/filebehaviour.php rename media/{footable => footable-v3}/LICENSE-GPLv3 (100%) rename media/{footable => footable-v3}/css/footable.bootstrap.css (100%) rename media/{footable => footable-v3}/css/footable.bootstrap.min.css (100%) rename media/{footable => footable-v3}/css/footable.core.bootstrap.css (100%) rename media/{footable => footable-v3}/css/footable.core.bootstrap.min.css (100%) rename media/{footable => footable-v3}/css/footable.core.standalone.css (100%) rename media/{footable => footable-v3}/css/footable.core.standalone.min.css (100%) rename media/{footable => footable-v3}/css/footable.editing.css (100%) rename media/{footable => footable-v3}/css/footable.editing.min.css (100%) rename media/{footable => footable-v3}/css/footable.filtering.css (100%) rename media/{footable => footable-v3}/css/footable.filtering.min.css (100%) rename media/{footable => footable-v3}/css/footable.paging.css (100%) rename media/{footable => footable-v3}/css/footable.paging.min.css (100%) rename media/{footable => footable-v3}/css/footable.sorting.css (100%) rename media/{footable => footable-v3}/css/footable.sorting.min.css (100%) rename media/{footable => footable-v3}/css/footable.standalone.css (100%) rename media/{footable => footable-v3}/css/footable.standalone.min.css (100%) rename media/{footable => footable-v3}/css/index.html (100%) rename media/{footable => footable-v3}/index.html (100%) rename media/{footable => footable-v3}/js/footable.core.js (100%) rename media/{footable => footable-v3}/js/footable.core.min.js (100%) rename media/{footable => footable-v3}/js/footable.editing.js (100%) rename media/{footable => footable-v3}/js/footable.editing.min.js (100%) rename media/{footable => footable-v3}/js/footable.filtering.js (100%) rename media/{footable => footable-v3}/js/footable.filtering.min.js (100%) rename media/{footable => footable-v3}/js/footable.min.js (100%) rename media/{footable => footable-v3}/js/footable.paging.js (100%) rename media/{footable => footable-v3}/js/footable.paging.min.js (100%) rename media/{footable => footable-v3}/js/footable.sorting.js (100%) rename media/{footable => footable-v3}/js/footable.sorting.min.js (100%) rename media/{footable => footable-v3}/js/footable.state.js (100%) rename media/{footable => footable-v3}/js/footable.state.min.js (100%) rename media/{footable => footable-v3}/js/index.html (100%) rename media/{uikit => uikit-v2}/css/components/accordion.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/accordion.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/accordion.css (100%) rename media/{uikit => uikit-v2}/css/components/accordion.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/accordion.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/accordion.min.css (100%) rename media/{uikit => uikit-v2}/css/components/autocomplete.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/autocomplete.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/autocomplete.css (100%) rename media/{uikit => uikit-v2}/css/components/autocomplete.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/autocomplete.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/autocomplete.min.css (100%) rename media/{uikit => uikit-v2}/css/components/datepicker.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/datepicker.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/datepicker.css (100%) rename media/{uikit => uikit-v2}/css/components/datepicker.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/datepicker.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/datepicker.min.css (100%) rename media/{uikit => uikit-v2}/css/components/dotnav.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/dotnav.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/dotnav.css (100%) rename media/{uikit => uikit-v2}/css/components/dotnav.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/dotnav.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/dotnav.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-advanced.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/form-advanced.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-advanced.css (100%) rename media/{uikit => uikit-v2}/css/components/form-advanced.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/form-advanced.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-advanced.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-file.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/form-file.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-file.css (100%) rename media/{uikit => uikit-v2}/css/components/form-file.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/form-file.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-file.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-password.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/form-password.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-password.css (100%) rename media/{uikit => uikit-v2}/css/components/form-password.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/form-password.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-password.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-select.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/form-select.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-select.css (100%) rename media/{uikit => uikit-v2}/css/components/form-select.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/form-select.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/form-select.min.css (100%) rename media/{uikit => uikit-v2}/css/components/htmleditor.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/htmleditor.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/htmleditor.css (100%) rename media/{uikit => uikit-v2}/css/components/htmleditor.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/htmleditor.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/htmleditor.min.css (100%) rename media/{uikit => uikit-v2}/css/components/index.html (100%) rename media/{uikit => uikit-v2}/css/components/nestable.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/nestable.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/nestable.css (100%) rename media/{uikit => uikit-v2}/css/components/nestable.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/nestable.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/nestable.min.css (100%) rename media/{uikit => uikit-v2}/css/components/notify.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/notify.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/notify.css (100%) rename media/{uikit => uikit-v2}/css/components/notify.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/notify.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/notify.min.css (100%) rename media/{uikit => uikit-v2}/css/components/placeholder.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/placeholder.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/placeholder.css (100%) rename media/{uikit => uikit-v2}/css/components/placeholder.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/placeholder.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/placeholder.min.css (100%) rename media/{uikit => uikit-v2}/css/components/progress.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/progress.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/progress.css (100%) rename media/{uikit => uikit-v2}/css/components/progress.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/progress.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/progress.min.css (100%) rename media/{uikit => uikit-v2}/css/components/search.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/search.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/search.css (100%) rename media/{uikit => uikit-v2}/css/components/search.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/search.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/search.min.css (100%) rename media/{uikit => uikit-v2}/css/components/slidenav.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/slidenav.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/slidenav.css (100%) rename media/{uikit => uikit-v2}/css/components/slidenav.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/slidenav.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/slidenav.min.css (100%) rename media/{uikit => uikit-v2}/css/components/slider.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/slider.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/slider.css (100%) rename media/{uikit => uikit-v2}/css/components/slider.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/slider.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/slider.min.css (100%) rename media/{uikit => uikit-v2}/css/components/slideshow.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/slideshow.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/slideshow.css (100%) rename media/{uikit => uikit-v2}/css/components/slideshow.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/slideshow.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/slideshow.min.css (100%) rename media/{uikit => uikit-v2}/css/components/sortable.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/sortable.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/sortable.css (100%) rename media/{uikit => uikit-v2}/css/components/sortable.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/sortable.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/sortable.min.css (100%) rename media/{uikit => uikit-v2}/css/components/sticky.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/sticky.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/sticky.css (100%) rename media/{uikit => uikit-v2}/css/components/sticky.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/sticky.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/sticky.min.css (100%) rename media/{uikit => uikit-v2}/css/components/tooltip.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/tooltip.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/tooltip.css (100%) rename media/{uikit => uikit-v2}/css/components/tooltip.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/tooltip.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/tooltip.min.css (100%) rename media/{uikit => uikit-v2}/css/components/upload.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/components/upload.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/components/upload.css (100%) rename media/{uikit => uikit-v2}/css/components/upload.gradient.css (100%) rename media/{uikit => uikit-v2}/css/components/upload.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/components/upload.min.css (100%) rename media/{uikit => uikit-v2}/css/index.html (100%) rename media/{uikit => uikit-v2}/css/uikit.almost-flat.css (100%) rename media/{uikit => uikit-v2}/css/uikit.almost-flat.min.css (100%) rename media/{uikit => uikit-v2}/css/uikit.css (100%) rename media/{uikit => uikit-v2}/css/uikit.gradient.css (100%) rename media/{uikit => uikit-v2}/css/uikit.gradient.min.css (100%) rename media/{uikit => uikit-v2}/css/uikit.min.css (100%) rename media/{uikit => uikit-v2}/fonts/FontAwesome.otf (100%) rename media/{uikit => uikit-v2}/fonts/fontawesome-webfont.ttf (100%) rename media/{uikit => uikit-v2}/fonts/fontawesome-webfont.woff (100%) rename media/{uikit => uikit-v2}/fonts/fontawesome-webfont.woff2 (100%) rename media/{uikit => uikit-v2}/fonts/index.html (100%) rename media/{uikit => uikit-v2}/index.html (100%) rename media/{uikit => uikit-v2}/js/components/accordion.js (100%) rename media/{uikit => uikit-v2}/js/components/accordion.min.js (100%) rename media/{uikit => uikit-v2}/js/components/autocomplete.js (100%) rename media/{uikit => uikit-v2}/js/components/autocomplete.min.js (100%) rename media/{uikit => uikit-v2}/js/components/datepicker.js (100%) rename media/{uikit => uikit-v2}/js/components/datepicker.min.js (100%) rename media/{uikit => uikit-v2}/js/components/form-password.js (100%) rename media/{uikit => uikit-v2}/js/components/form-password.min.js (100%) rename media/{uikit => uikit-v2}/js/components/form-select.js (100%) rename media/{uikit => uikit-v2}/js/components/form-select.min.js (100%) rename media/{uikit => uikit-v2}/js/components/grid-parallax.js (100%) rename media/{uikit => uikit-v2}/js/components/grid-parallax.min.js (100%) rename media/{uikit => uikit-v2}/js/components/grid.js (100%) rename media/{uikit => uikit-v2}/js/components/grid.min.js (100%) rename media/{uikit => uikit-v2}/js/components/htmleditor.js (100%) rename media/{uikit => uikit-v2}/js/components/htmleditor.min.js (100%) rename media/{uikit => uikit-v2}/js/components/index.html (100%) rename media/{uikit => uikit-v2}/js/components/lightbox.js (100%) rename media/{uikit => uikit-v2}/js/components/lightbox.min.js (100%) rename media/{uikit => uikit-v2}/js/components/nestable.js (100%) rename media/{uikit => uikit-v2}/js/components/nestable.min.js (100%) rename media/{uikit => uikit-v2}/js/components/notify.js (100%) rename media/{uikit => uikit-v2}/js/components/notify.min.js (100%) rename media/{uikit => uikit-v2}/js/components/pagination.js (100%) rename media/{uikit => uikit-v2}/js/components/pagination.min.js (100%) rename media/{uikit => uikit-v2}/js/components/parallax.js (100%) rename media/{uikit => uikit-v2}/js/components/parallax.min.js (100%) rename media/{uikit => uikit-v2}/js/components/search.js (100%) rename media/{uikit => uikit-v2}/js/components/search.min.js (100%) rename media/{uikit => uikit-v2}/js/components/slider.js (100%) rename media/{uikit => uikit-v2}/js/components/slider.min.js (100%) rename media/{uikit => uikit-v2}/js/components/slideset.js (100%) rename media/{uikit => uikit-v2}/js/components/slideset.min.js (100%) rename media/{uikit => uikit-v2}/js/components/slideshow-fx.js (100%) rename media/{uikit => uikit-v2}/js/components/slideshow-fx.min.js (100%) rename media/{uikit => uikit-v2}/js/components/slideshow.js (100%) rename media/{uikit => uikit-v2}/js/components/slideshow.min.js (100%) rename media/{uikit => uikit-v2}/js/components/sortable.js (100%) rename media/{uikit => uikit-v2}/js/components/sortable.min.js (100%) rename media/{uikit => uikit-v2}/js/components/sticky.js (100%) rename media/{uikit => uikit-v2}/js/components/sticky.min.js (100%) rename media/{uikit => uikit-v2}/js/components/timepicker.js (100%) rename media/{uikit => uikit-v2}/js/components/timepicker.min.js (100%) rename media/{uikit => uikit-v2}/js/components/tooltip.js (100%) rename media/{uikit => uikit-v2}/js/components/tooltip.min.js (100%) rename media/{uikit => uikit-v2}/js/components/upload.js (100%) rename media/{uikit => uikit-v2}/js/components/upload.min.js (100%) rename media/{uikit => uikit-v2}/js/core/alert.js (100%) rename media/{uikit => uikit-v2}/js/core/alert.min.js (100%) rename media/{uikit => uikit-v2}/js/core/button.js (100%) rename media/{uikit => uikit-v2}/js/core/button.min.js (100%) rename media/{uikit => uikit-v2}/js/core/core.js (100%) rename media/{uikit => uikit-v2}/js/core/core.min.js (100%) rename media/{uikit => uikit-v2}/js/core/cover.js (100%) rename media/{uikit => uikit-v2}/js/core/cover.min.js (100%) rename media/{uikit => uikit-v2}/js/core/dropdown.js (100%) rename media/{uikit => uikit-v2}/js/core/dropdown.min.js (100%) rename media/{uikit => uikit-v2}/js/core/grid.js (100%) rename media/{uikit => uikit-v2}/js/core/grid.min.js (100%) rename media/{uikit => uikit-v2}/js/core/index.html (100%) rename media/{uikit => uikit-v2}/js/core/modal.js (100%) rename media/{uikit => uikit-v2}/js/core/modal.min.js (100%) rename media/{uikit => uikit-v2}/js/core/nav.js (100%) rename media/{uikit => uikit-v2}/js/core/nav.min.js (100%) rename media/{uikit => uikit-v2}/js/core/offcanvas.js (100%) rename media/{uikit => uikit-v2}/js/core/offcanvas.min.js (100%) rename media/{uikit => uikit-v2}/js/core/scrollspy.js (100%) rename media/{uikit => uikit-v2}/js/core/scrollspy.min.js (100%) rename media/{uikit => uikit-v2}/js/core/smooth-scroll.js (100%) rename media/{uikit => uikit-v2}/js/core/smooth-scroll.min.js (100%) rename media/{uikit => uikit-v2}/js/core/switcher.js (100%) rename media/{uikit => uikit-v2}/js/core/switcher.min.js (100%) rename media/{uikit => uikit-v2}/js/core/tab.js (100%) rename media/{uikit => uikit-v2}/js/core/tab.min.js (100%) rename media/{uikit => uikit-v2}/js/core/toggle.js (100%) rename media/{uikit => uikit-v2}/js/core/toggle.min.js (100%) rename media/{uikit => uikit-v2}/js/core/touch.js (100%) rename media/{uikit => uikit-v2}/js/core/touch.min.js (100%) rename media/{uikit => uikit-v2}/js/core/utility.js (100%) rename media/{uikit => uikit-v2}/js/core/utility.min.js (100%) rename media/{uikit => uikit-v2}/js/index.html (100%) rename media/{uikit => uikit-v2}/js/uikit.js (100%) rename media/{uikit => uikit-v2}/js/uikit.min.js (100%) diff --git a/README.md b/README.md index 8f9d9de8e..6d2375f85 100644 --- a/README.md +++ b/README.md @@ -111,12 +111,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*: 3rd December, 2017 ++ *Last Build*: 10th December, 2017 + *Version*: 2.6.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*: **179770** -+ *File count*: **1141** ++ *Line count*: **177932** ++ *File count*: **1142** + *Folder count*: **184** > 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 8f9d9de8e..6d2375f85 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -111,12 +111,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*: 3rd December, 2017 ++ *Last Build*: 10th December, 2017 + *Version*: 2.6.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*: **179770** -+ *File count*: **1141** ++ *Line count*: **177932** ++ *File count*: **1142** + *Folder count*: **184** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/compiler/joomla_3/Helper.php b/admin/compiler/joomla_3/Helper.php index bd9407dd2..c1395b553 100644 --- a/admin/compiler/joomla_3/Helper.php +++ b/admin/compiler/joomla_3/Helper.php @@ -649,6 +649,31 @@ abstract class ###Component###Helper } return false; } + + /** + * Check if we are connected + * Thanks https://stackoverflow.com/a/4860432/1429677 + * + * @returns bool true on success + **/ + public static function isConnected() + { + // If example.com is down, then probably the whole internet is down, since IANA maintains the domain. Right? + $connected = @fsockopen("www.example.com", 80); + // website, port (try 80 or 443) + if ($connected) + { + //action when connected + $is_conn = true; + fclose($connected); + } + else + { + //action in connection failure + $is_conn = false; + } + return $is_conn; + } public static function mergeArrays($arrays) { diff --git a/admin/compiler/joomla_3/Helper_site.php b/admin/compiler/joomla_3/Helper_site.php index b309f3e79..be63428e1 100644 --- a/admin/compiler/joomla_3/Helper_site.php +++ b/admin/compiler/joomla_3/Helper_site.php @@ -644,6 +644,31 @@ abstract class ###Component###Helper } return false; } + + /** + * Check if we are connected + * Thanks https://stackoverflow.com/a/4860432/1429677 + * + * @returns bool true on success + **/ + public static function isConnected() + { + // If example.com is down, then probably the whole internet is down, since IANA maintains the domain. Right? + $connected = @fsockopen("www.example.com", 80); + // website, port (try 80 or 443) + if ($connected) + { + //action when connected + $is_conn = true; + fclose($connected); + } + else + { + //action in connection failure + $is_conn = false; + } + return $is_conn; + } public static function mergeArrays($arrays) { diff --git a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php b/admin/compiler/joomla_3/JViewLegacy_custom_admin.php index a12aa0f86..a160e5cc2 100644 --- a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php +++ b/admin/compiler/joomla_3/JViewLegacy_custom_admin.php @@ -54,7 +54,7 @@ class ###Component###View###SView### extends JViewLegacy * Prepares the document */ protected function setDocument() - {###CUSTOM_ADMIN_DOCUMENT_METADATA### ###CUSTOM_ADMIN_UIKIT_LOADER### ###CUSTOM_ADMIN_GOOGLECHART_LOADER### ###CUSTOM_ADMIN_FOOTABLE_LOADER### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_PHP### + {###CUSTOM_ADMIN_LIBRARIES_LOADER### ###CUSTOM_ADMIN_DOCUMENT_METADATA### ###CUSTOM_ADMIN_UIKIT_LOADER### ###CUSTOM_ADMIN_GOOGLECHART_LOADER### ###CUSTOM_ADMIN_FOOTABLE_LOADER### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_PHP### // add the document default css file $this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_###component###/assets/css/###sview###.css');###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS### } diff --git a/admin/compiler/joomla_3/JViewLegacy_edit.php b/admin/compiler/joomla_3/JViewLegacy_edit.php index 02c368cea..77adae305 100644 --- a/admin/compiler/joomla_3/JViewLegacy_edit.php +++ b/admin/compiler/joomla_3/JViewLegacy_edit.php @@ -117,11 +117,14 @@ class ###Component###View###View### extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###view###.css");###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS### - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_###component###/views/###view###/submitbutton.js"); ###DOCUMENT_CUSTOM_PHP### + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###view###.css");###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS### + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_###component###/views/###view###/submitbutton.js"); ###DOCUMENT_CUSTOM_PHP### JText::script('view not acceptable. Error'); } } diff --git a/admin/compiler/joomla_3/JViewLegacy_edit_site.php b/admin/compiler/joomla_3/JViewLegacy_edit_site.php index 349a82e43..57fdca976 100644 --- a/admin/compiler/joomla_3/JViewLegacy_edit_site.php +++ b/admin/compiler/joomla_3/JViewLegacy_edit_site.php @@ -121,16 +121,19 @@ class ###Component###View###View### extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT')); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT')); // we need this to fix the form display - $document->addStyleSheet(JURI::root()."administrator/templates/isis/css/template.css"); - $document->addScript(JURI::root()."administrator/templates/isis/js/template.js"); + $this->document->addStyleSheet(JURI::root()."administrator/templates/isis/css/template.css"); + $this->document->addScript(JURI::root()."administrator/templates/isis/js/template.js"); // the default style of this view - $document->addStyleSheet(JURI::root()."components/com_###component###/assets/css/###view###.css");###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS### + $this->document->addStyleSheet(JURI::root()."components/com_###component###/assets/css/###view###.css");###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS### // default javascript of this view - $document->addScript(JURI::root().$this->script); - $document->addScript(JURI::root(). "components/com_###component###/views/###view###/submitbutton.js"); ###DOCUMENT_CUSTOM_PHP### + $this->document->addScript(JURI::root().$this->script); + $this->document->addScript(JURI::root(). "components/com_###component###/views/###view###/submitbutton.js"); ###DOCUMENT_CUSTOM_PHP### JText::script('view not acceptable. Error'); } } diff --git a/admin/compiler/joomla_3/JViewLegacy_list.php b/admin/compiler/joomla_3/JViewLegacy_list.php index 72dd08795..5246cdbf0 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list.php +++ b/admin/compiler/joomla_3/JViewLegacy_list.php @@ -197,9 +197,12 @@ class ###Component###View###Views### extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_###COMPONENT###_###VIEWS###')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###views###.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_###COMPONENT###_###VIEWS###')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###views###.css"); } /** diff --git a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php b/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php index 17f7e54b0..64bb5a5d5 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php +++ b/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php @@ -54,7 +54,7 @@ class ###Component###View###SViews### extends JViewLegacy * Prepares the document */ protected function setDocument() - {###CUSTOM_ADMIN_UIKIT_LOADER### ###CUSTOM_ADMIN_GOOGLECHART_LOADER### ###CUSTOM_ADMIN_FOOTABLE_LOADER### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_PHP### + {###CUSTOM_ADMIN_LIBRARIES_LOADER### ###CUSTOM_ADMIN_UIKIT_LOADER### ###CUSTOM_ADMIN_GOOGLECHART_LOADER### ###CUSTOM_ADMIN_FOOTABLE_LOADER### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_PHP### // add the document default css file $this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_###component###/assets/css/###sviews###.css');###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS### } diff --git a/admin/compiler/joomla_3/JViewLegacy_list_site.php b/admin/compiler/joomla_3/JViewLegacy_list_site.php index c1e5c7823..6369af260 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list_site.php +++ b/admin/compiler/joomla_3/JViewLegacy_list_site.php @@ -52,7 +52,7 @@ class ###Component###View###SViews### extends JViewLegacy * Prepares the document */ protected function _prepareDocument() - {###SITE_UIKIT_LOADER### ###SITE_GOOGLECHART_LOADER### ###SITE_FOOTABLE_LOADER### ###SITE_DOCUMENT_METADATA### ###SITE_DOCUMENT_CUSTOM_PHP### + {###SITE_LIBRARIES_LOADER### ###SITE_UIKIT_LOADER### ###SITE_GOOGLECHART_LOADER### ###SITE_FOOTABLE_LOADER### ###SITE_DOCUMENT_METADATA### ###SITE_DOCUMENT_CUSTOM_PHP### // add the document default css file $this->document->addStyleSheet(JURI::root(true) .'/components/com_###component###/assets/css/###sview###.css');###SITE_DOCUMENT_CUSTOM_CSS### ###SITE_DOCUMENT_CUSTOM_JS### } diff --git a/admin/compiler/joomla_3/JViewLegacy_site.php b/admin/compiler/joomla_3/JViewLegacy_site.php index 851377023..3752acb8c 100644 --- a/admin/compiler/joomla_3/JViewLegacy_site.php +++ b/admin/compiler/joomla_3/JViewLegacy_site.php @@ -52,7 +52,7 @@ class ###Component###View###SView### extends JViewLegacy * Prepares the document */ protected function _prepareDocument() - {###SITE_UIKIT_LOADER### ###SITE_GOOGLECHART_LOADER### ###SITE_FOOTABLE_LOADER### ###SITE_DOCUMENT_METADATA### ###SITE_DOCUMENT_CUSTOM_PHP### + {###SITE_LIBRARIES_LOADER### ###SITE_UIKIT_LOADER### ###SITE_GOOGLECHART_LOADER### ###SITE_FOOTABLE_LOADER### ###SITE_DOCUMENT_METADATA### ###SITE_DOCUMENT_CUSTOM_PHP### // add the document default css file $this->document->addStyleSheet(JURI::root(true) .'/components/com_###component###/assets/css/###sview###.css');###SITE_DOCUMENT_CUSTOM_CSS### ###SITE_DOCUMENT_CUSTOM_JS### } diff --git a/admin/config.xml b/admin/config.xml index 119c3cf2f..7f1f7f100 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -47,95 +47,78 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + +
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - + + + + + + + + + + + + + +
readme = ''; } + // set lang now + $nowLang = $this->lang; + $this->lang = 'admin'; // dashboard methods $component->dashboard_tab = (isset($component->dashboard_tab) && ComponentbuilderHelper::checkJson($component->dashboard_tab)) ? json_decode($component->dashboard_tab,true):null; if (ComponentbuilderHelper::checkArray($component->dashboard_tab)) - { - $nowLang = $this->lang; - $this->lang = 'admin'; + { $component->dashboard_tab = array_map( function($array) { $array['html'] = $this->setDynamicValues($array['html']); return $array; @@ -1072,13 +1073,13 @@ class Get { // load the php for the dashboard model $component->php_dashboard_methods = $this->setDynamicValues(base64_decode($component->php_dashboard_methods)); - // reset back to nowlang - $this->lang = $nowLang; } else { $component->php_dashboard_methods = ''; } + // reset back to nowlang + $this->lang = $nowLang; // add the update FTP server sig if ($component->add_update_server == 1 && is_numeric($component->update_server_ftp) && $component->update_server_ftp > 0) @@ -1626,7 +1627,46 @@ class Get // fix alias to use in code $view->code = $this->uniqueCode(ComponentbuilderHelper::safeString($view->codename)); $view->Code = ComponentbuilderHelper::safeString($view->code, 'F'); - $view->CODE = ComponentbuilderHelper::safeString($view->code, 'U'); + $view->CODE = ComponentbuilderHelper::safeString($view->code, 'U'); + // load the library + if (!isset($this->libManager[$this->target])) + { + $this->libManager[$this->target] = array(); + } + if (!isset($this->libManager[$this->target][$view->code])) + { + $this->libManager[$this->target][$view->code] = array(); + } + // make sure json become array + if (ComponentbuilderHelper::checkJson($view->libraries)) + { + $view->libraries = json_decode($view->libraries, true); + } + // if we have an array add it + if (ComponentbuilderHelper::checkArray($view->libraries)) + { + foreach ($view->libraries as $library) + { + if (!isset($this->libManager[$this->target][$view->code][$library])) + { + if ($this->getLibrary((int) $library)) + { + $this->libManager[$this->target][$view->code][(int) $library] = true; + } + } + } + } + elseif (is_numeric($view->libraries) && !isset($this->libManager[$this->target][$view->code][(int) $view->libraries])) + { + if ($this->getLibrary((int) $view->libraries)) + { + $this->libManager[$this->target][$view->code][(int) $view->libraries] = true; + } + } + // setup template array + $this->templateData[$this->target][$view->code] = array(); + // setup template and layout data + $this->setTemplateAndLayoutData($view->default,$view->code); // insure the uikit components are loaded if (2 == $this->uikit || 1 == $this->uikit) { @@ -1658,10 +1698,6 @@ class Get $this->getModule[$this->target][$view->code] = true; } } - // setup template array - $this->templateData[$this->target][$view->code] = array(); - // setup template and layout data - $this->setTemplateAndLayoutData($view->default,$view->code); // set the main get data $main_get = $this->setGetData(array($view->main_get),$view->code); $view->main_get = $main_get[0]; @@ -1731,45 +1767,6 @@ class Get // } } } - // load the library - if (!isset($this->libManager[$this->target]) || !isset($this->libManager[$this->target][$view->code])) - { - // prep array - if (!isset($this->libManager[$this->target])) - { - $this->libManager[$this->target] = array(); - } - if (!isset($this->libManager[$this->target][$view->code])) - { - $this->libManager[$this->target][$view->code] = array(); - } - // make sure json become array - if (ComponentbuilderHelper::checkJson($view->libraries)) - { - $view->libraries = json_decode($view->libraries, true); - } - // if we have an array add it - if (ComponentbuilderHelper::checkArray($view->libraries)) - { - foreach ($view->libraries as $library) - { - if (!isset($this->libManager[$this->target][$view->code][$library])) - { - if ($this->getLibrary($library)) - { - $this->libManager[$this->target][$view->code][$library] = true; - } - } - } - } - elseif (is_numeric($view->libraries) && !isset($this->libManager[$this->target][$view->code][(int) $view->libraries])) - { - if ($this->getLibrary((int) $view->libraries)) - { - $this->libManager[$this->target][$view->code][(int) $view->libraries] = true; - } - } - } // add_Ajax for this view if (isset($view->add_php_ajax) && $view->add_php_ajax == 1) { @@ -2800,6 +2797,42 @@ class Get $php_view = $this->setDynamicValues(base64_decode($row->php_view)); } $contnent = $this->setDynamicValues(base64_decode($row->{$table})); + // load the library + if (!isset($this->libManager[$this->target])) + { + $this->libManager[$this->target] = array(); + } + if (!isset($this->libManager[$this->target][$view])) + { + $this->libManager[$this->target][$view] = array(); + } + // make sure json become array + if (ComponentbuilderHelper::checkJson($row->libraries)) + { + $row->libraries = json_decode($row->libraries, true); + } + // if we have an array add it + if (ComponentbuilderHelper::checkArray($row->libraries)) + { + foreach ($row->libraries as $library) + { + if (!isset($this->libManager[$this->target][$view][$library])) + { + if ($this->getLibrary((int) $library)) + { + $this->libManager[$this->target][$view][(int) $library] = true; + } + } + } + } + elseif (is_numeric($row->libraries) && !isset($this->libManager[$this->target][$view][(int) $row->libraries])) + { + if ($this->getLibrary((int) $row->libraries)) + { + $this->libManager[$this->target][$view][(int) $row->libraries] = true; + } + } + // load UIKIT if needed if (2 == $this->uikit || 1 == $this->uikit) { // set uikit to views @@ -2842,45 +2875,6 @@ class Get $this->getModule[$this->target][$view] = true; } } - // load the library - if (!isset($this->libManager[$this->target]) || !isset($this->libManager[$this->target][$view])) - { - // prep array - if (!isset($this->libManager[$this->target])) - { - $this->libManager[$this->target] = array(); - } - if (!isset($this->libManager[$this->target][$view])) - { - $this->libManager[$this->target][$view] = array(); - } - // make sure json become array - if (ComponentbuilderHelper::checkJson($row->libraries)) - { - $row->libraries = json_decode($row->libraries, true); - } - // if we have an array add it - if (ComponentbuilderHelper::checkArray($row->libraries)) - { - foreach ($row->libraries as $library) - { - if (!isset($this->libManager[$this->target][$view][$library])) - { - if ($this->getLibrary($library)) - { - $this->libManager[$this->target][$view][$library] = true; - } - } - } - } - elseif (is_numeric($row->libraries) && !isset($this->libManager[$this->target][$view][(int) $row->libraries])) - { - if ($this->getLibrary((int) $row->libraries)) - { - $this->libManager[$this->target][$view][(int) $row->libraries] = true; - } - } - } return array('id' => $row->id, 'html' => $contnent, 'php_view' => $php_view); } } @@ -2897,6 +2891,46 @@ class Get */ protected function getLibrary($id) { + + // check if the lib has already been set + if (!isset($this->libraries[$id])) + { + // make sure we should continue and that the lib is not already bein loaded + switch ($id) + { + case 1: // No Library + return false; + break; + case 3: // Uikit v3 + if (2 == $this->uikit || 3 == $this->uikit) + { + // already being loaded + $this->libraries[$id] = false; + } + break; + case 4: // Uikit v2 + if (2 == $this->uikit || 1 == $this->uikit) + { + // already being loaded + $this->libraries[$id] = false; + } + break; + case 5: // FooTable v2 + if (!isset($this->footableVersion) || 2 == $this->footableVersion) + { + // already being loaded + $this->libraries[$id] = false; + } + break; + case 6: // FooTable v3 + if (3 == $this->footableVersion) + { + // already being loaded + $this->libraries[$id] = false; + } + break; + } + } // check if the lib has already been set if (!isset($this->libraries[$id])) { @@ -2915,7 +2949,6 @@ class Get 'c.addfiles', 'c.addfolders', 'c.addurls', - 'a.php_preparedocument', 'a.php_setdocument' ), array( @@ -2928,7 +2961,6 @@ class Get 'addfiles', 'addfolders', 'addurls', - 'php_preparedocument', 'php_setdocument' ) ) @@ -2945,36 +2977,48 @@ class Get // Load the results as a list of stdClass objects $library = $this->db->loadObject(); + // check if this lib uses build-in behaviour + if ($library->how == 4) + { + // fall back on build-in features + $buildin = array(3 => array('uikit' => 3), 4 => array('uikit' => 1), 5 => array('footableVersion' => 2, 'footable' => true), 6 => array('footableVersion' => 3, 'footable' => true)); + if (isset($buildin[$library->id]) && ComponentbuilderHelper::checkArray($buildin[$library->id])) + { + // set the lib switch + foreach ($buildin[$library->id] as $lib => $val) + { + $this->{$lib} = $val; + } + // since we are falling back on build-in feature + $library->how = 0; + } + else + { + // since we did not find build in behaviour we must load always. + $library->how = 1; + } + } // check if this lib has dynamic behaviour if ($library->how > 0) { - // unset original value - unset($library->addconfig); - // set the addfolders data $library->addfolders = (isset($library->addfolders) && ComponentbuilderHelper::checkJson($library->addfolders)) ? json_decode($library->addfolders,true):null; if (ComponentbuilderHelper::checkArray($library->addfolders)) { $library->folders = array_values($library->addfolders); } - unset($library->addfolders); - // set the addfiles data $library->addfiles = (isset($library->addfiles) && ComponentbuilderHelper::checkJson($library->addfiles)) ? json_decode($library->addfiles,true):null; if (ComponentbuilderHelper::checkArray($library->addfiles)) { $library->files = array_values($library->addfiles); } - unset($library->addfiles); - // set the addurls data $library->addurls = (isset($library->addurls) && ComponentbuilderHelper::checkJson($library->addurls)) ? json_decode($library->addurls,true):null; if (ComponentbuilderHelper::checkArray($library->addurls)) { $library->urls = array_values($library->addurls); - } - unset($library->addurls); - + } // add config fields only if needed if ($library->how > 1) { @@ -2990,18 +3034,13 @@ class Get }, array_values($library->addconfig)); } } - // if this lib is controlled by custom script if (3 == $library->how) { // set Needed PHP - $phpMethods = array('preparedocument', 'setdocument'); - foreach ($phpMethods as $method) + if (isset($library->php_setdocument) && ComponentbuilderHelper::checkString($library->php_setdocument)) { - if (isset($library->{'php_'.$method}) && ComponentbuilderHelper::checkString($library->{'php_'.$method})) - { - $library->{$method} = $this->setDynamicValues(base64_decode($library->{'php_'.$method})); - } + $library->document = $this->setDynamicValues(base64_decode($library->php_setdocument)); } } // if this lib is controlled by conditions @@ -3014,14 +3053,14 @@ class Get $library->conditions = array_values($library->addconditions); } } - // if this lib is always being added - else - { - - } - unset($library->php_preparedocument); unset($library->php_setdocument); unset($library->addconditions); + unset($library->addconfig); + unset($library->addfolders); + unset($library->addfiles); + unset($library->addurls); + // load to global lib + $this->libraries[$id] = $library; } else { diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php index 66d48de71..790aba427 100644 --- a/admin/helpers/compiler/b_Structure.php +++ b/admin/helpers/compiler/b_Structure.php @@ -336,6 +336,8 @@ class Structure extends Get { return false; } + // load the libraries files/folders and url's + $this->setLibaries(); // set all static folders and files if (!$this->setStatic()) { @@ -369,6 +371,122 @@ class Structure extends Get return ''; } + /** + * Build the Libraries files, folders, url's and config + * + * @return void + * + */ + private function setLibaries() + { + if (ComponentbuilderHelper::checkArray($this->libraries)) + { + foreach($this->libraries as $id => &$library) + { + if (ComponentbuilderHelper::checkObject($library)) + { + // check if this lib has files + if (isset($library->files) && ComponentbuilderHelper::checkArray($library->files)) + { + // add to component files + foreach ($library->files as $file) + { + $this->componentData->files[] = $file; + } + } + // check if this lib has folders + if (isset($library->folders) && ComponentbuilderHelper::checkArray($library->folders)) + { + // add to component folders + foreach ($library->folders as $folder) + { + $this->componentData->folders[] = $folder; + } + } + // check if this lib has urls + if (isset($library->urls) && ComponentbuilderHelper::checkArray($library->urls)) + { + // build media folder path + $mediaPath = '/media/' . strtolower( preg_replace('/\s+/', '-', ComponentbuilderHelper::safeString($library->name, 'filename', ' ', false))); + // create media path if not set + if (!JFolder::exists( $this->componentPath . $mediaPath)) + { + JFolder::create($this->componentPath . $mediaPath); + // count the folder created + $this->folderCount++; + $this->indexHTML($mediaPath); + } + // add to component urls + foreach ($library->urls as $n => &$url) + { + if (isset($url['type']) && $url['type'] > 1 && isset($url['url']) && ComponentbuilderHelper::checkString($url['url'])) + { + $fileName = basename($url['url']); + // get the file contents + $data = ComponentbuilderHelper::getFileContents($url['url']); + // build sub path + if (strpos($fileName, '.js') !== false) + { + $path = '/js'; + } + elseif (strpos($fileName, '.css') !== false) + { + $path = '/css'; + } + else + { + $path = ''; + } + // create sub media path if not set + if (!JFolder::exists($this->componentPath . $mediaPath . $path)) + { + JFolder::create($this->componentPath . $mediaPath . $path); + // count the folder created + $this->folderCount++; + $this->indexHTML($mediaPath . $path); + } + // set the path to library file + $url['path'] = $mediaPath . $path . '/' . $fileName; // we need this for later + // set full path + $path = $this->componentPath . $url['path']; + // write data to path + $this->writeFile($path, $data); + // count the file created + $this->fileCount++; + } + } + } + // if config fields are found load into component config (avoiding dublicates) + if (isset($library->how) && $library->how > 1 && isset($library->config) && ComponentbuilderHelper::checkArray($library->config)) + { + foreach ($library->config as $cofig) + { + $found = array_filter($this->componentData->config, function($item) use($cofig) { + return $item['field'] == $cofig['field']; + }); + // set the config data if not found + if (!ComponentbuilderHelper::checkArray($found)) + { + $this->componentData->config[] = $cofig; + } + } + } + } + } + } + } + + /** + * Write data to file + * + * @return bool true on success + * + */ + public function writeFile($path, $data) + { + return ComponentbuilderHelper::writeFile($path, $data); + } + /** * Build the Initial Folders * @@ -926,25 +1044,25 @@ class Structure extends Get if (2 == $this->uikit || 1 == $this->uikit) { // move the UIKIT Folder into place - $uikit = array( 'folder' => 'uikit', 'path' => 'media', 'rename' => 0); + $uikit = array( 'folder' => 'uikit-v2', 'path' => 'media', 'rename' => 0); $this->componentData->folders[] = $uikit; } if (2 == $this->uikit || 3 == $this->uikit) { // move the UIKIT-3 Folder into place - $uikit = array( 'folder' => 'uikit-3', 'path' => 'media', 'rename' => 0); + $uikit = array( 'folder' => 'uikit-v3', 'path' => 'media', 'rename' => 0); $this->componentData->folders[] = $uikit; } if ($this->footable && (!isset($this->footableVersion) || 2 == $this->footableVersion)) { // move the footable folder into place - $footable = array( 'folder' => 'footable2', 'path' => 'media/footable', 'rename' => 1); + $footable = array( 'folder' => 'footable-v2', 'path' => 'media', 'rename' => 0); $this->componentData->folders[] = $footable; } elseif ($this->footable && 3 == $this->footableVersion) { // move the footable folder into place - $footable = array( 'folder' => 'footable3', 'path' => 'media/footable', 'rename' => 1); + $footable = array( 'folder' => 'footable-v3', 'path' => 'media', 'rename' => 0); $this->componentData->folders[] = $footable; } diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php index 43ba892a0..d7ec49808 100644 --- a/admin/helpers/compiler/c_Fields.php +++ b/admin/helpers/compiler/c_Fields.php @@ -1311,7 +1311,7 @@ class Fields extends Structure public function buildSiteFieldData($view, $field, $set, $type) { $decode = array('json','base64','basic_encryption','advance_encryption'); - $uikit = array('textarea','editor'); + $textareas = array('textarea','editor'); if (isset($this->siteFields[$view][$field]) && ComponentbuilderHelper::checkArray($this->siteFields[$view][$field])) { foreach ($this->siteFields[$view][$field] as $code => $array) @@ -1322,10 +1322,15 @@ class Fields extends Structure $this->siteFieldData['decode'][$array['site']][$code][$array['as']][$array['key']] = array('decode' => $set, 'type' => $type); } // set the uikit checker - if ((2 == $this->uikit || 1 == $this->uikit) && in_array($type, $uikit)) + if ((2 == $this->uikit || 1 == $this->uikit) && in_array($type, $textareas)) { $this->siteFieldData['uikit'][$array['site']][$code][$array['as']][$array['key']] = $array; } + // set the textareas checker + if (in_array($type, $textareas)) + { + $this->siteFieldData['textareas'][$array['site']][$code][$array['as']][$array['key']] = $array; + } } } } @@ -2097,7 +2102,7 @@ class Fields extends Structure // build the search values if (isset($field['search']) && $field['search'] == 1) { - $_list = (!isset($field['list'])) ? $field['list'] : 0; + $_list = (isset($field['list'])) ? $field['list'] : 0; $this->searchBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'custom' => $custom, 'list' => $_list); } // build the filter values diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 3e6b844fe..c198dc7dc 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -184,6 +184,8 @@ class Interpretation extends Fields * @var array */ protected $hasIdRequest = array(); + + protected $libwarning = array(); /** * Constructor @@ -1650,10 +1652,11 @@ class Interpretation extends Fields return $fieldDecode; } - public function setCustomViewFieldUikitChecker(&$get, $checker, $string, $code, $tab = '') + public function setCustomViewFieldonContentPrepareChecker(&$get, $checker, $string, $code, $tab = '') { - $fieldUikit = ''; + $fieldPrepare = ''; $runplugins = false; + $context = 'com_'.$this->fileContentStatic['###component###'].'.'.$code; foreach ($checker as $field => $array) { if (strpos($get['selection']['select'], $field) !== false) @@ -1664,8 +1667,26 @@ class Interpretation extends Fields $runplugins .= PHP_EOL.$tab."\tJPluginHelper::importPlugin('content');"; $runplugins .= PHP_EOL.$tab."\t".'$this->_dispatcher = JEventDispatcher::getInstance();'; } - $fieldUikit .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Make sure the content prepare plugins fire on ".$field; - $fieldUikit .= PHP_EOL."\t".$tab."\t".'$this->_dispatcher->trigger("onContentPrepare",array($this->_context,&'.$string.'->'.$field.',$item->params));'; + $fieldPrepare .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Make sure the content prepare plugins fire on ".$field; + $fieldPrepare .= PHP_EOL."\t".$tab."\t\$_".$field." = new stdClass();"; + $fieldPrepare .= PHP_EOL."\t".$tab."\t\$_".$field.'->text =& '.$string.'->'.$field.'; //'.$this->setLine(__LINE__).' value must be in text'; + $fieldPrepare .= PHP_EOL."\t".$tab."\t//".$this->setLine(__LINE__)." Since all values are now in text (Joomla Limitation), we also add the field name (".$field.") to context"; + $fieldPrepare .= PHP_EOL."\t".$tab."\t".'$this->_dispatcher->trigger("onContentPrepare",array(\''.$context.'.'.$field.'\',&$_'.$field.',&$this->params));'; // we can improve the params later (TODO) + } + } + // load dispatcher + $this->JEventDispatcher = array('###DISPATCHER###' => ($runplugins?:'')); + // return content prepare fix + return $fieldPrepare; + } + + public function setCustomViewFieldUikitChecker(&$get, $checker, $string, $code, $tab = '') + { + $fieldUikit = ''; + foreach ($checker as $field => $array) + { + if (strpos($get['selection']['select'], $field) !== false) + { // only load for uikit version 2 (TODO) we may need to add another check here if (2 == $this->uikit || 1 == $this->uikit) { @@ -1674,8 +1695,6 @@ class Interpretation extends Fields } } } - // load dispatcher - $this->JEventDispatcher = array('###DISPATCHER###' => ($runplugins?:'')); // return UIKIT fix return $fieldUikit; } @@ -2158,6 +2177,16 @@ class Interpretation extends Fields $getItem .= $this->setCustomViewFieldDecodeFilter($main_get,$decodeFilter,'$data','$data',$code,$tab); } } + + if (isset($this->siteFieldData['textareas'][$code][$main_get['key']][$main_get['as']])) + { + $contentprepareChecker = $this->siteFieldData['textareas'][$code][$main_get['key']][$main_get['as']]; + if (ComponentbuilderHelper::checkArray($contentprepareChecker)) + { + // set contentprepare checkers on needed fields + $getItem .= $this->setCustomViewFieldonContentPrepareChecker($main_get, $contentprepareChecker, '$data', $code, $tab); + } + } if (isset($this->siteFieldData['uikit'][$code][$main_get['key']][$main_get['as']])) { @@ -2555,12 +2584,18 @@ class Interpretation extends Fields { $uikitChecker = $this->siteFieldData['uikit'][$default['code']][$get['key']][$default['as']]; } + // set contnetprepare on needed fields + if (isset($this->siteFieldData['textareas'][$default['code']][$get['key']][$default['as']])) + { + $contentprepareChecker = $this->siteFieldData['textareas'][$default['code']][$get['key']][$default['as']]; + } // set joined values $placeholders = array('###TAB###' => "\t\t", '###STRING###' => '$item'); $joinedChecker = (isset($this->otherJoin[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherJoin[$this->target][$default['code']][$default['as']])) ? $this->otherJoin[$this->target][$default['code']][$default['as']] : ''; if ( (isset($decodeChecker) && ComponentbuilderHelper::checkArray($decodeChecker)) || (isset($uikitChecker) && ComponentbuilderHelper::checkArray($uikitChecker)) || (isset($decodeFilter) && ComponentbuilderHelper::checkArray($decodeFilter)) || + (isset($contentprepareChecker) && ComponentbuilderHelper::checkArray($contentprepareChecker)) || ComponentbuilderHelper::checkArray($joinedChecker)) { $decoder = ''; @@ -2574,6 +2609,11 @@ class Interpretation extends Fields { $decoder_filter = $this->setCustomViewFieldDecodeFilter($get,$decodeFilter,'$item','$items[$nr]',$default['code'],"\t\t"); } + $contnetprepare = ''; + if (isset($contentprepareChecker) && ComponentbuilderHelper::checkArray($contentprepareChecker)) + { + $contnetprepare = $this->setCustomViewFieldonContentPrepareChecker($get,$contentprepareChecker,'$item',$default['code'],"\t\t"); + } $uikit = ''; if (isset($uikitChecker) && ComponentbuilderHelper::checkArray($uikitChecker)) { @@ -2587,7 +2627,7 @@ class Interpretation extends Fields $joine .= $this->setPlaceholders($joinedString, $placeholders); } } - if (ComponentbuilderHelper::checkString($decoder) || ComponentbuilderHelper::checkString($uikit) || ComponentbuilderHelper::checkString($decoder_filter) || ComponentbuilderHelper::checkString($joine)) + if (ComponentbuilderHelper::checkString($decoder) || ComponentbuilderHelper::checkString($contnetprepare) || ComponentbuilderHelper::checkString($uikit) || ComponentbuilderHelper::checkString($decoder_filter) || ComponentbuilderHelper::checkString($joine)) { $methods .= PHP_EOL."\t\t\t\$items = \$db->loadObjectList();"; $methods .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Convert the parameter fields into objects."; @@ -2601,6 +2641,10 @@ class Interpretation extends Fields { $methods .= $decoder_filter; } + if (ComponentbuilderHelper::checkString($contnetprepare)) + { + $methods .= $contnetprepare; + } if (ComponentbuilderHelper::checkString($uikit)) { $methods .= $uikit; @@ -2738,7 +2782,7 @@ class Interpretation extends Fields * @param $get * @param $code * @return string - */ + */ public function setCustomViewGetItems(&$get, $code) { $getItem = ''; @@ -2747,7 +2791,7 @@ class Interpretation extends Fields $Component = $this->fileContentStatic['###Component###']; if (ComponentbuilderHelper::checkObject($get)) { - $getItem .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Convert the parameter fields into objects."; + $getItem .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Insure all item fields are adapted where needed."; $getItem .= PHP_EOL."\t\tif (".$Component."Helper::checkArray(\$items))"; $getItem .= PHP_EOL."\t\t{"; $getItem .= "###DISPATCHER###"; @@ -2778,6 +2822,15 @@ class Interpretation extends Fields $getItem .= $this->setCustomViewFieldDecodeFilter($main_get,$decodeFilter,"\$item",'$items[$nr]',$code,"\t\t"); } } + if (isset($this->siteFieldData['textareas'][$code][$main_get['key']][$main_get['as']])) + { + $contentprepareChecker = $this->siteFieldData['textareas'][$code][$main_get['key']][$main_get['as']]; + if (ComponentbuilderHelper::checkArray($contentprepareChecker)) + { + // set contentprepare checkers on needed fields + $getItem .= $this->setCustomViewFieldonContentPrepareChecker($main_get,$contentprepareChecker,"\$item",$code,"\t\t"); + } + } if (isset($this->siteFieldData['uikit'][$code][$main_get['key']][$main_get['as']])) { $uikitChecker = $this->siteFieldData['uikit'][$code][$main_get['key']][$main_get['as']]; @@ -2923,6 +2976,10 @@ class Interpretation extends Fields { // ensure correct target is set $TARGET = ComponentbuilderHelper::safeString($this->target,'U'); + + // set libraries ###'.$TARGET.'_LIBRARIES_LOADER### + $this->fileContentDynamic[$view['settings']->code]['###'.$TARGET.'_LIBRARIES_LOADER###'] = $this->setLibrariesLoader($view); + // set uikit ###'.$TARGET.'_UIKIT_LOADER### $this->fileContentDynamic[$view['settings']->code]['###'.$TARGET.'_UIKIT_LOADER###'] = $this->setUikitLoader($view); @@ -3285,7 +3342,7 @@ class Interpretation extends Fields { if (isset($this->footableScripts[$this->target][$view['settings']->code]) && $this->footableScripts[$this->target][$view['settings']->code]) { - return $this->setFootableScripts(false,'$this->document'); + return $this->setFootableScripts(false); } return ''; } @@ -3419,13 +3476,11 @@ class Interpretation extends Fields } return ''; } - - public function setUikitLoader(&$view) + + public function setLibrariesLoader($view) { - // reset buktes + // reset bucket $setter = ''; - $loader['css'] = array(); - $loader['js'] = array(); // allways load these in $setter .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." always make sure jquery is loaded."; $setter .= PHP_EOL."\t\tJHtml::_('jquery.framework');"; @@ -3440,6 +3495,229 @@ class Interpretation extends Fields } $setter .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Initialize the header checker."; $setter .= PHP_EOL."\t\t\$HeaderCheck = new ".$this->fileContentStatic['###component###']."HeaderCheck;"; + // check if this view should get libraries + if (isset($this->libManager[$this->target][$view['settings']->code]) + && ComponentbuilderHelper::checkArray($this->libManager[$this->target][$view['settings']->code])) + { + foreach ($this->libManager[$this->target][$view['settings']->code] as $id => $true) + { + if (isset($this->libraries[$id]) && ComponentbuilderHelper::checkObject($this->libraries[$id]) + && isset($this->libraries[$id]->document) && ComponentbuilderHelper::checkString($this->libraries[$id]->document)) + { + $setter .= PHP_EOL.PHP_EOL.$this->setPlaceholders( + str_replace('$document->', '$this->document->', $this->libraries[$id]->document), + $this->placeholders); + } + elseif (isset($this->libraries[$id]) && ComponentbuilderHelper::checkObject($this->libraries[$id]) + && isset($this->libraries[$id]->how)) + { + $setter .= $this->setLibraryDocument($id); + } + } + } + return $setter; + } + + protected function setLibraryDocument($id) + { + if (2 == $this->libraries[$id]->how && isset($this->libraries[$id]->conditions) + && ComponentbuilderHelper::checkArray($this->libraries[$id]->conditions)) + { + // build document with the conditions values + $this->setLibraryDocConditions($id, $this->setLibraryScripts($id, false)); + } + elseif (1 == $this->libraries[$id]->how) + { + // build document to allways add all files and urls + $this->setLibraryScripts($id); + } + // check if the document was build + if (isset($this->libraries[$id]->document) && ComponentbuilderHelper::checkString($this->libraries[$id]->document)) + { + return PHP_EOL.PHP_EOL.$this->libraries[$id]->document; + } + return ''; + } + + protected function setLibraryDocConditions($id, $scripts) + { + $document = ''; + // Start script builder for library files + if (!isset($this->libwarning[$id])) + { + $this->app->enqueueMessage(JText::sprintf('The conditional script builder for %s is not ready, will only be ready in the next update to v2.6.7', $this->libraries[$id]->name), 'warning'); + // set the warning only once + $this->libwarning[$id] = true; + } + // if there was any code added to document then set globaly + if (ComponentbuilderHelper::checkString($document)) + { + $this->libraries[$id]->document = $document; + } + } + + protected function setLibraryScripts($id, $buildDoc = true) + { + $scripts = array(); + // load the urls if found + if (isset($this->libraries[$id]->urls) && ComponentbuilderHelper::checkArray($this->libraries[$id]->urls)) + { + // set all the files + foreach ($this->libraries[$id]->urls as $url) + { + // if local path is set, then use it first + if (isset($url['path'])) + { + // update the root path + $path = $this->getScriptRootPath($url['path']); + // load document script + $scripts[md5($url['path'])] = $this->setIncludeLibScript($path); + // load url also if not building document + if (!$buildDoc) + { + // load document script + $scripts[md5($url['url'])] = $this->setIncludeLibScript($url['url'], false); + } + } + else + { + // load document script + $scripts[md5($url['url'])] = $this->setIncludeLibScript($url['url'], false); + } + } + } + // load the local files if found + if (isset($this->libraries[$id]->files) && ComponentbuilderHelper::checkArray($this->libraries[$id]->files)) + { + // set all the files + foreach ($this->libraries[$id]->files as $file) + { + $path = '/'.trim($file['path'], '/'); + // check if path has new file name (has extetion) + $pathInfo = pathinfo($path); + // update the root path + $_path = $this->getScriptRootPath($path); + if (isset($pathInfo['extension']) && $pathInfo['extension']) + { + // load document script + $scripts[md5($path)] = $this->setIncludeLibScript($_path, false, $pathInfo); + } + else + { + // load document script + $scripts[md5($path.'/'.trim($file['file'],'/'))] = $this->setIncludeLibScript($_path.'/'.trim($file['file'],'/')); + } + } + } + // load the local folders if found + if (isset($this->libraries[$id]->folders) && ComponentbuilderHelper::checkArray($this->libraries[$id]->folders)) + { + // get all the file paths + foreach ($this->libraries[$id]->folders as $folder) + { + if (isset($folder['path']) && isset($folder['folder'])) + { + $path = '/'.trim($folder['path'], '/'); + if (isset($folder['rename']) && 1 == $folder['rename']) + { + if ($_paths = ComponentbuilderHelper::getAllFilePaths($this->componentPath.$path)) + { + $files[$path] = $_paths; + } + } + else + { + $path = $path.'/'.trim($folder['folder'], '/'); + if ($_paths = ComponentbuilderHelper::getAllFilePaths($this->componentPath.$path)) + { + $files[$path] = $_paths; + } + } + } + } + // now load the script + foreach ($files as $root => $paths) + { + // update the root path + $_root = $this->getScriptRootPath($root); + // load per path + foreach($paths as $path) + { + $scripts[md5($root.'/'.trim($path, '/'))] = $this->setIncludeLibScript($_root.'/'.trim($path, '/')); + } + } + } + // if there was any code added to document then set globaly + if ($buildDoc && ComponentbuilderHelper::checkArray($scripts)) + { + $this->libraries[$id]->document = "\t\t//".$this->setLine(__LINE__)." always load these files.".PHP_EOL."\t\t".implode(PHP_EOL."\t\t", $scripts); + // success + return true; + } + elseif (ComponentbuilderHelper::checkArray($scripts)) + { + return $scripts; + } + return false; + } + + protected function setIncludeLibScript($path, $local = true, $pathInfo = false) + { + // insure we have the path info + if (!$pathInfo) + { + $pathInfo = pathinfo($path); + } + // set the local string + $JURI = ''; + if ($local) + { + $JURI = 'JURI::root(true) . '; + } + // use the path info to build the script + if (isset($pathInfo['extension']) && $pathInfo['extension']) + { + switch($pathInfo['extension']) + { + case 'js': + return '$this->document->addScript('.$JURI.'"'.$path.'");'; + break; + case 'css': + case 'less': + return '$this->document->addStyleSheet('.$JURI.'"'.$path.'");'; + break; + case 'php': + if (strpos($path, 'http') === false) + { + return 'require_once("'.$path.'");'; + } + break; + } + } + return ''; + } + + protected function getScriptRootPath($root) + { + if (strpos($root, '/media/') !== false && strpos($root, '/admin/') === false && strpos($root, '/site/') === false) + { + return str_replace('/media/', '/media/com_'.$this->fileContentStatic['###component###'] .'/', $root); + } + elseif (strpos($root, '/media/') === false && strpos($root, '/admin/') !== false && strpos($root, '/site/') === false) + { + return str_replace('/admin/', '/administrator/components/com_'.$this->fileContentStatic['###component###'] .'/', $root); + } + elseif (strpos($root, '/media/') === false && strpos($root, '/admin/') === false && strpos($root, '/site/') !== false) + { + return str_replace('/site/', '/components/com_'.$this->fileContentStatic['###component###'] .'/', $root); + } + return $root; + } + + public function setUikitLoader(&$view) + { + // reset setter + $setter = ''; // load the defaults needed if ($this->uikit > 0) { @@ -3468,12 +3746,12 @@ class Interpretation extends Fields $setter .= PHP_EOL.PHP_EOL.$tabV."\t\t//".$this->setLine(__LINE__)." The uikit css."; $setter .= PHP_EOL.$tabV."\t\tif ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; $setter .= PHP_EOL.$tabV."\t\t{"; - $setter .= PHP_EOL.$tabV."\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/uikit'.\$style.\$size.'.css');"; + $setter .= PHP_EOL.$tabV."\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit-v2/css/uikit'.\$style.\$size.'.css');"; $setter .= PHP_EOL.$tabV."\t\t}"; $setter .= PHP_EOL.$tabV."\t\t//".$this->setLine(__LINE__)." The uikit js."; $setter .= PHP_EOL.$tabV."\t\tif ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; $setter .= PHP_EOL.$tabV."\t\t{"; - $setter .= PHP_EOL.$tabV."\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/uikit'.\$size.'.js');"; + $setter .= PHP_EOL.$tabV."\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit-v2/js/uikit'.\$size.'.js');"; $setter .= PHP_EOL.$tabV."\t\t}"; } // load the components need @@ -3518,16 +3796,16 @@ class Interpretation extends Fields $setter .= PHP_EOL.$tabV."\t\t\t\tforeach (".$this->fileContentStatic['###Component###']."Helper::\$uk_components[\$class] as \$name)"; $setter .= PHP_EOL.$tabV."\t\t\t\t{"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t//".$this->setLine(__LINE__)." check if the CSS file exists."; - $setter .= PHP_EOL.$tabV."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css'))"; + $setter .= PHP_EOL.$tabV."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit-v2/css/components/'.\$name.\$style.\$size.'.css'))"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t{"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the css."; - $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css');"; + $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit-v2/css/components/'.\$name.\$style.\$size.'.css');"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t}"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t//".$this->setLine(__LINE__)." check if the JavaScript file exists."; - $setter .= PHP_EOL.$tabV."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js'))"; + $setter .= PHP_EOL.$tabV."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit-v2/js/components/'.\$name.\$size.'.js'))"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t{"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the js."; - $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js', 'text/javascript', true);"; + $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit-v2/js/components/'.\$name.\$size.'.js', 'text/javascript', true);"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t}"; $setter .= PHP_EOL.$tabV."\t\t\t\t}"; $setter .= PHP_EOL.$tabV."\t\t\t}"; @@ -3547,16 +3825,16 @@ class Interpretation extends Fields $setter .= PHP_EOL.$tabV."\t\t\t\tforeach (".$this->fileContentStatic['###Component###']."Helper::\$uk_components[\$class] as \$name)"; $setter .= PHP_EOL.$tabV."\t\t\t\t{"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t//".$this->setLine(__LINE__)." check if the CSS file exists."; - $setter .= PHP_EOL.$tabV."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css'))"; + $setter .= PHP_EOL.$tabV."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit-v2/css/components/'.\$name.\$style.\$size.'.css'))"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t{"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the css."; - $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/css/components/'.\$name.\$style.\$size.'.css');"; + $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit-v2/css/components/'.\$name.\$style.\$size.'.css');"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t}"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t//".$this->setLine(__LINE__)." check if the JavaScript file exists."; - $setter .= PHP_EOL.$tabV."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js'))"; + $setter .= PHP_EOL.$tabV."\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_".$this->fileContentStatic['###component###']."/uikit-v2/js/components/'.\$name.\$size.'.js'))"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t{"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t//".$this->setLine(__LINE__)." load the js."; - $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit/js/components/'.\$name.\$size.'.js', 'text/javascript', true);"; + $setter .= PHP_EOL.$tabV."\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit-v2/js/components/'.\$name.\$size.'.js', 'text/javascript', true);"; $setter .= PHP_EOL.$tabV."\t\t\t\t\t}"; $setter .= PHP_EOL.$tabV."\t\t\t\t}"; $setter .= PHP_EOL.$tabV."\t\t\t}"; @@ -3576,12 +3854,12 @@ class Interpretation extends Fields $setter .= PHP_EOL.$tabV."\t\t//".$this->setLine(__LINE__)." The uikit css."; $setter .= PHP_EOL.$tabV."\t\tif ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; $setter .= PHP_EOL.$tabV."\t\t{"; - $setter .= PHP_EOL.$tabV."\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit-3/css/uikit'.\$size.'.css');"; + $setter .= PHP_EOL.$tabV."\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit-v3/css/uikit'.\$size.'.css');"; $setter .= PHP_EOL.$tabV."\t\t}"; $setter .= PHP_EOL.$tabV."\t\t//".$this->setLine(__LINE__)." The uikit js."; $setter .= PHP_EOL.$tabV."\t\tif ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; $setter .= PHP_EOL.$tabV."\t\t{"; - $setter .= PHP_EOL.$tabV."\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit-3/js/uikit'.\$size.'.js');"; + $setter .= PHP_EOL.$tabV."\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_".$this->fileContentStatic['###component###']."/uikit-v3/js/uikit'.\$size.'.js');"; $setter .= PHP_EOL.$tabV."\t\t}"; if (2 == $this->uikit) { @@ -3808,11 +4086,6 @@ class Interpretation extends Fields } } - public function writeFile($path, $data) - { - return ComponentbuilderHelper::writeFile($path, $data); - } - public function setMethodGetItem(&$view) { $script = ''; @@ -5683,11 +5956,11 @@ class Interpretation extends Fields { foreach ($this->componentData->custom_admin_views as $custom_admin_view) { - if (ComponentbuilderHelper::checkArray($custom_admin_view['adminviews'])) + if (isset($custom_admin_view['adminviews']) && ComponentbuilderHelper::checkArray($custom_admin_view['adminviews'])) { foreach ($custom_admin_view['adminviews'] as $adminview) { - if ($view['adminview'] == $adminview) + if (isset($view['adminview']) && $view['adminview'] == $adminview) { // set the needed keys $setId = false; @@ -6884,48 +7157,47 @@ class Interpretation extends Fields /** * @param bool $init - * @param string $document * @return string - */ - public function setFootableScripts($init = true, $document = '$document') + */ + public function setFootableScripts($init = true) { if (!isset($this->footableVersion) || 2 == $this->footableVersion) // loading version 2 { $foo = PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Add the CSS for Footable."; - $foo .= PHP_EOL."\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.core.min.css');"; + $foo .= PHP_EOL."\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable-v2/css/footable.core.min.css');"; $foo .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Use the Metro Style"; $foo .= PHP_EOL."\t\tif (!isset(\$this->fooTableStyle) || 0 == \$this->fooTableStyle)"; $foo .= PHP_EOL."\t\t{"; - $foo .= PHP_EOL."\t\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.metro.min.css');"; + $foo .= PHP_EOL."\t\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable-v2/css/footable.metro.min.css');"; $foo .= PHP_EOL."\t\t}"; $foo .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Use the Legacy Style."; $foo .= PHP_EOL."\t\telseif (isset(\$this->fooTableStyle) && 1 == \$this->fooTableStyle)"; $foo .= PHP_EOL."\t\t{"; - $foo .= PHP_EOL."\t\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.standalone.min.css');"; + $foo .= PHP_EOL."\t\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable-v2/css/footable.standalone.min.css');"; $foo .= PHP_EOL."\t\t}"; $foo .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Add the JavaScript for Footable"; - $foo .= PHP_EOL."\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.js');"; - $foo .= PHP_EOL."\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.sort.js');"; - $foo .= PHP_EOL."\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.filter.js');"; - $foo .= PHP_EOL."\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.paginate.js');"; + $foo .= PHP_EOL."\t\t\$this->document->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable-v2/js/footable.js');"; + $foo .= PHP_EOL."\t\t\$this->document->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable-v2/js/footable.sort.js');"; + $foo .= PHP_EOL."\t\t\$this->document->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable-v2/js/footable.filter.js');"; + $foo .= PHP_EOL."\t\t\$this->document->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable-v2/js/footable.paginate.js');"; if ($init) { $foo .= PHP_EOL.PHP_EOL."\t\t".'$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('."'.footable'".').footable(); }); jQuery('."'.nav-tabs'".').on('."'click'".', '."'li'".', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery('."'.footable'".').trigger('."'footable_resize'".'); }";'; - $foo .= PHP_EOL."\t\t\$document->addScriptDeclaration(\$footable);".PHP_EOL; + $foo .= PHP_EOL."\t\t\$this->document->addScriptDeclaration(\$footable);".PHP_EOL; } } elseif (3 == $this->footableVersion) // loading version 3 { $foo = PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Add the CSS for Footable"; - $foo .= PHP_EOL."\t\t".$document."->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');"; - $foo .= PHP_EOL."\t\t".$document."->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/css/footable.standalone.min.css');"; + $foo .= PHP_EOL."\t\t\$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');"; + $foo .= PHP_EOL."\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable-v3/css/footable.standalone.min.css');"; $foo .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Add the JavaScript for Footable (adding all funtions)"; - $foo .= PHP_EOL."\t\t".$document."->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable/js/footable.min.js');"; + $foo .= PHP_EOL."\t\t\$this->document->addScript(JURI::root() .'media/com_".$this->fileContentStatic['###component###']."/footable-v3/js/footable.min.js');"; if ($init) { $foo .= PHP_EOL.PHP_EOL."\t\t".'$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('."'.footable'".').footable();});});";'; - $foo .= PHP_EOL."\t\t\$document->addScriptDeclaration(\$footable);".PHP_EOL; + $foo .= PHP_EOL."\t\t\$this->document->addScriptDeclaration(\$footable);".PHP_EOL; } } return $foo; @@ -9356,7 +9628,7 @@ class Interpretation extends Fields if (isset($this->customScriptBuilder['token'][$view]) && $this->customScriptBuilder['token'][$view]) { $fix .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Add Ajax Token"; - $fix .= PHP_EOL."\t\t\$document->addScriptDeclaration(\"var token = '\".JSession::getFormToken().\"';\");"; + $fix .= PHP_EOL."\t\t\$this->document->addScriptDeclaration(\"var token = '\".JSession::getFormToken().\"';\");"; } return $fix; } @@ -12421,9 +12693,14 @@ class Interpretation extends Fields $dbkey = 'g'; foreach ($this->componentData->config as $field) { - $xmlField = $this->setDynamicField($field, $view, $viewType, $lang, $viewName, $listViewName, $spacerCounter, $placeholders, $dbkey, false); - - if (ComponentbuilderHelper::checkString($xmlField)) + $newxmlField = $this->setDynamicField($field, $view, $viewType, $lang, $viewName, $listViewName, $spacerCounter, $placeholders, $dbkey, false); + // tmp hack untill this whole area is also done in xml (TODO) + if (isset($newxmlField->fieldXML)) + { + $xmlField = dom_import_simplexml($newxmlField->fieldXML); + $xmlField = PHP_EOL."\t'.PHP_EOL."\t".$this->xmlPrettyPrint($xmlField, 'field'); + } + if (isset($xmlField) && ComponentbuilderHelper::checkString($xmlField)) { $this->configFieldSetsCustomField[$field['tabname']][] = $xmlField; // set global params to db on install diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index 2ea8127ac..eea174690 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -318,6 +318,7 @@ class Infusion extends Interpretation && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_document'][$viewName_single])) { // ###DOCUMENT_CUSTOM_PHP### <<>> + $this->customScriptBuilder['php_document'][$viewName_single] = str_replace('$document->', '$this->document->', $this->customScriptBuilder['php_document'][$viewName_single]); $this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] = PHP_EOL.$this->setPlaceholders( $this->customScriptBuilder['php_document'][$viewName_single], diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index c098bc194..ee9060e1c 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -329,7 +329,7 @@ abstract class ComponentbuilderHelper * * @param int $id The library id to target * - * @return array On success the contributor details + * @return array On success the array of files that belong to this library * */ public static function getLibraryFiles($id) @@ -340,9 +340,10 @@ abstract class ComponentbuilderHelper $db = JFactory::getDbo(); // Create a new query object. $query = $db->getQuery(true); - $query->select($db->quoteName(array('addurls','addfolders','addfiles'))); - $query->from($db->quoteName('#__componentbuilder_library_files_folders_urls')); - $query->where($db->quoteName('library') . ' = ' . (int) $id); + $query->select($db->quoteName(array('b.name','a.addurls','a.addfolders','a.addfiles'))); + $query->from($db->quoteName('#__componentbuilder_library_files_folders_urls','a')); + $query->join('LEFT', $db->quoteName('#__componentbuilder_library', 'b') . ' ON (' . $db->quoteName('a.library') . ' = ' . $db->quoteName('b.id') . ')'); + $query->where($db->quoteName('a.library') . ' = ' . (int) $id); $db->setQuery($query); $db->execute(); if ($db->getNumRows()) @@ -357,31 +358,46 @@ abstract class ComponentbuilderHelper // set urls if (self::checkArray($result->addurls)) { + // build media folder path + $mediaPath = '/media/' . strtolower( preg_replace('/\s+/', '-', self::safeString($result->name, 'filename', ' ', false))); + // load the urls foreach($result->addurls as $url) { - if (isset($url['url']) && isset($url['type'])) + if (isset($url['url']) && self::checkString($url['url'])) { - switch ($url['type']) + // set the path if needed + if (isset($url['type']) && $url['type'] > 1) { - case 1: - // link only - $files['1'.$url['url']] = '(' . JText::_('COM_COMPONENTBUILDER_URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LINK'); - break; - case 2: - // local - $files['2'.$url['url']] = '(' . JText::_('COM_COMPONENTBUILDER_URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LOCAL'); - break; - case 3: - // link and local - $files['1'.$url['url']] = '(' . JText::_('COM_COMPONENTBUILDER_URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LINK'); - $files['2'.$url['url']] = '(' . JText::_('COM_COMPONENTBUILDER_URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LOCAL'); - break; + $fileName = basename($url['url']); + // build sub path + if (strpos($fileName, '.js') !== false) + { + $path = '/js'; + } + elseif (strpos($fileName, '.css') !== false) + { + $path = '/css'; + } + else + { + $path = ''; + } + // set the path to library file + $url['path'] = $mediaPath . $path . '/' . $fileName; // we need this for later } + // if local path is set, then use it first + if (isset($url['path'])) + { + // load document script + $files[md5($url['path'])] = '(' . JText::_('URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LOCAL'); + } + // load url also if not building document + $files[md5($url['url'])] = '(' . JText::_('URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LINK'); } } } } - // load the local files + // load the local files if (self::checkJson($result->addfiles)) { // convert to array @@ -393,7 +409,19 @@ abstract class ComponentbuilderHelper { if (isset($file['file']) && isset($file['path'])) { - $files['3'.$file['path'].$file['file']] = '(' . JText::_('COM_COMPONENTBUILDER_FILE') . ') ' . $file['file']; + $path = '/'.trim($file['path'], '/'); + // check if path has new file name (has extetion) + $pathInfo = pathinfo($path); + if (isset($pathInfo['extension']) && $pathInfo['extension']) + { + // load document script + $files[md5($path)] = '(' . JText::_('COM_COMPONENTBUILDER_FILE') . ') ' . $file['file']; + } + else + { + // load document script + $files[md5($path.'/'.trim($file['file'],'/'))] = '(' . JText::_('COM_COMPONENTBUILDER_FILE') . ') ' . $file['file']; + } } } } @@ -406,11 +434,51 @@ abstract class ComponentbuilderHelper // set folder if (self::checkArray($result->addfolders)) { - foreach($result->addfolders as $folder) + // get the global settings + if (!self::checkObject(self::$params)) { - // not yet set + self::$params = JComponentHelper::getParams('com_componentbuilder'); + } + // reset bucket + $bucket = array(); + // get custom folder path + $customPath = '/'.trim(self::$params->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR.'/custom'), '/'); + // get all the file paths + foreach ($result->addfolders as $folder) + { + if (isset($folder['path']) && isset($folder['folder'])) + { + $_path = '/'.trim($folder['path'], '/'); + $customFolder = '/'.trim($folder['folder'], '/'); + if (isset($folder['rename']) && 1 == $folder['rename']) + { + if ($_paths = self::getAllFilePaths($customPath.$customFolder)) + { + $bucket[$_path] = $_paths; + } + } + else + { + $path = $_path.$customFolder; + if ($_paths = self::getAllFilePaths($customPath.$customFolder)) + { + $bucket[$path] = $_paths; + } + } + } + } + // now load the script + if (self::checkArray($bucket)) + { + foreach ($bucket as $root => $paths) + { + // load per path + foreach($paths as $path) + { + $files[md5($root.'/'.trim($path, '/'))] = '(' . JText::_('COM_COMPONENTBUILDER_FOLDER') . ') ' . basename($path); + } + } } - $files['4folders'] = '(' . JText::_('COM_COMPONENTBUILDER_FOLDERS') . ') not yet able to deal with folders'; } } // return files if found @@ -421,6 +489,37 @@ abstract class ComponentbuilderHelper } return false; } + + /** + * get all the file paths in folder and sub folders + * + * @param string $folder The local path to parse + * @param array $fileTypes The type of files to get + * + * @return void + * + */ + public static function getAllFilePaths($folder, $fileTypes = array('\.php', '\.js', '\.css', '\.less')) + { + if (JFolder::exists($folder)) + { + // we must first store the current woking directory + $joomla = getcwd(); + // we are changing the working directory to the componet path + chdir($folder); + // get the files + foreach ($fileTypes as $type) + { + // get a list of files in the current directory tree + $files[] = JFolder::files('.', $type, true, true); + } + // change back to Joomla working directory + chdir($joomla); + // return array of files + return array_map( function($file) { return str_replace('./', '/', $file); }, (array) self::mergeArrays($files)); + } + return false; + } /** * get all component IDs @@ -2778,6 +2877,31 @@ abstract class ComponentbuilderHelper } return false; } + + /** + * Check if we are connected + * Thanks https://stackoverflow.com/a/4860432/1429677 + * + * @returns bool true on success + **/ + public static function isConnected() + { + // If example.com is down, then probably the whole internet is down, since IANA maintains the domain. Right? + $connected = @fsockopen("www.example.com", 80); + // website, port (try 80 or 443) + if ($connected) + { + //action when connected + $is_conn = true; + fclose($connected); + } + else + { + //action in connection failure + $is_conn = false; + } + return $is_conn; + } public static function mergeArrays($arrays) { diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index b96d3898f..a4298a9d9 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -864,6 +864,7 @@ COM_COMPONENTBUILDER_ALL="All" COM_COMPONENTBUILDER_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATTER="All is good, please check again latter." COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IN_NO_NOTICE_AT_THIS_TIME="All is good, there in no notice at this time." COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_ON_THIS_PAGE_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE="All unsaved work on this page will be lost, are you sure you want to continue?" +COM_COMPONENTBUILDER_ALWAYS_ADD="Always Add" COM_COMPONENTBUILDER_ALWAYS_INSURE_THAT_YOU_HAVE_YOUR_LOCAL_COMPONENTS_BACKED_UP_BY_MAKING_AN_EXPORT_OF_ALL_YOUR_LOCAL_COMPONENTS_BEFORE_IMPORTING_ANY_NEW_COMPONENTS_SMALLMAKE_BSUREB_TO_MOVE_THIS_ZIPPED_BACKUP_PACKAGE_OUT_OF_THE_TMP_FOLDER_BEFORE_DOING_AN_IMPORTSMALLBR_IF_YOU_ARE_IMPORTING_A_PACKAGE_OF_A_THREERD_PARTY_JCB_PACKAGE_DEVELOPER_BMAKE_SURE_IT_IS_A_REPUTABLE_JCB_PACKAGE_DEVELOPERSB="Always insure that you have your local components backed up, by making an export of all your local components before importing any new components. (Make SURE to move this zipped backup package out of the tmp folder before doing an import)
If you are importing a package of a 3rd party JCB package developer, make sure it is a reputable JCB package developers!" COM_COMPONENTBUILDER_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_LIST="Any Selection (only 4 list/radio/checkboxes/dynamic_list)" COM_COMPONENTBUILDER_AN_ERROR_HAS_OCCURRED="An error has occurred" @@ -903,6 +904,7 @@ COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS="%s could not be imported COM_COMPONENTBUILDER_BSB_EMCOMPONENT_DETAILSEM="%s component details" COM_COMPONENTBUILDER_BSB_HAS_BEEN_IMPORTED="%s has been imported!" COM_COMPONENTBUILDER_BSB_HAS_BEEN_UPDATED="%s has been updated!" +COM_COMPONENTBUILDER_BUILDIN="Build-in" COM_COMPONENTBUILDER_BULK="Bulk" COM_COMPONENTBUILDER_BULK_GET_ALL_NEW_SNIPPETS="Bulk Get All New Snippets" COM_COMPONENTBUILDER_BULK_TOOLS="Bulk Tools" @@ -2109,6 +2111,7 @@ COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_MESSAGE="Error! Please add some t COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE="Version Update" COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE_DESCRIPTION="Add Version Updates Here!" COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE_LABEL="Version Updates" +COM_COMPONENTBUILDER_CONDITIONS="Conditions" COM_COMPONENTBUILDER_CONFIG_ACTIVE="Active" COM_COMPONENTBUILDER_CONFIG_ALMOST_FLAT_LOAD="Almost Flat" COM_COMPONENTBUILDER_CONFIG_API_DESCRIPTION="This User will be used to log the API call." @@ -2993,6 +2996,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION=" + @@ -3029,6 +3033,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_DESCRIPTION="How To Add the Code to the fi COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL="Add Type" COM_COMPONENTBUILDER_CUSTOM_CODE_VERSION_DESC="A count of the number of times this Custom Code has been revised." COM_COMPONENTBUILDER_CUSTOM_CODE_VERSION_LABEL="Revision" +COM_COMPONENTBUILDER_CUSTOM_SCRIPT="Custom Script" COM_COMPONENTBUILDER_DASH="Dashboard" COM_COMPONENTBUILDER_DASHBOARD="Component Builder Dashboard" COM_COMPONENTBUILDER_DASHBOARD_ADD_RECORD="Dashboard (add record)" @@ -3072,6 +3077,7 @@ COM_COMPONENTBUILDER_DIVERGED="Diverged" COM_COMPONENTBUILDER_DIVERGED_MEANS_YOUR_BLOCAL_SNIPPETB_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_HAS_A_BDIVERGEDB_FROM_THE_COMMUNITY_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_IN_THAT_IT_DOES_NOT_HAVE_THE_SAME_BCREATIONB_OR_BMODIFIED_DATEB="Diverged means your local snippet (with the same name, library and type) has a diverged from the community snippet (with the same name, library and type) in that it does not have the same creation or modified date." COM_COMPONENTBUILDER_DOES_THIS_PACKAGE_REQUIRE_A_KEY_TO_INSTALL="Does this package require a key to install" COM_COMPONENTBUILDER_DOWNLOAD="download" +COM_COMPONENTBUILDER_DO_NOT_ADD="Do not add" COM_COMPONENTBUILDER_DYNAMIC_GET="Dynamic Get" COM_COMPONENTBUILDER_DYNAMIC_GETS="Dynamic Gets" COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS="Dynamic Gets Access" @@ -3715,7 +3721,7 @@ COM_COMPONENTBUILDER_FIELD_YES="Yes" COM_COMPONENTBUILDER_FIELD_ZERO="0" COM_COMPONENTBUILDER_FILE="File" COM_COMPONENTBUILDER_FILTER="Filter" -COM_COMPONENTBUILDER_FOLDERS="Folders" +COM_COMPONENTBUILDER_FOLDER="Folder" COM_COMPONENTBUILDER_FORCE_LOCAL_UPDATE="Force Local Update" COM_COMPONENTBUILDER_FTP="FTP" COM_COMPONENTBUILDER_FTPS="FTP's" @@ -4076,6 +4082,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_LABEL="Add CSS" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER="Add Email Helper" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_DESCRIPTION="Adding the email helper class, that can be used to send emails." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_LABEL="Add Email Helper" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_FOOTABLE_VTHREE="Add FooTable V3" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_FOOTABLE_VTWO="Add FooTable V2" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JAVASCRIPT="Add Javascript" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JAVASCRIPT_LABEL="Add Javascript" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE="Add License" @@ -4166,7 +4174,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_DESCRIPTION="Add Description H COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_HINT="Add Description Here" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_LABEL="Description" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DETAILS="Details" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DO_NOT_ADD="Do not add" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC="Dynamic" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC_BUILD_BETA="Dynamic Build (beta)" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC_INTEGRATION="Dynamic Integration" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EDIT="Editing the Joomla Component" @@ -4436,8 +4444,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_ONLY_FIRST_TWO_NUMBER_OF_GLOBAL_VERSIO COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_VIEW_VERSION_DATE="Use View Version & Date" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_VERSION_DESC="A count of the number of times this Joomla Component has been revised." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_VERSION_LABEL="Revision" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_VTHREE="V3" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_VTWO="V2" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE="Website" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_DESCRIPTION="Enter website address" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT="http://www.example.com" @@ -4860,12 +4866,10 @@ COM_COMPONENTBUILDER_LIBRARY_ACTIVE_ONLY_FOUR_TEXT_FIELD="Active (only 4 text_fi COM_COMPONENTBUILDER_LIBRARY_ADDCONDITIONS="Addconditions" COM_COMPONENTBUILDER_LIBRARY_ADDCONDITIONS_DESCRIPTION="Conditional setup for the the library behaviour." COM_COMPONENTBUILDER_LIBRARY_ADDCONDITIONS_LABEL="Conditions" -COM_COMPONENTBUILDER_LIBRARY_ALWAYS_ADD="Always Add" COM_COMPONENTBUILDER_LIBRARY_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_LIST="Any Selection (only 4 list/radio/checkboxes/dynamic_list)" COM_COMPONENTBUILDER_LIBRARY_BEHAVIOUR="Behaviour" COM_COMPONENTBUILDER_LIBRARY_BUNDLE="Bundle" COM_COMPONENTBUILDER_LIBRARY_CHAIN="Chain" -COM_COMPONENTBUILDER_LIBRARY_CONDITIONS="Conditions" COM_COMPONENTBUILDER_LIBRARY_CONFIG="Library Config" COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG="Addconfig" COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG_DESCRIPTION="Setup config fields." @@ -4907,13 +4911,11 @@ COM_COMPONENTBUILDER_LIBRARY_CREATED_BY_DESC="The user that created this Library COM_COMPONENTBUILDER_LIBRARY_CREATED_BY_LABEL="Created By" COM_COMPONENTBUILDER_LIBRARY_CREATED_DATE_DESC="The date this Library was created." COM_COMPONENTBUILDER_LIBRARY_CREATED_DATE_LABEL="Created Date" -COM_COMPONENTBUILDER_LIBRARY_CUSTOM_SCRIPT="Custom Script" COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION="Description" COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_DESCRIPTION="Enter some description" COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_HINT="Description Here" COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL="Description" COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_MESSAGE="Error! Please add description here." -COM_COMPONENTBUILDER_LIBRARY_DO_NOT_ADD="Do not add" COM_COMPONENTBUILDER_LIBRARY_EDIT="Editing the Library" COM_COMPONENTBUILDER_LIBRARY_ERROR_UNIQUE_ALIAS="Another Library has the same alias." COM_COMPONENTBUILDER_LIBRARY_EXACT_LENGTH_ONLY_FOUR_TEXT_FIELD="Exact Length (only 4 text_field)" @@ -5014,6 +5016,12 @@ COM_COMPONENTBUILDER_LIBRARY_NAME_HINT="Name Here" COM_COMPONENTBUILDER_LIBRARY_NAME_LABEL="Name" COM_COMPONENTBUILDER_LIBRARY_NAME_MESSAGE="Error! Please add name here." COM_COMPONENTBUILDER_LIBRARY_NEW="A New Library" +COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_DESCRIPTION="This library will be loaded based on the JCB build-in behaviour." +COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_LABEL="Build-in Behaviour" +COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_DESCRIPTION="This library will be loaded based on the JCB build-in behaviour." +COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_LABEL="Build-in Behaviour" +COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION="This library will be loaded based on the JCB build-in behaviour." +COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL="Build-in Behaviour" COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION="

Linked Config Fields

Display of the config fields will load here!
" COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION="

Linked Files, Folders & URLs

Display of the files, folders & urls will load here!
" COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION="There is no behaviour set for this library. This means JCB will not add any files unless you custom code it in somewhere." @@ -5034,13 +5042,9 @@ COM_COMPONENTBUILDER_LIBRARY_OPTION_FIELD_DESCRIPTION="Select the global option COM_COMPONENTBUILDER_LIBRARY_OPTION_FIELD_LABEL="Option Field" COM_COMPONENTBUILDER_LIBRARY_ORDERING_LABEL="Ordering" COM_COMPONENTBUILDER_LIBRARY_PERMISSION="Permissions" -COM_COMPONENTBUILDER_LIBRARY_PHP_PREPAREDOCUMENT="Php Preparedocument" -COM_COMPONENTBUILDER_LIBRARY_PHP_PREPAREDOCUMENT_DESCRIPTION="Add your PHP here! [Do not add the php tags]" -COM_COMPONENTBUILDER_LIBRARY_PHP_PREPAREDOCUMENT_HINT="// PHP Here that should run in the _prepareDocument() Method. The document is accessed via $this->document-> like $this->document->addScript();" -COM_COMPONENTBUILDER_LIBRARY_PHP_PREPAREDOCUMENT_LABEL="PHP - _prepareDocument()" COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT="Php Setdocument" COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_DESCRIPTION="Add your PHP here! [Do not add the php tags]" -COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_HINT="// PHP Here that should run in the setDocument() Method. The document is accessed via $document-> like $document->addScript();" +COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_HINT="// PHP Here that should run in the setDocument() & _prepareDocument() Method (to load the lib files). The document is accessed via $this->document-> like $this->document->addScript();" COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_LABEL="PHP - setDocument()" COM_COMPONENTBUILDER_LIBRARY_PUBLISHING="Publishing" COM_COMPONENTBUILDER_LIBRARY_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Library to customise the alias." @@ -5057,11 +5061,11 @@ COM_COMPONENTBUILDER_LIBRARY_VERSION_DESC="A count of the number of times this L COM_COMPONENTBUILDER_LIBRARY_VERSION_LABEL="Revision" COM_COMPONENTBUILDER_LICENSE="License" COM_COMPONENTBUILDER_LICENSE_S="License: %s" -COM_COMPONENTBUILDER_LINK="link" +COM_COMPONENTBUILDER_LINK="Link" COM_COMPONENTBUILDER_LINK_LOCAL_DYNAMIC="Link & Local (dynamic)" COM_COMPONENTBUILDER_LINK_TO_THE_CONTRIBUTOR="Link to the contributor" COM_COMPONENTBUILDER_LOADING="loading" -COM_COMPONENTBUILDER_LOCAL="local" +COM_COMPONENTBUILDER_LOCAL="Local" COM_COMPONENTBUILDER_LOCAL_GET="Local (get)" COM_COMPONENTBUILDER_LOCAL_SNIPPET="Local snippet" COM_COMPONENTBUILDER_MAIN_MENU="Main Menu" @@ -5983,7 +5987,6 @@ COM_COMPONENTBUILDER_UPDATE="Update" COM_COMPONENTBUILDER_UPDATE_ALL_DIVERGED_SNIPPETS="Update All Diverged Snippets" COM_COMPONENTBUILDER_UPDATE_ALL_OUT_DATED_SNIPPETS="Update All Out Dated Snippets" COM_COMPONENTBUILDER_UP_TO_DATE="Up to date" -COM_COMPONENTBUILDER_URL="Url" COM_COMPONENTBUILDER_USAGE="Usage" COM_COMPONENTBUILDER_USED_IN="used in" COM_COMPONENTBUILDER_USE_BATCH="Use Batch" diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index e107a5bfe..b57918936 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vzxfields; +$items = $displayData->vzwfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index a6afd46b0..a437256a6 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vzylinked_components; +$items = $displayData->vzxlinked_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/library/behaviour_fullwidth.php b/admin/layouts/library/behaviour_fullwidth.php index 0530f76ae..f4bf449d0 100644 --- a/admin/layouts/library/behaviour_fullwidth.php +++ b/admin/layouts/library/behaviour_fullwidth.php @@ -32,9 +32,9 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'note_no_behaviour_one', 'note_yes_behaviour_one', + 'note_build_in_behaviour_one', 'addconditions', - 'php_setdocument', - 'php_preparedocument' + 'php_setdocument' ); ?> diff --git a/admin/layouts/library/config_fullwidth.php b/admin/layouts/library/config_fullwidth.php index f78b33db2..5bc068efe 100644 --- a/admin/layouts/library/config_fullwidth.php +++ b/admin/layouts/library/config_fullwidth.php @@ -32,6 +32,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'note_no_behaviour_two', 'note_yes_behaviour_two', + 'note_build_in_behaviour_two', 'note_display_library_config' ); diff --git a/admin/layouts/library/files_folders_urls_fullwidth.php b/admin/layouts/library/files_folders_urls_fullwidth.php index 9b00b61e2..d4d23f6a6 100644 --- a/admin/layouts/library/files_folders_urls_fullwidth.php +++ b/admin/layouts/library/files_folders_urls_fullwidth.php @@ -31,6 +31,7 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'note_no_behaviour_three', + 'note_build_in_behaviour_three', 'note_display_library_files_folders_urls' ); diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 6d06cd9a3..4f23a046f 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -1847,6 +1847,14 @@ class ComponentbuilderModelAjax extends JModelList $query['i']['not_base64'] = array('dashboard_tab' => 'json'); $query['i']['name'] = 'joomla_component->id:joomla_component.system_name'; + // #__componentbuilder_library as j + $query['j'] = array(); + $query['j']['table'] = 'library'; + $query['j']['view'] = 'libraries'; + $query['j']['select'] = array('id', 'name', 'php_setdocument'); + $query['j']['not_base64'] = array(); + $query['j']['name'] = 'name'; + // return the query string to search if (isset($query[$target])) { diff --git a/admin/models/compiler.php b/admin/models/compiler.php index b6611e5c2..ab7ce803c 100644 --- a/admin/models/compiler.php +++ b/admin/models/compiler.php @@ -110,15 +110,21 @@ class ComponentbuilderModelCompiler extends JModelList // Get the global params $globalParams = JComponentHelper::getParams('com_componentbuilder', true); - // Convert the parameter fields into objects. + // Insure all item fields are adapted where needed. if (ComponentbuilderHelper::checkArray($items)) { + // Load the JEvent Dispatcher + JPluginHelper::importPlugin('content'); + $this->_dispatcher = JEventDispatcher::getInstance(); foreach ($items as $nr => &$item) { // Always create a slug for sef URL's $item->slug = (isset($item->alias) && isset($item->id)) ? $item->id.':'.$item->alias : $item->id; - // Make sure the content prepare plugins fire on copyright (TODO) - $item->copyright = JHtml::_('content.prepare',$item->copyright); + // Make sure the content prepare plugins fire on copyright + $_copyright = new stdClass(); + $_copyright->text =& $item->copyright; // value must be in text + // Since all values are now in text (Joomla Limitation), we also add the field name (copyright) to context + $this->_dispatcher->trigger("onContentPrepare",array('com_componentbuilder.compiler.copyright',&$_copyright,&$this->params)); // Checking if copyright has uikit components that must be loaded. $this->uikitComp = ComponentbuilderHelper::getUikitComp($item->copyright,$this->uikitComp); } diff --git a/admin/models/custom_codes.php b/admin/models/custom_codes.php index 641a322f7..4a127f876 100644 --- a/admin/models/custom_codes.php +++ b/admin/models/custom_codes.php @@ -280,7 +280,7 @@ class ComponentbuilderModelCustom_codes extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.component LIKE '.$search.' OR a.path LIKE '.$search.' OR a.comment_type LIKE '.$search.' OR a.function_name LIKE '.$search.' OR a.system_name LIKE '.$search.')'); + $query->where('(a.component LIKE '.$search.' OR g.system_name LIKE '.$search.' OR a.path LIKE '.$search.' OR a.comment_type LIKE '.$search.' OR a.function_name LIKE '.$search.' OR a.system_name LIKE '.$search.')'); } } diff --git a/admin/models/fields.php b/admin/models/fields.php index a76b382ad..eee123dd6 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -312,7 +312,7 @@ class ComponentbuilderModelFields extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.store LIKE '.$search.')'); + $query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.store LIKE '.$search.')'); } } diff --git a/admin/models/fields/filebehaviour.php b/admin/models/fields/filebehaviour.php new file mode 100644 index 000000000..7c5732a18 --- /dev/null +++ b/admin/models/fields/filebehaviour.php @@ -0,0 +1,168 @@ + + @github Joomla Component Builder + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import the list field type +jimport('joomla.form.helper'); +JFormHelper::loadFieldClass('list'); + +/** + * Filebehaviour Form Field class for the Componentbuilder component + */ +class JFormFieldFilebehaviour extends JFormFieldList +{ + /** + * The filebehaviour field type. + * + * @var string + */ + public $type = 'filebehaviour'; + /** + * Override to add new button + * + * @return string The field input markup. + * + * @since 3.2 + */ + protected function getInput() + { + // see if we should add buttons + $setButton = $this->getAttribute('button'); + // get html + $html = parent::getInput(); + // if true set button + if ($setButton === 'true') + { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $app = JFactory::getApplication(); + $jinput = $app->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } + $user = JFactory::getUser(); + // only add if user allowed to create + if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build Create button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' + '; + } + // only add if user allowed to edit + if (($buttonName === '' || $buttonName === '') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_componentbuilder&view=&task=.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for field. + if (is_array($button) && count($button) > 0) + { + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return '
' .$html . implode('',$button).'
'; + } + } + return $html; + } + + /** + * Method to get a list of options for a list input. + * + * @return array An array of JHtml options. + */ + public function getOptions() + { + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the library id + $libID = $jinput->getInt('id', 0); + $options[] = JHtml::_('select.option', '1', JText::_('COM_COMPONENTBUILDER_ALWAYS_ADD')); + // add build in option for some libraries + $buildin = array(3 => 'Uikit v3', 4 => 'Uikit v2', 5 => 'FooTable v2', 6 => 'FooTable v3'); + if (isset($buildin[$libID])) + { + $options[] = JHtml::_('select.option', '4', JText::_('COM_COMPONENTBUILDER_BUILDIN')); + } + $options[] = JHtml::_('select.option', '2', JText::_('COM_COMPONENTBUILDER_CONDITIONS')); + $options[] = JHtml::_('select.option', '3', JText::_('COM_COMPONENTBUILDER_CUSTOM_SCRIPT')); + $options[] = JHtml::_('select.option', '0', JText::_('COM_COMPONENTBUILDER_DO_NOT_ADD')); + return $options; + } +} diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 9168d46f8..b7a7378e4 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVzxfields() + public function getVzwfields() { // Get the user object. $user = JFactory::getUser(); @@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVzxfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVzwfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVzxfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVzwfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVzxfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVzwfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVzxfields($item->store, 'store'); + $item->store = $this->selectionTranslationVzwfields($item->store, 'store'); } } @@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVzxfields($value,$name) + public function selectionTranslationVzwfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') diff --git a/admin/models/forms/admin_fields.xml b/admin/models/forms/admin_fields.xml index 248a5bd94..1b4cb4744 100644 --- a/admin/models/forms/admin_fields.xml +++ b/admin/models/forms/admin_fields.xml @@ -4,282 +4,242 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/admin_fields_conditions.xml b/admin/models/forms/admin_fields_conditions.xml index 56ed3bea7..9b12880c8 100644 --- a/admin/models/forms/admin_fields_conditions.xml +++ b/admin/models/forms/admin_fields_conditions.xml @@ -4,224 +4,193 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index a66fd53b3..cb0df038f 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -4,1891 +4,1469 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/component_admin_views.xml b/admin/models/forms/component_admin_views.xml index 6e594faac..b4bde7cb4 100644 --- a/admin/models/forms/component_admin_views.xml +++ b/admin/models/forms/component_admin_views.xml @@ -4,682 +4,440 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/component_config.xml b/admin/models/forms/component_config.xml index 9a5a7a14a..febbb04bd 100644 --- a/admin/models/forms/component_config.xml +++ b/admin/models/forms/component_config.xml @@ -4,159 +4,142 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/component_custom_admin_menus.xml b/admin/models/forms/component_custom_admin_menus.xml index 8ef92a663..d9df673b0 100644 --- a/admin/models/forms/component_custom_admin_menus.xml +++ b/admin/models/forms/component_custom_admin_menus.xml @@ -4,216 +4,188 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/component_custom_admin_views.xml b/admin/models/forms/component_custom_admin_views.xml index ea982aa31..2e6afb936 100644 --- a/admin/models/forms/component_custom_admin_views.xml +++ b/admin/models/forms/component_custom_admin_views.xml @@ -4,638 +4,404 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/component_dashboard.xml b/admin/models/forms/component_dashboard.xml index a7c1cea49..f38f2a228 100644 --- a/admin/models/forms/component_dashboard.xml +++ b/admin/models/forms/component_dashboard.xml @@ -4,175 +4,155 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/component_files_folders.xml b/admin/models/forms/component_files_folders.xml index 120e6b981..f493ebff6 100644 --- a/admin/models/forms/component_files_folders.xml +++ b/admin/models/forms/component_files_folders.xml @@ -4,210 +4,197 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/component_mysql_tweaks.xml b/admin/models/forms/component_mysql_tweaks.xml index 51cfa9b31..d59cc300b 100644 --- a/admin/models/forms/component_mysql_tweaks.xml +++ b/admin/models/forms/component_mysql_tweaks.xml @@ -4,177 +4,154 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/component_site_views.xml b/admin/models/forms/component_site_views.xml index dbdc2a004..7a2f87ec0 100644 --- a/admin/models/forms/component_site_views.xml +++ b/admin/models/forms/component_site_views.xml @@ -4,184 +4,165 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/component_updates.xml b/admin/models/forms/component_updates.xml index a481f4f28..eff539617 100644 --- a/admin/models/forms/component_updates.xml +++ b/admin/models/forms/component_updates.xml @@ -4,162 +4,144 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/custom_admin_view.xml b/admin/models/forms/custom_admin_view.xml index 10fbf7d69..f127649a2 100644 --- a/admin/models/forms/custom_admin_view.xml +++ b/admin/models/forms/custom_admin_view.xml @@ -4,975 +4,699 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js index 35c655160..397eddabe 100644 --- a/admin/models/forms/custom_code.js +++ b/admin/models/forms/custom_code.js @@ -317,7 +317,7 @@ function usedin(functioName, ide) { jQuery('#note-usedin-not').hide(); jQuery('#note-usedin-found').hide(); jQuery('#loading-usedin').show(); - var targets = ['a','b','c','d','e','f','g','h','i']; + var targets = ['a','b','c','d','e','f','g','h','i','j']; var run = 0; var usedinChecker = setInterval(function(){ var target = targets[run]; @@ -339,7 +339,7 @@ function usedin(functioName, ide) { } } }); - if (run == 8) { + if (run == 9) { clearInterval(usedinChecker); } run++; diff --git a/admin/models/forms/custom_code.xml b/admin/models/forms/custom_code.xml index 3d842d7f2..bff5e93a4 100644 --- a/admin/models/forms/custom_code.xml +++ b/admin/models/forms/custom_code.xml @@ -4,264 +4,234 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/dynamic_get.xml b/admin/models/forms/dynamic_get.xml index eea328deb..8ccb137d3 100644 --- a/admin/models/forms/dynamic_get.xml +++ b/admin/models/forms/dynamic_get.xml @@ -4,1338 +4,1009 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js index cfa6530d9..2242df424 100644 --- a/admin/models/forms/field.js +++ b/admin/models/forms/field.js @@ -23,151 +23,96 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvwabvzp_required = false; -jform_vvvvwacvzq_required = false; -jform_vvvvwadvzr_required = false; -jform_vvvvwaevzs_required = false; -jform_vvvvwahvzt_required = false; -jform_vvvvwaivzu_required = false; -jform_vvvvwajvzv_required = false; -jform_vvvvwakvzw_required = false; +jform_vvvvwacvzo_required = false; +jform_vvvvwadvzp_required = false; +jform_vvvvwaevzq_required = false; +jform_vvvvwafvzr_required = false; +jform_vvvvwaivzs_required = false; +jform_vvvvwajvzt_required = false; +jform_vvvvwakvzu_required = false; +jform_vvvvwalvzv_required = false; // Initial Script jQuery(document).ready(function() { - var datalenght_vvvvwab = jQuery("#jform_datalenght").val(); - vvvvwab(datalenght_vvvvwab); + var datalenght_vvvvwac = jQuery("#jform_datalenght").val(); + vvvvwac(datalenght_vvvvwac); - var datadefault_vvvvwac = jQuery("#jform_datadefault").val(); - vvvvwac(datadefault_vvvvwac); - - var datatype_vvvvwad = jQuery("#jform_datatype").val(); - vvvvwad(datatype_vvvvwad); + var datadefault_vvvvwad = jQuery("#jform_datadefault").val(); + vvvvwad(datadefault_vvvvwad); var datatype_vvvvwae = jQuery("#jform_datatype").val(); vvvvwae(datatype_vvvvwae); - var store_vvvvwaf = jQuery("#jform_store").val(); var datatype_vvvvwaf = jQuery("#jform_datatype").val(); - vvvvwaf(store_vvvvwaf,datatype_vvvvwaf); + vvvvwaf(datatype_vvvvwaf); - var add_css_view_vvvvwah = jQuery("#jform_add_css_view input[type='radio']:checked").val(); - vvvvwah(add_css_view_vvvvwah); + var store_vvvvwag = jQuery("#jform_store").val(); + var datatype_vvvvwag = jQuery("#jform_datatype").val(); + vvvvwag(store_vvvvwag,datatype_vvvvwag); - var add_css_views_vvvvwai = jQuery("#jform_add_css_views input[type='radio']:checked").val(); - vvvvwai(add_css_views_vvvvwai); + var add_css_view_vvvvwai = jQuery("#jform_add_css_view input[type='radio']:checked").val(); + vvvvwai(add_css_view_vvvvwai); - var add_javascript_view_footer_vvvvwaj = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); - vvvvwaj(add_javascript_view_footer_vvvvwaj); + var add_css_views_vvvvwaj = jQuery("#jform_add_css_views input[type='radio']:checked").val(); + vvvvwaj(add_css_views_vvvvwaj); - var add_javascript_views_footer_vvvvwak = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); - vvvvwak(add_javascript_views_footer_vvvvwak); + var add_javascript_view_footer_vvvvwak = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); + vvvvwak(add_javascript_view_footer_vvvvwak); + + var add_javascript_views_footer_vvvvwal = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); + vvvvwal(add_javascript_views_footer_vvvvwal); }); -// the vvvvwab function -function vvvvwab(datalenght_vvvvwab) +// the vvvvwac function +function vvvvwac(datalenght_vvvvwac) { - if (isSet(datalenght_vvvvwab) && datalenght_vvvvwab.constructor !== Array) + if (isSet(datalenght_vvvvwac) && datalenght_vvvvwac.constructor !== Array) { - var temp_vvvvwab = datalenght_vvvvwab; - var datalenght_vvvvwab = []; - datalenght_vvvvwab.push(temp_vvvvwab); + var temp_vvvvwac = datalenght_vvvvwac; + var datalenght_vvvvwac = []; + datalenght_vvvvwac.push(temp_vvvvwac); } - else if (!isSet(datalenght_vvvvwab)) + else if (!isSet(datalenght_vvvvwac)) { - var datalenght_vvvvwab = []; + var datalenght_vvvvwac = []; } - var datalenght = datalenght_vvvvwab.some(datalenght_vvvvwab_SomeFunc); + var datalenght = datalenght_vvvvwac.some(datalenght_vvvvwac_SomeFunc); // set this function logic if (datalenght) { jQuery('#jform_datalenght_other').closest('.control-group').show(); - if (jform_vvvvwabvzp_required) + if (jform_vvvvwacvzo_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_vvvvwabvzp_required = false; + jform_vvvvwacvzo_required = false; } } else { jQuery('#jform_datalenght_other').closest('.control-group').hide(); - if (!jform_vvvvwabvzp_required) + if (!jform_vvvvwacvzo_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_vvvvwabvzp_required = true; - } - } -} - -// the vvvvwab Some function -function datalenght_vvvvwab_SomeFunc(datalenght_vvvvwab) -{ - // set the function logic - if (datalenght_vvvvwab == 'Other') - { - return true; - } - return false; -} - -// the vvvvwac function -function vvvvwac(datadefault_vvvvwac) -{ - if (isSet(datadefault_vvvvwac) && datadefault_vvvvwac.constructor !== Array) - { - var temp_vvvvwac = datadefault_vvvvwac; - var datadefault_vvvvwac = []; - datadefault_vvvvwac.push(temp_vvvvwac); - } - else if (!isSet(datadefault_vvvvwac)) - { - var datadefault_vvvvwac = []; - } - var datadefault = datadefault_vvvvwac.some(datadefault_vvvvwac_SomeFunc); - - - // set this function logic - if (datadefault) - { - jQuery('#jform_datadefault_other').closest('.control-group').show(); - if (jform_vvvvwacvzq_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_vvvvwacvzq_required = false; - } - - } - else - { - jQuery('#jform_datadefault_other').closest('.control-group').hide(); - if (!jform_vvvvwacvzq_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_vvvvwacvzq_required = true; + jform_vvvvwacvzo_required = true; } } } // the vvvvwac Some function -function datadefault_vvvvwac_SomeFunc(datadefault_vvvvwac) +function datalenght_vvvvwac_SomeFunc(datalenght_vvvvwac) { // set the function logic - if (datadefault_vvvvwac == 'Other') + if (datalenght_vvvvwac == 'Other') { return true; } @@ -175,58 +120,54 @@ function datadefault_vvvvwac_SomeFunc(datadefault_vvvvwac) } // the vvvvwad function -function vvvvwad(datatype_vvvvwad) +function vvvvwad(datadefault_vvvvwad) { - if (isSet(datatype_vvvvwad) && datatype_vvvvwad.constructor !== Array) + if (isSet(datadefault_vvvvwad) && datadefault_vvvvwad.constructor !== Array) { - var temp_vvvvwad = datatype_vvvvwad; - var datatype_vvvvwad = []; - datatype_vvvvwad.push(temp_vvvvwad); + var temp_vvvvwad = datadefault_vvvvwad; + var datadefault_vvvvwad = []; + datadefault_vvvvwad.push(temp_vvvvwad); } - else if (!isSet(datatype_vvvvwad)) + else if (!isSet(datadefault_vvvvwad)) { - var datatype_vvvvwad = []; + var datadefault_vvvvwad = []; } - var datatype = datatype_vvvvwad.some(datatype_vvvvwad_SomeFunc); + var datadefault = datadefault_vvvvwad.some(datadefault_vvvvwad_SomeFunc); // set this function logic - if (datatype) + if (datadefault) { - jQuery('#jform_datadefault').closest('.control-group').show(); - jQuery('#jform_datalenght').closest('.control-group').show(); - jQuery('#jform_indexes').closest('.control-group').show(); - if (jform_vvvvwadvzr_required) + jQuery('#jform_datadefault_other').closest('.control-group').show(); + if (jform_vvvvwadvzp_required) { - updateFieldRequired('indexes',0); - jQuery('#jform_indexes').prop('required','required'); - jQuery('#jform_indexes').attr('aria-required',true); - jQuery('#jform_indexes').addClass('required'); - jform_vvvvwadvzr_required = false; + 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_vvvvwadvzp_required = false; } } else { - jQuery('#jform_datadefault').closest('.control-group').hide(); - jQuery('#jform_datalenght').closest('.control-group').hide(); - jQuery('#jform_indexes').closest('.control-group').hide(); - if (!jform_vvvvwadvzr_required) + jQuery('#jform_datadefault_other').closest('.control-group').hide(); + if (!jform_vvvvwadvzp_required) { - updateFieldRequired('indexes',1); - jQuery('#jform_indexes').removeAttr('required'); - jQuery('#jform_indexes').removeAttr('aria-required'); - jQuery('#jform_indexes').removeClass('required'); - jform_vvvvwadvzr_required = true; + updateFieldRequired('datadefault_other',1); + jQuery('#jform_datadefault_other').removeAttr('required'); + jQuery('#jform_datadefault_other').removeAttr('aria-required'); + jQuery('#jform_datadefault_other').removeClass('required'); + jform_vvvvwadvzp_required = true; } } } // the vvvvwad Some function -function datatype_vvvvwad_SomeFunc(datatype_vvvvwad) +function datadefault_vvvvwad_SomeFunc(datadefault_vvvvwad) { // set the function logic - if (datatype_vvvvwad == 'CHAR' || datatype_vvvvwad == 'VARCHAR' || datatype_vvvvwad == 'DATETIME' || datatype_vvvvwad == 'DATE' || datatype_vvvvwad == 'TIME' || datatype_vvvvwad == 'INT' || datatype_vvvvwad == 'TINYINT' || datatype_vvvvwad == 'BIGINT' || datatype_vvvvwad == 'FLOAT' || datatype_vvvvwad == 'DECIMAL' || datatype_vvvvwad == 'DOUBLE') + if (datadefault_vvvvwad == 'Other') { return true; } @@ -252,27 +193,31 @@ function vvvvwae(datatype_vvvvwae) // set this function logic if (datatype) { - jQuery('#jform_store').closest('.control-group').show(); - if (jform_vvvvwaevzs_required) + jQuery('#jform_datadefault').closest('.control-group').show(); + jQuery('#jform_datalenght').closest('.control-group').show(); + jQuery('#jform_indexes').closest('.control-group').show(); + if (jform_vvvvwaevzq_required) { - updateFieldRequired('store',0); - jQuery('#jform_store').prop('required','required'); - jQuery('#jform_store').attr('aria-required',true); - jQuery('#jform_store').addClass('required'); - jform_vvvvwaevzs_required = false; + updateFieldRequired('indexes',0); + jQuery('#jform_indexes').prop('required','required'); + jQuery('#jform_indexes').attr('aria-required',true); + jQuery('#jform_indexes').addClass('required'); + jform_vvvvwaevzq_required = false; } } else { - jQuery('#jform_store').closest('.control-group').hide(); - if (!jform_vvvvwaevzs_required) + jQuery('#jform_datadefault').closest('.control-group').hide(); + jQuery('#jform_datalenght').closest('.control-group').hide(); + jQuery('#jform_indexes').closest('.control-group').hide(); + if (!jform_vvvvwaevzq_required) { - updateFieldRequired('store',1); - jQuery('#jform_store').removeAttr('required'); - jQuery('#jform_store').removeAttr('aria-required'); - jQuery('#jform_store').removeClass('required'); - jform_vvvvwaevzs_required = true; + updateFieldRequired('indexes',1); + jQuery('#jform_indexes').removeAttr('required'); + jQuery('#jform_indexes').removeAttr('aria-required'); + jQuery('#jform_indexes').removeClass('required'); + jform_vvvvwaevzq_required = true; } } } @@ -281,7 +226,7 @@ function vvvvwae(datatype_vvvvwae) function datatype_vvvvwae_SomeFunc(datatype_vvvvwae) { // set the function logic - if (datatype_vvvvwae == 'CHAR' || datatype_vvvvwae == 'VARCHAR' || datatype_vvvvwae == 'TEXT' || datatype_vvvvwae == 'MEDIUMTEXT' || datatype_vvvvwae == 'LONGTEXT') + if (datatype_vvvvwae == 'CHAR' || datatype_vvvvwae == 'VARCHAR' || datatype_vvvvwae == 'DATETIME' || datatype_vvvvwae == 'DATE' || datatype_vvvvwae == 'TIME' || datatype_vvvvwae == 'INT' || datatype_vvvvwae == 'TINYINT' || datatype_vvvvwae == 'BIGINT' || datatype_vvvvwae == 'FLOAT' || datatype_vvvvwae == 'DECIMAL' || datatype_vvvvwae == 'DOUBLE') { return true; } @@ -289,20 +234,8 @@ function datatype_vvvvwae_SomeFunc(datatype_vvvvwae) } // the vvvvwaf function -function vvvvwaf(store_vvvvwaf,datatype_vvvvwaf) +function vvvvwaf(datatype_vvvvwaf) { - if (isSet(store_vvvvwaf) && store_vvvvwaf.constructor !== Array) - { - var temp_vvvvwaf = store_vvvvwaf; - var store_vvvvwaf = []; - store_vvvvwaf.push(temp_vvvvwaf); - } - else if (!isSet(store_vvvvwaf)) - { - var store_vvvvwaf = []; - } - var store = store_vvvvwaf.some(store_vvvvwaf_SomeFunc); - if (isSet(datatype_vvvvwaf) && datatype_vvvvwaf.constructor !== Array) { var temp_vvvvwaf = datatype_vvvvwaf; @@ -317,27 +250,33 @@ function vvvvwaf(store_vvvvwaf,datatype_vvvvwaf) // set this function logic - if (store && datatype) + if (datatype) { - jQuery('.note_vdm_encryption').closest('.control-group').show(); + jQuery('#jform_store').closest('.control-group').show(); + if (jform_vvvvwafvzr_required) + { + updateFieldRequired('store',0); + jQuery('#jform_store').prop('required','required'); + jQuery('#jform_store').attr('aria-required',true); + jQuery('#jform_store').addClass('required'); + jform_vvvvwafvzr_required = false; + } + } else { - jQuery('.note_vdm_encryption').closest('.control-group').hide(); + jQuery('#jform_store').closest('.control-group').hide(); + if (!jform_vvvvwafvzr_required) + { + updateFieldRequired('store',1); + jQuery('#jform_store').removeAttr('required'); + jQuery('#jform_store').removeAttr('aria-required'); + jQuery('#jform_store').removeClass('required'); + jform_vvvvwafvzr_required = true; + } } } -// the vvvvwaf Some function -function store_vvvvwaf_SomeFunc(store_vvvvwaf) -{ - // set the function logic - if (store_vvvvwaf == 4) - { - return true; - } - return false; -} - // the vvvvwaf Some function function datatype_vvvvwaf_SomeFunc(datatype_vvvvwaf) { @@ -349,126 +288,187 @@ function datatype_vvvvwaf_SomeFunc(datatype_vvvvwaf) return false; } -// the vvvvwah function -function vvvvwah(add_css_view_vvvvwah) +// the vvvvwag function +function vvvvwag(store_vvvvwag,datatype_vvvvwag) +{ + if (isSet(store_vvvvwag) && store_vvvvwag.constructor !== Array) + { + var temp_vvvvwag = store_vvvvwag; + var store_vvvvwag = []; + store_vvvvwag.push(temp_vvvvwag); + } + else if (!isSet(store_vvvvwag)) + { + var store_vvvvwag = []; + } + var store = store_vvvvwag.some(store_vvvvwag_SomeFunc); + + if (isSet(datatype_vvvvwag) && datatype_vvvvwag.constructor !== Array) + { + var temp_vvvvwag = datatype_vvvvwag; + var datatype_vvvvwag = []; + datatype_vvvvwag.push(temp_vvvvwag); + } + else if (!isSet(datatype_vvvvwag)) + { + var datatype_vvvvwag = []; + } + var datatype = datatype_vvvvwag.some(datatype_vvvvwag_SomeFunc); + + + // set this function logic + if (store && datatype) + { + jQuery('.note_vdm_encryption').closest('.control-group').show(); + } + else + { + jQuery('.note_vdm_encryption').closest('.control-group').hide(); + } +} + +// the vvvvwag Some function +function store_vvvvwag_SomeFunc(store_vvvvwag) { // set the function logic - if (add_css_view_vvvvwah == 1) + if (store_vvvvwag == 4) + { + return true; + } + return false; +} + +// the vvvvwag Some function +function datatype_vvvvwag_SomeFunc(datatype_vvvvwag) +{ + // set the function logic + if (datatype_vvvvwag == 'CHAR' || datatype_vvvvwag == 'VARCHAR' || datatype_vvvvwag == 'TEXT' || datatype_vvvvwag == 'MEDIUMTEXT' || datatype_vvvvwag == 'LONGTEXT') + { + return true; + } + return false; +} + +// the vvvvwai function +function vvvvwai(add_css_view_vvvvwai) +{ + // set the function logic + if (add_css_view_vvvvwai == 1) { jQuery('#jform_css_view').closest('.control-group').show(); - if (jform_vvvvwahvzt_required) + if (jform_vvvvwaivzs_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_vvvvwahvzt_required = false; + jform_vvvvwaivzs_required = false; } } else { jQuery('#jform_css_view').closest('.control-group').hide(); - if (!jform_vvvvwahvzt_required) + if (!jform_vvvvwaivzs_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_vvvvwahvzt_required = true; + jform_vvvvwaivzs_required = true; } } } -// the vvvvwai function -function vvvvwai(add_css_views_vvvvwai) +// the vvvvwaj function +function vvvvwaj(add_css_views_vvvvwaj) { // set the function logic - if (add_css_views_vvvvwai == 1) + if (add_css_views_vvvvwaj == 1) { jQuery('#jform_css_views').closest('.control-group').show(); - if (jform_vvvvwaivzu_required) + if (jform_vvvvwajvzt_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_vvvvwaivzu_required = false; + jform_vvvvwajvzt_required = false; } } else { jQuery('#jform_css_views').closest('.control-group').hide(); - if (!jform_vvvvwaivzu_required) + if (!jform_vvvvwajvzt_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_vvvvwaivzu_required = true; + jform_vvvvwajvzt_required = true; } } } -// the vvvvwaj function -function vvvvwaj(add_javascript_view_footer_vvvvwaj) +// the vvvvwak function +function vvvvwak(add_javascript_view_footer_vvvvwak) { // set the function logic - if (add_javascript_view_footer_vvvvwaj == 1) + if (add_javascript_view_footer_vvvvwak == 1) { jQuery('#jform_javascript_view_footer').closest('.control-group').show(); - if (jform_vvvvwajvzv_required) + if (jform_vvvvwakvzu_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_vvvvwajvzv_required = false; + jform_vvvvwakvzu_required = false; } } else { jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); - if (!jform_vvvvwajvzv_required) + if (!jform_vvvvwakvzu_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_vvvvwajvzv_required = true; + jform_vvvvwakvzu_required = true; } } } -// the vvvvwak function -function vvvvwak(add_javascript_views_footer_vvvvwak) +// the vvvvwal function +function vvvvwal(add_javascript_views_footer_vvvvwal) { // set the function logic - if (add_javascript_views_footer_vvvvwak == 1) + if (add_javascript_views_footer_vvvvwal == 1) { jQuery('#jform_javascript_views_footer').closest('.control-group').show(); - if (jform_vvvvwakvzw_required) + if (jform_vvvvwalvzv_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_vvvvwakvzw_required = false; + jform_vvvvwalvzv_required = false; } } else { jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); - if (!jform_vvvvwakvzw_required) + if (!jform_vvvvwalvzv_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_vvvvwakvzw_required = true; + jform_vvvvwalvzv_required = true; } } } diff --git a/admin/models/forms/field.xml b/admin/models/forms/field.xml index d1044fa1c..25cf5c3f1 100644 --- a/admin/models/forms/field.xml +++ b/admin/models/forms/field.xml @@ -4,444 +4,364 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/fieldtype.xml b/admin/models/forms/fieldtype.xml index 6f98b95a5..e3bd628f6 100644 --- a/admin/models/forms/fieldtype.xml +++ b/admin/models/forms/fieldtype.xml @@ -4,233 +4,208 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/ftp.xml b/admin/models/forms/ftp.xml index 30a96666c..e82c0dfca 100644 --- a/admin/models/forms/ftp.xml +++ b/admin/models/forms/ftp.xml @@ -4,126 +4,116 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index bc683544b..b27dbb1af 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -23,24 +23,21 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvwalvzz_required = false; -jform_vvvvwamwaa_required = false; -jform_vvvvwanwab_required = false; -jform_vvvvwaowac_required = false; -jform_vvvvwapwad_required = false; -jform_vvvvwaqwae_required = false; +jform_vvvvwamvzy_required = false; +jform_vvvvwanvzz_required = false; +jform_vvvvwaowaa_required = false; +jform_vvvvwapwab_required = false; +jform_vvvvwaqwac_required = false; +jform_vvvvwarwad_required = false; // Initial Script jQuery(document).ready(function() { - var location_vvvvwal = jQuery("#jform_location input[type='radio']:checked").val(); - vvvvwal(location_vvvvwal); - var location_vvvvwam = jQuery("#jform_location input[type='radio']:checked").val(); vvvvwam(location_vvvvwam); - var type_vvvvwan = jQuery("#jform_type").val(); - vvvvwan(type_vvvvwan); + var location_vvvvwan = jQuery("#jform_location input[type='radio']:checked").val(); + vvvvwan(location_vvvvwan); var type_vvvvwao = jQuery("#jform_type").val(); vvvvwao(type_vvvvwao); @@ -48,127 +45,75 @@ jQuery(document).ready(function() var type_vvvvwap = jQuery("#jform_type").val(); vvvvwap(type_vvvvwap); - var target_vvvvwaq = jQuery("#jform_target input[type='radio']:checked").val(); - vvvvwaq(target_vvvvwaq); + var type_vvvvwaq = jQuery("#jform_type").val(); + vvvvwaq(type_vvvvwaq); + + var target_vvvvwar = jQuery("#jform_target input[type='radio']:checked").val(); + vvvvwar(target_vvvvwar); }); -// the vvvvwal function -function vvvvwal(location_vvvvwal) +// the vvvvwam function +function vvvvwam(location_vvvvwam) { // set the function logic - if (location_vvvvwal == 1) + if (location_vvvvwam == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); - if (jform_vvvvwalvzz_required) + if (jform_vvvvwamvzy_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_vvvvwalvzz_required = false; + jform_vvvvwamvzy_required = false; } } else { jQuery('#jform_admin_view').closest('.control-group').hide(); - if (!jform_vvvvwalvzz_required) + if (!jform_vvvvwamvzy_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_vvvvwalvzz_required = true; + jform_vvvvwamvzy_required = true; } } } -// the vvvvwam function -function vvvvwam(location_vvvvwam) +// the vvvvwan function +function vvvvwan(location_vvvvwan) { // set the function logic - if (location_vvvvwam == 2) + if (location_vvvvwan == 2) { jQuery('#jform_site_view').closest('.control-group').show(); - if (jform_vvvvwamwaa_required) + if (jform_vvvvwanvzz_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_vvvvwamwaa_required = false; + jform_vvvvwanvzz_required = false; } } else { jQuery('#jform_site_view').closest('.control-group').hide(); - if (!jform_vvvvwamwaa_required) + if (!jform_vvvvwanvzz_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_vvvvwamwaa_required = true; + jform_vvvvwanvzz_required = true; } } } -// the vvvvwan function -function vvvvwan(type_vvvvwan) -{ - if (isSet(type_vvvvwan) && type_vvvvwan.constructor !== Array) - { - var temp_vvvvwan = type_vvvvwan; - var type_vvvvwan = []; - type_vvvvwan.push(temp_vvvvwan); - } - else if (!isSet(type_vvvvwan)) - { - var type_vvvvwan = []; - } - var type = type_vvvvwan.some(type_vvvvwan_SomeFunc); - - - // set this function logic - if (type) - { - jQuery('#jform_url').closest('.control-group').show(); - if (jform_vvvvwanwab_required) - { - updateFieldRequired('url',0); - jQuery('#jform_url').prop('required','required'); - jQuery('#jform_url').attr('aria-required',true); - jQuery('#jform_url').addClass('required'); - jform_vvvvwanwab_required = false; - } - - } - else - { - jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_vvvvwanwab_required) - { - updateFieldRequired('url',1); - jQuery('#jform_url').removeAttr('required'); - jQuery('#jform_url').removeAttr('aria-required'); - jQuery('#jform_url').removeClass('required'); - jform_vvvvwanwab_required = true; - } - } -} - -// the vvvvwan Some function -function type_vvvvwan_SomeFunc(type_vvvvwan) -{ - // set the function logic - if (type_vvvvwan == 3) - { - return true; - } - return false; -} - // the vvvvwao function function vvvvwao(type_vvvvwao) { @@ -188,27 +133,27 @@ function vvvvwao(type_vvvvwao) // set this function logic if (type) { - jQuery('#jform_article').closest('.control-group').show(); - if (jform_vvvvwaowac_required) + jQuery('#jform_url').closest('.control-group').show(); + if (jform_vvvvwaowaa_required) { - updateFieldRequired('article',0); - jQuery('#jform_article').prop('required','required'); - jQuery('#jform_article').attr('aria-required',true); - jQuery('#jform_article').addClass('required'); - jform_vvvvwaowac_required = false; + updateFieldRequired('url',0); + jQuery('#jform_url').prop('required','required'); + jQuery('#jform_url').attr('aria-required',true); + jQuery('#jform_url').addClass('required'); + jform_vvvvwaowaa_required = false; } } else { - jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_vvvvwaowac_required) + jQuery('#jform_url').closest('.control-group').hide(); + if (!jform_vvvvwaowaa_required) { - updateFieldRequired('article',1); - jQuery('#jform_article').removeAttr('required'); - jQuery('#jform_article').removeAttr('aria-required'); - jQuery('#jform_article').removeClass('required'); - jform_vvvvwaowac_required = true; + updateFieldRequired('url',1); + jQuery('#jform_url').removeAttr('required'); + jQuery('#jform_url').removeAttr('aria-required'); + jQuery('#jform_url').removeClass('required'); + jform_vvvvwaowaa_required = true; } } } @@ -217,7 +162,7 @@ function vvvvwao(type_vvvvwao) function type_vvvvwao_SomeFunc(type_vvvvwao) { // set the function logic - if (type_vvvvwao == 1) + if (type_vvvvwao == 3) { return true; } @@ -243,27 +188,27 @@ function vvvvwap(type_vvvvwap) // set this function logic if (type) { - jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_vvvvwapwad_required) + jQuery('#jform_article').closest('.control-group').show(); + if (jform_vvvvwapwab_required) { - updateFieldRequired('content',0); - jQuery('#jform_content').prop('required','required'); - jQuery('#jform_content').attr('aria-required',true); - jQuery('#jform_content').addClass('required'); - jform_vvvvwapwad_required = false; + updateFieldRequired('article',0); + jQuery('#jform_article').prop('required','required'); + jQuery('#jform_article').attr('aria-required',true); + jQuery('#jform_article').addClass('required'); + jform_vvvvwapwab_required = false; } } else { - jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_vvvvwapwad_required) + jQuery('#jform_article').closest('.control-group').hide(); + if (!jform_vvvvwapwab_required) { - updateFieldRequired('content',1); - jQuery('#jform_content').removeAttr('required'); - jQuery('#jform_content').removeAttr('aria-required'); - jQuery('#jform_content').removeClass('required'); - jform_vvvvwapwad_required = true; + updateFieldRequired('article',1); + jQuery('#jform_article').removeAttr('required'); + jQuery('#jform_article').removeAttr('aria-required'); + jQuery('#jform_article').removeClass('required'); + jform_vvvvwapwab_required = true; } } } @@ -272,7 +217,7 @@ function vvvvwap(type_vvvvwap) function type_vvvvwap_SomeFunc(type_vvvvwap) { // set the function logic - if (type_vvvvwap == 2) + if (type_vvvvwap == 1) { return true; } @@ -280,32 +225,87 @@ function type_vvvvwap_SomeFunc(type_vvvvwap) } // the vvvvwaq function -function vvvvwaq(target_vvvvwaq) +function vvvvwaq(type_vvvvwaq) +{ + if (isSet(type_vvvvwaq) && type_vvvvwaq.constructor !== Array) + { + var temp_vvvvwaq = type_vvvvwaq; + var type_vvvvwaq = []; + type_vvvvwaq.push(temp_vvvvwaq); + } + else if (!isSet(type_vvvvwaq)) + { + var type_vvvvwaq = []; + } + var type = type_vvvvwaq.some(type_vvvvwaq_SomeFunc); + + + // set this function logic + if (type) + { + jQuery('#jform_content-lbl').closest('.control-group').show(); + if (jform_vvvvwaqwac_required) + { + updateFieldRequired('content',0); + jQuery('#jform_content').prop('required','required'); + jQuery('#jform_content').attr('aria-required',true); + jQuery('#jform_content').addClass('required'); + jform_vvvvwaqwac_required = false; + } + + } + else + { + jQuery('#jform_content-lbl').closest('.control-group').hide(); + if (!jform_vvvvwaqwac_required) + { + updateFieldRequired('content',1); + jQuery('#jform_content').removeAttr('required'); + jQuery('#jform_content').removeAttr('aria-required'); + jQuery('#jform_content').removeClass('required'); + jform_vvvvwaqwac_required = true; + } + } +} + +// the vvvvwaq Some function +function type_vvvvwaq_SomeFunc(type_vvvvwaq) { // set the function logic - if (target_vvvvwaq == 1) + if (type_vvvvwaq == 2) + { + return true; + } + return false; +} + +// the vvvvwar function +function vvvvwar(target_vvvvwar) +{ + // set the function logic + if (target_vvvvwar == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_vvvvwaqwae_required) + if (jform_vvvvwarwad_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_vvvvwaqwae_required = false; + jform_vvvvwarwad_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_vvvvwaqwae_required) + if (!jform_vvvvwarwad_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvwaqwae_required = true; + jform_vvvvwarwad_required = true; } } } diff --git a/admin/models/forms/help_document.xml b/admin/models/forms/help_document.xml index d7e4ec687..048c43be9 100644 --- a/admin/models/forms/help_document.xml +++ b/admin/models/forms/help_document.xml @@ -4,238 +4,198 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/joomla_component.xml b/admin/models/forms/joomla_component.xml index 7b16b3087..029b737f3 100644 --- a/admin/models/forms/joomla_component.xml +++ b/admin/models/forms/joomla_component.xml @@ -4,1257 +4,1189 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/language.xml b/admin/models/forms/language.xml index 76ae13df1..fae90ae83 100644 --- a/admin/models/forms/language.xml +++ b/admin/models/forms/language.xml @@ -4,122 +4,107 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/language_translation.xml b/admin/models/forms/language_translation.xml index aa50d7b1f..4d505ccb3 100644 --- a/admin/models/forms/language_translation.xml +++ b/admin/models/forms/language_translation.xml @@ -4,156 +4,138 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/layout.xml b/admin/models/forms/layout.xml index 0b3baebec..a012c85e5 100644 --- a/admin/models/forms/layout.xml +++ b/admin/models/forms/layout.xml @@ -4,226 +4,217 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/library.js b/admin/models/forms/library.js index dd941910d..a5a960a54 100644 --- a/admin/models/forms/library.js +++ b/admin/models/forms/library.js @@ -24,8 +24,7 @@ // Some Global Values jform_vvvvvzvvzm_required = false; -jform_vvvvvzvvzn_required = false; -jform_vvvvwaavzo_required = false; +jform_vvvvwabvzn_required = false; // Initial Script jQuery(document).ready(function() @@ -48,8 +47,11 @@ jQuery(document).ready(function() var how_vvvvvzz = jQuery("#jform_how").val(); vvvvvzz(how_vvvvvzz); - var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val(); - vvvvwaa(type_vvvvwaa); + var how_vvvvwaa = jQuery("#jform_how").val(); + vvvvwaa(how_vvvvwaa); + + var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val(); + vvvvwab(type_vvvvwab); }); // the vvvvvzu function @@ -119,16 +121,6 @@ function vvvvvzv(how_vvvvvzv) jform_vvvvvzvvzm_required = false; } - jQuery('#jform_php_preparedocument').closest('.control-group').show(); - if (jform_vvvvvzvvzn_required) - { - updateFieldRequired('php_preparedocument',0); - jQuery('#jform_php_preparedocument').prop('required','required'); - jQuery('#jform_php_preparedocument').attr('aria-required',true); - jQuery('#jform_php_preparedocument').addClass('required'); - jform_vvvvvzvvzn_required = false; - } - } else { @@ -141,15 +133,6 @@ function vvvvvzv(how_vvvvvzv) jQuery('#jform_php_setdocument').removeClass('required'); jform_vvvvvzvvzm_required = true; } - jQuery('#jform_php_preparedocument').closest('.control-group').hide(); - if (!jform_vvvvvzvvzn_required) - { - updateFieldRequired('php_preparedocument',1); - jQuery('#jform_php_preparedocument').removeAttr('required'); - jQuery('#jform_php_preparedocument').removeAttr('aria-required'); - jQuery('#jform_php_preparedocument').removeClass('required'); - jform_vvvvvzvvzn_required = true; - } } } @@ -323,32 +306,74 @@ function how_vvvvvzz_SomeFunc(how_vvvvvzz) } // the vvvvwaa function -function vvvvwaa(type_vvvvwaa) +function vvvvwaa(how_vvvvwaa) +{ + if (isSet(how_vvvvwaa) && how_vvvvwaa.constructor !== Array) + { + var temp_vvvvwaa = how_vvvvwaa; + var how_vvvvwaa = []; + how_vvvvwaa.push(temp_vvvvwaa); + } + else if (!isSet(how_vvvvwaa)) + { + var how_vvvvwaa = []; + } + var how = how_vvvvwaa.some(how_vvvvwaa_SomeFunc); + + + // set this function logic + if (how) + { + jQuery('.note_build_in_behaviour_one').closest('.control-group').show(); + jQuery('.note_build_in_behaviour_three').closest('.control-group').show(); + jQuery('.note_build_in_behaviour_two').closest('.control-group').show(); + } + else + { + jQuery('.note_build_in_behaviour_one').closest('.control-group').hide(); + jQuery('.note_build_in_behaviour_three').closest('.control-group').hide(); + jQuery('.note_build_in_behaviour_two').closest('.control-group').hide(); + } +} + +// the vvvvwaa Some function +function how_vvvvwaa_SomeFunc(how_vvvvwaa) { // set the function logic - if (type_vvvvwaa == 2) + if (how_vvvvwaa == 4) + { + return true; + } + return false; +} + +// the vvvvwab function +function vvvvwab(type_vvvvwab) +{ + // set the function logic + if (type_vvvvwab == 2) { jQuery('#jform_libraries').closest('.control-group').show(); - if (jform_vvvvwaavzo_required) + if (jform_vvvvwabvzn_required) { updateFieldRequired('libraries',0); jQuery('#jform_libraries').prop('required','required'); jQuery('#jform_libraries').attr('aria-required',true); jQuery('#jform_libraries').addClass('required'); - jform_vvvvwaavzo_required = false; + jform_vvvvwabvzn_required = false; } } else { jQuery('#jform_libraries').closest('.control-group').hide(); - if (!jform_vvvvwaavzo_required) + if (!jform_vvvvwabvzn_required) { updateFieldRequired('libraries',1); jQuery('#jform_libraries').removeAttr('required'); jQuery('#jform_libraries').removeAttr('aria-required'); jQuery('#jform_libraries').removeClass('required'); - jform_vvvvwaavzo_required = true; + jform_vvvvwabvzn_required = true; } } } diff --git a/admin/models/forms/library.xml b/admin/models/forms/library.xml index afe8b0d25..48118df14 100644 --- a/admin/models/forms/library.xml +++ b/admin/models/forms/library.xml @@ -4,337 +4,317 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/library_config.xml b/admin/models/forms/library_config.xml index a8dae12ab..7b1f5e582 100644 --- a/admin/models/forms/library_config.xml +++ b/admin/models/forms/library_config.xml @@ -4,159 +4,142 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/library_files_folders_urls.xml b/admin/models/forms/library_files_folders_urls.xml index 10947b24f..d56483e57 100644 --- a/admin/models/forms/library_files_folders_urls.xml +++ b/admin/models/forms/library_files_folders_urls.xml @@ -4,259 +4,246 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/site_view.xml b/admin/models/forms/site_view.xml index e39d0e5ac..5423c5db0 100644 --- a/admin/models/forms/site_view.xml +++ b/admin/models/forms/site_view.xml @@ -4,1153 +4,847 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/snippet.xml b/admin/models/forms/snippet.xml index ef404c887..d49bffcdf 100644 --- a/admin/models/forms/snippet.xml +++ b/admin/models/forms/snippet.xml @@ -4,255 +4,225 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/snippet_type.xml b/admin/models/forms/snippet_type.xml index b4e2b660d..27562a661 100644 --- a/admin/models/forms/snippet_type.xml +++ b/admin/models/forms/snippet_type.xml @@ -4,125 +4,110 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/forms/template.xml b/admin/models/forms/template.xml index c88b13ed5..8fcb6cc0c 100644 --- a/admin/models/forms/template.xml +++ b/admin/models/forms/template.xml @@ -4,226 +4,217 @@ addfieldpath="/administrator/components/com_componentbuilder/models/fields" >
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/models/ftp.php b/admin/models/ftp.php index 280487041..d211bc03f 100644 --- a/admin/models/ftp.php +++ b/admin/models/ftp.php @@ -122,7 +122,7 @@ class ComponentbuilderModelFtp extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVzylinked_components() + public function getVzxlinked_components() { // Get the user object. $user = JFactory::getUser(); diff --git a/admin/models/get_snippets.php b/admin/models/get_snippets.php index 94c43d24e..08c99d6c3 100644 --- a/admin/models/get_snippets.php +++ b/admin/models/get_snippets.php @@ -118,9 +118,12 @@ class ComponentbuilderModelGet_snippets extends JModelList // Get the global params $globalParams = JComponentHelper::getParams('com_componentbuilder', true); - // Convert the parameter fields into objects. + // Insure all item fields are adapted where needed. if (ComponentbuilderHelper::checkArray($items)) { + // Load the JEvent Dispatcher + JPluginHelper::importPlugin('content'); + $this->_dispatcher = JEventDispatcher::getInstance(); foreach ($items as $nr => &$item) { // Always create a slug for sef URL's diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index bde57f22c..5c6071299 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -266,7 +266,7 @@ class ComponentbuilderModelHelp_documents extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.title LIKE '.$search.' OR a.type LIKE '.$search.' OR a.location LIKE '.$search.' OR a.admin_view LIKE '.$search.' OR a.site_view LIKE '.$search.')'); + $query->where('(a.title LIKE '.$search.' OR a.type LIKE '.$search.' OR a.location LIKE '.$search.' OR a.admin_view LIKE '.$search.' OR g. LIKE '.$search.' OR a.site_view LIKE '.$search.' OR h. LIKE '.$search.')'); } } diff --git a/admin/models/layouts.php b/admin/models/layouts.php index e4e6a12f1..e6d055d84 100644 --- a/admin/models/layouts.php +++ b/admin/models/layouts.php @@ -195,7 +195,7 @@ class ComponentbuilderModelLayouts extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.name LIKE '.$search.' OR a.alias LIKE '.$search.' OR a.description LIKE '.$search.' OR a.dynamic_get LIKE '.$search.')'); + $query->where('(a.name LIKE '.$search.' OR a.alias LIKE '.$search.' OR a.description LIKE '.$search.' OR a.dynamic_get LIKE '.$search.' OR g.name LIKE '.$search.')'); } } diff --git a/admin/models/libraries.php b/admin/models/libraries.php index c896b13cd..f72192f38 100644 --- a/admin/models/libraries.php +++ b/admin/models/libraries.php @@ -137,10 +137,12 @@ class ComponentbuilderModelLibraries extends JModelList { foreach ($items as $nr => &$item) { - // convert how - $item->how = $this->selectionTranslation($item->how, 'how'); // convert type $item->type = $this->selectionTranslation($item->type, 'type'); + + // convert how + $item->how = $this->selectionTranslation($item->how, 'how'); + } } @@ -156,21 +158,6 @@ class ComponentbuilderModelLibraries extends JModelList */ public function selectionTranslation($value,$name) { - // Array of how language strings - if ($name === 'how') - { - $howArray = array( - 1 => 'COM_COMPONENTBUILDER_LIBRARY_ALWAYS_ADD', - 2 => 'COM_COMPONENTBUILDER_LIBRARY_CONDITIONS', - 3 => 'COM_COMPONENTBUILDER_LIBRARY_CUSTOM_SCRIPT', - 0 => 'COM_COMPONENTBUILDER_LIBRARY_DO_NOT_ADD' - ); - // Now check if value is found in this array - if (isset($howArray[$value]) && ComponentbuilderHelper::checkString($howArray[$value])) - { - return $howArray[$value]; - } - } // Array of type language strings if ($name === 'type') { @@ -184,6 +171,24 @@ class ComponentbuilderModelLibraries extends JModelList return $typeArray[$value]; } } + + // Array of how language strings + if ($name === 'how') + { + $howArray = array( + 1 => 'COM_COMPONENTBUILDER_ALWAYS_ADD', + 2 => 'COM_COMPONENTBUILDER_CONDITIONS', + 3 => 'COM_COMPONENTBUILDER_CUSTOM_SCRIPT', + 4 => 'COM_COMPONENTBUILDER_BUILDIN', + 0 => 'COM_COMPONENTBUILDER_DO_NOT_ADD' + ); + // Now check if value is found in this array + if (isset($howArray[$value]) && ComponentbuilderHelper::checkString($howArray[$value])) + { + return JText::_($howArray[$value]); + } + } + return $value; } @@ -246,7 +251,7 @@ class ComponentbuilderModelLibraries extends JModelList } } - // Filter by How. + // Filter by how. if ($how = $this->getState('filter.how')) { $query->where('a.how = ' . $db->quote($db->escape($how))); diff --git a/admin/models/library.php b/admin/models/library.php index a16da96b5..1e78fa36b 100644 --- a/admin/models/library.php +++ b/admin/models/library.php @@ -122,12 +122,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin $item->php_setdocument = base64_decode($item->php_setdocument); } - if (!empty($item->php_preparedocument)) - { - // base64 Decode php_preparedocument. - $item->php_preparedocument = base64_decode($item->php_preparedocument); - } - if (empty($item->id)) { @@ -966,12 +960,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin $data['php_setdocument'] = base64_encode($data['php_setdocument']); } - // Set the php_preparedocument string to base64 string. - if (isset($data['php_preparedocument'])) - { - $data['php_preparedocument'] = base64_encode($data['php_preparedocument']); - } - // insure the locked library names are not changed if ($data['id'] > 0 && isset(ComponentbuilderHelper::$libraryNames[$data['id']])) { diff --git a/admin/models/snippets.php b/admin/models/snippets.php index b312c9980..972eb27d0 100644 --- a/admin/models/snippets.php +++ b/admin/models/snippets.php @@ -317,7 +317,7 @@ class ComponentbuilderModelSnippets extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.name LIKE '.$search.' OR a.url LIKE '.$search.' OR a.type LIKE '.$search.' OR a.heading LIKE '.$search.' OR a.library LIKE '.$search.' OR a.description LIKE '.$search.')'); + $query->where('(a.name LIKE '.$search.' OR a.url LIKE '.$search.' OR a.type LIKE '.$search.' OR g.name LIKE '.$search.' OR a.heading LIKE '.$search.' OR a.library LIKE '.$search.' OR h.name LIKE '.$search.' OR a.description LIKE '.$search.')'); } } diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index f9d307e97..ba3ff9fd9 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -573,7 +573,6 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library` ( `libraries` TEXT NOT NULL, `name` VARCHAR(255) NOT NULL DEFAULT '', `not_required` INT(1) NOT NULL DEFAULT 0, - `php_preparedocument` MEDIUMTEXT NOT NULL, `php_setdocument` MEDIUMTEXT NOT NULL, `type` TINYINT(1) NOT NULL DEFAULT 0, `params` text NOT NULL DEFAULT '', @@ -1254,12 +1253,12 @@ INSERT INTO `#__componentbuilder_dynamic_get` (`id`, `add_php_after_getitem`, `a -- INSERT INTO `#__componentbuilder_library` (`id`, `addconditions`, `description`, `how`, `name`, `php_preparedocument`, `php_setdocument`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES -(1, '', '', '', 'No Library', '', '', '', 1, '2017-11-11 22:08:33', '2017-11-30 11:23:20', 3, '', 1), -(2, '', '', 1, 'Bootstrap v4', '', '', '', 1, '2017-11-12 02:08:39', '2017-11-30 11:23:20', 13, '', 2), -(3, '', '', 1, 'Uikit v3', '', '', '', 1, '2017-11-11 22:08:45', '2017-11-30 11:23:20', 6, '', 3), -(4, '', '', 3, 'Uikit v2', 'Ly8gc3RpbGwgd29ya2luZyBvbiB0aGlzIA==', 'Ly8gc3RpbGwgd29ya2luZyBvbiB0aGlzIA==', '', 1, '2017-11-11 22:08:51', '2017-11-30 11:23:20', 4, '', 4), -(5, '', '', 3, 'FooTable v2', 'CQkvLyBBZGQgdGhlIENTUyBmb3IgRm9vdGFibGUuDQoJCSR0aGlzLT5kb2N1bWVudC0+YWRkU3R5bGVTaGVldChKVVJJOjpyb290KCkgLidtZWRpYS9jb21fW1tbY29tcG9uZW50XV1dL2Zvb3RhYmxlMi9jc3MvZm9vdGFibGUuY29yZS5taW4uY3NzJyk7DQoNCgkJLy8gVXNlIHRoZSBNZXRybyBTdHlsZQ0KCQlpZiAoIWlzc2V0KCR0aGlzLT5mb29UYWJsZVN0eWxlKSB8fCAwID09ICR0aGlzLT5mb29UYWJsZVN0eWxlKQ0KCQl7DQoJCQkkdGhpcy0+ZG9jdW1lbnQtPmFkZFN0eWxlU2hlZXQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvY3NzL2Zvb3RhYmxlLm1ldHJvLm1pbi5jc3MnKTsNCgkJfQ0KCQkvLyBVc2UgdGhlIExlZ2FjeSBTdHlsZS4NCgkJZWxzZWlmIChpc3NldCgkdGhpcy0+Zm9vVGFibGVTdHlsZSkgJiYgMSA9PSAkdGhpcy0+Zm9vVGFibGVTdHlsZSkNCgkJew0KCQkJJHRoaXMtPmRvY3VtZW50LT5hZGRTdHlsZVNoZWV0KEpVUkk6OnJvb3QoKSAuJ21lZGlhL2NvbV9bW1tjb21wb25lbnRdXV0vZm9vdGFibGUyL2Nzcy9mb290YWJsZS5zdGFuZGFsb25lLm1pbi5jc3MnKTsNCgkJfQ0KDQoJCS8vIEFkZCB0aGUgSmF2YVNjcmlwdCBmb3IgRm9vdGFibGUNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvanMvZm9vdGFibGUuanMnKTsNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvanMvZm9vdGFibGUuc29ydC5qcycpOw0KCQkkdGhpcy0+ZG9jdW1lbnQtPmFkZFNjcmlwdChKVVJJOjpyb290KCkgLidtZWRpYS9jb21fW1tbY29tcG9uZW50XV1dL2Zvb3RhYmxlMi9qcy9mb290YWJsZS5maWx0ZXIuanMnKTsNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvanMvZm9vdGFibGUucGFnaW5hdGUuanMnKTsNCg0KCQkvLyB0byBpbml0aWF0ZSB0aGUgdGFibGUNCgkJJGZvb3RhYmxlID0gImpRdWVyeShkb2N1bWVudCkucmVhZHkoZnVuY3Rpb24oKSB7IGpRdWVyeShmdW5jdGlvbiAoKSB7IGpRdWVyeSgnLmZvb3RhYmxlJykuZm9vdGFibGUoKTt9KTt9KTsiOw0KCQkkdGhpcy0+ZG9jdW1lbnQtPmFkZFNjcmlwdERlY2xhcmF0aW9uKCRmb290YWJsZSk7IC8vIG1ha2Ugc3VyZSB0byBhZGQgdGhlIC5mb290YWJsZSBjbGFzcyB0byB0aGUgdGFibGU=', 'CQkvLyBBZGQgdGhlIENTUyBmb3IgRm9vdGFibGUuDQoJCSRkb2N1bWVudC0+YWRkU3R5bGVTaGVldChKVVJJOjpyb290KCkgLidtZWRpYS9jb21fW1tbY29tcG9uZW50XV1dL2Zvb3RhYmxlMi9jc3MvZm9vdGFibGUuY29yZS5taW4uY3NzJyk7DQoNCgkJLy8gVXNlIHRoZSBNZXRybyBTdHlsZQ0KCQlpZiAoIWlzc2V0KCR0aGlzLT5mb29UYWJsZVN0eWxlKSB8fCAwID09ICR0aGlzLT5mb29UYWJsZVN0eWxlKQ0KCQl7DQoJCQkkZG9jdW1lbnQtPmFkZFN0eWxlU2hlZXQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvY3NzL2Zvb3RhYmxlLm1ldHJvLm1pbi5jc3MnKTsNCgkJfQ0KCQkvLyBVc2UgdGhlIExlZ2FjeSBTdHlsZS4NCgkJZWxzZWlmIChpc3NldCgkdGhpcy0+Zm9vVGFibGVTdHlsZSkgJiYgMSA9PSAkdGhpcy0+Zm9vVGFibGVTdHlsZSkNCgkJew0KCQkJJGRvY3VtZW50LT5hZGRTdHlsZVNoZWV0KEpVUkk6OnJvb3QoKSAuJ21lZGlhL2NvbV9bW1tjb21wb25lbnRdXV0vZm9vdGFibGUyL2Nzcy9mb290YWJsZS5zdGFuZGFsb25lLm1pbi5jc3MnKTsNCgkJfQ0KDQoJCS8vIEFkZCB0aGUgSmF2YVNjcmlwdCBmb3IgRm9vdGFibGUNCgkJJGRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvanMvZm9vdGFibGUuanMnKTsNCgkJJGRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvanMvZm9vdGFibGUuc29ydC5qcycpOw0KCQkkZG9jdW1lbnQtPmFkZFNjcmlwdChKVVJJOjpyb290KCkgLidtZWRpYS9jb21fW1tbY29tcG9uZW50XV1dL2Zvb3RhYmxlMi9qcy9mb290YWJsZS5maWx0ZXIuanMnKTsNCgkJJGRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvanMvZm9vdGFibGUucGFnaW5hdGUuanMnKTsNCg0KCQkvLyB0byBpbml0aWF0ZSB0aGUgdGFibGUNCgkJJGZvb3RhYmxlID0gImpRdWVyeShkb2N1bWVudCkucmVhZHkoZnVuY3Rpb24oKSB7IGpRdWVyeShmdW5jdGlvbiAoKSB7IGpRdWVyeSgnLmZvb3RhYmxlJykuZm9vdGFibGUoKTt9KTt9KTsiOw0KCQkkZG9jdW1lbnQtPmFkZFNjcmlwdERlY2xhcmF0aW9uKCRmb290YWJsZSk7IC8vIG1ha2Ugc3VyZSB0byBhZGQgdGhlIC5mb290YWJsZSBjbGFzcyB0byB0aGUgdGFibGU=', '', 1, '2017-11-11 22:08:57', '2017-11-30 11:23:20', 7, '', 5), -(6, '', '', 3, 'FooTable v3', 'CQkvLyBBZGQgdGhlIENTUyBmb3IgRm9vdGFibGUNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTdHlsZVNoZWV0KCdodHRwczovL21heGNkbi5ib290c3RyYXBjZG4uY29tL2ZvbnQtYXdlc29tZS80LjUuMC9jc3MvZm9udC1hd2Vzb21lLm1pbi5jc3MnKTsNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTdHlsZVNoZWV0KEpVUkk6OnJvb3QoKSAuJ21lZGlhL2NvbV9bW1tjb21wb25lbnRdXV0vZm9vdGFibGUzL2Nzcy9mb290YWJsZS5zdGFuZGFsb25lLm1pbi5jc3MnKTsNCgkJLy8gQWRkIHRoZSBKYXZhU2NyaXB0IGZvciBGb290YWJsZSAoYWRkaW5nIGFsbCBmdW50aW9ucykNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTMvanMvZm9vdGFibGUubWluLmpzJyk7DQoJCS8vIHRvIGluaXRpYXRlIHRoZSB0YWJsZQ0KCQkkZm9vdGFibGUgPSAialF1ZXJ5KGRvY3VtZW50KS5yZWFkeShmdW5jdGlvbigpIHsgalF1ZXJ5KGZ1bmN0aW9uICgpIHsgalF1ZXJ5KCcuZm9vdGFibGUnKS5mb290YWJsZSgpO30pO30pOyI7DQoJCSR0aGlzLT5kb2N1bWVudC0+YWRkU2NyaXB0RGVjbGFyYXRpb24oJGZvb3RhYmxlKTsgLy8gbWFrZSBzdXJlIHRvIGFkZCB0aGUgLmZvb3RhYmxlIGNsYXNzIHRvIHRoZSB0YWJsZQ==', 'CQkvLyBBZGQgdGhlIENTUyBmb3IgRm9vdGFibGUNCgkJJGRvY3VtZW50LT5hZGRTdHlsZVNoZWV0KCdodHRwczovL21heGNkbi5ib290c3RyYXBjZG4uY29tL2ZvbnQtYXdlc29tZS80LjUuMC9jc3MvZm9udC1hd2Vzb21lLm1pbi5jc3MnKTsNCgkJJGRvY3VtZW50LT5hZGRTdHlsZVNoZWV0KEpVUkk6OnJvb3QoKSAuJ21lZGlhL2NvbV9bW1tjb21wb25lbnRdXV0vZm9vdGFibGUzL2Nzcy9mb290YWJsZS5zdGFuZGFsb25lLm1pbi5jc3MnKTsNCgkJLy8gQWRkIHRoZSBKYXZhU2NyaXB0IGZvciBGb290YWJsZSAoYWRkaW5nIGFsbCBmdW50aW9ucykNCgkJJGRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTMvanMvZm9vdGFibGUubWluLmpzJyk7DQoJCS8vIHRvIGluaXRpYXRlIHRoZSB0YWJsZQ0KCQkkZm9vdGFibGUgPSAialF1ZXJ5KGRvY3VtZW50KS5yZWFkeShmdW5jdGlvbigpIHsgalF1ZXJ5KGZ1bmN0aW9uICgpIHsgalF1ZXJ5KCcuZm9vdGFibGUnKS5mb290YWJsZSgpO30pO30pOyI7DQoJCSRkb2N1bWVudC0+YWRkU2NyaXB0RGVjbGFyYXRpb24oJGZvb3RhYmxlKTsgLy8gbWFrZSBzdXJlIHRvIGFkZCB0aGUgLmZvb3RhYmxlIGNsYXNzIHRvIHRoZSB0YWJsZQ==', '', 1, '2017-11-25 22:11:03', '2017-11-30 11:23:20', 11, '', 6); +(1, '', '', '', 'No Library', '', '', '', 1, '2017-11-11 22:08:33', '2017-12-08 15:51:34', 4, '', 1), +(2, '', '', 1, 'Bootstrap v4', '', '', '', 1, '2017-11-12 02:08:39', '2017-12-10 15:09:48', 14, '', 2), +(3, '', '', 1, 'Uikit v3', '', '', '', 1, '2017-11-11 22:08:45', '2017-12-10 15:55:35', 18, '', 3), +(4, '', '', 4, 'Uikit v2', 'Ly8gc3RpbGwgd29ya2luZyBvbiB0aGlzIA==', '', '', 1, '2017-11-11 22:08:51', '2017-12-10 15:53:17', 5, '', 4), +(5, '', '', 4, 'FooTable v2', 'CQkvLyBBZGQgdGhlIENTUyBmb3IgRm9vdGFibGUuDQoJCSR0aGlzLT5kb2N1bWVudC0+YWRkU3R5bGVTaGVldChKVVJJOjpyb290KCkgLidtZWRpYS9jb21fW1tbY29tcG9uZW50XV1dL2Zvb3RhYmxlMi9jc3MvZm9vdGFibGUuY29yZS5taW4uY3NzJyk7DQoNCgkJLy8gVXNlIHRoZSBNZXRybyBTdHlsZQ0KCQlpZiAoIWlzc2V0KCR0aGlzLT5mb29UYWJsZVN0eWxlKSB8fCAwID09ICR0aGlzLT5mb29UYWJsZVN0eWxlKQ0KCQl7DQoJCQkkdGhpcy0+ZG9jdW1lbnQtPmFkZFN0eWxlU2hlZXQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvY3NzL2Zvb3RhYmxlLm1ldHJvLm1pbi5jc3MnKTsNCgkJfQ0KCQkvLyBVc2UgdGhlIExlZ2FjeSBTdHlsZS4NCgkJZWxzZWlmIChpc3NldCgkdGhpcy0+Zm9vVGFibGVTdHlsZSkgJiYgMSA9PSAkdGhpcy0+Zm9vVGFibGVTdHlsZSkNCgkJew0KCQkJJHRoaXMtPmRvY3VtZW50LT5hZGRTdHlsZVNoZWV0KEpVUkk6OnJvb3QoKSAuJ21lZGlhL2NvbV9bW1tjb21wb25lbnRdXV0vZm9vdGFibGUyL2Nzcy9mb290YWJsZS5zdGFuZGFsb25lLm1pbi5jc3MnKTsNCgkJfQ0KDQoJCS8vIEFkZCB0aGUgSmF2YVNjcmlwdCBmb3IgRm9vdGFibGUNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvanMvZm9vdGFibGUuanMnKTsNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvanMvZm9vdGFibGUuc29ydC5qcycpOw0KCQkkdGhpcy0+ZG9jdW1lbnQtPmFkZFNjcmlwdChKVVJJOjpyb290KCkgLidtZWRpYS9jb21fW1tbY29tcG9uZW50XV1dL2Zvb3RhYmxlMi9qcy9mb290YWJsZS5maWx0ZXIuanMnKTsNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTIvanMvZm9vdGFibGUucGFnaW5hdGUuanMnKTsNCg0KCQkvLyB0byBpbml0aWF0ZSB0aGUgdGFibGUNCgkJJGZvb3RhYmxlID0gImpRdWVyeShkb2N1bWVudCkucmVhZHkoZnVuY3Rpb24oKSB7IGpRdWVyeShmdW5jdGlvbiAoKSB7IGpRdWVyeSgnLmZvb3RhYmxlJykuZm9vdGFibGUoKTt9KTt9KTsiOw0KCQkkdGhpcy0+ZG9jdW1lbnQtPmFkZFNjcmlwdERlY2xhcmF0aW9uKCRmb290YWJsZSk7IC8vIG1ha2Ugc3VyZSB0byBhZGQgdGhlIC5mb290YWJsZSBjbGFzcyB0byB0aGUgdGFibGU=', '', '', 1, '2017-11-11 22:08:57', '2017-12-10 15:54:07', 8, '', 5), +(6, '', '', 4, 'FooTable v3', 'CQkvLyBBZGQgdGhlIENTUyBmb3IgRm9vdGFibGUNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTdHlsZVNoZWV0KCdodHRwczovL21heGNkbi5ib290c3RyYXBjZG4uY29tL2ZvbnQtYXdlc29tZS80LjUuMC9jc3MvZm9udC1hd2Vzb21lLm1pbi5jc3MnKTsNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTdHlsZVNoZWV0KEpVUkk6OnJvb3QoKSAuJ21lZGlhL2NvbV9bW1tjb21wb25lbnRdXV0vZm9vdGFibGUzL2Nzcy9mb290YWJsZS5zdGFuZGFsb25lLm1pbi5jc3MnKTsNCgkJLy8gQWRkIHRoZSBKYXZhU2NyaXB0IGZvciBGb290YWJsZSAoYWRkaW5nIGFsbCBmdW50aW9ucykNCgkJJHRoaXMtPmRvY3VtZW50LT5hZGRTY3JpcHQoSlVSSTo6cm9vdCgpIC4nbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS9mb290YWJsZTMvanMvZm9vdGFibGUubWluLmpzJyk7DQoJCS8vIHRvIGluaXRpYXRlIHRoZSB0YWJsZQ0KCQkkZm9vdGFibGUgPSAialF1ZXJ5KGRvY3VtZW50KS5yZWFkeShmdW5jdGlvbigpIHsgalF1ZXJ5KGZ1bmN0aW9uICgpIHsgalF1ZXJ5KCcuZm9vdGFibGUnKS5mb290YWJsZSgpO30pO30pOyI7DQoJCSR0aGlzLT5kb2N1bWVudC0+YWRkU2NyaXB0RGVjbGFyYXRpb24oJGZvb3RhYmxlKTsgLy8gbWFrZSBzdXJlIHRvIGFkZCB0aGUgLmZvb3RhYmxlIGNsYXNzIHRvIHRoZSB0YWJsZQ==', '', '', 1, '2017-11-25 22:11:03', '2017-12-10 15:54:45', 12, '', 6); -- -- Dumping data for table `#__componentbuilder_field` @@ -1467,18 +1466,18 @@ INSERT INTO `#__componentbuilder_snippet_type` (`id`, `name`, `description`, `pa INSERT INTO `#__componentbuilder_library_config` (`id`, `addconfig`, `library`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES (1, '', 2, '', 1, '2017-11-25 02:59:38', '2017-11-26 20:48:15', 10, '', 1), -(2, '', 3, '', 1, '2017-11-25 21:51:25', '2017-11-25 21:58:48', 2, '', 2); +(2, '', 3, '', 1, '2017-11-25 21:51:25', '2017-12-10 15:08:32', 6, '', 2); -- -- Dumping data for table `#__componentbuilder_library_files_folders_urls` -- INSERT INTO `#__componentbuilder_library_files_folders_urls` (`id`, `addfiles`, `addfolders`, `addurls`, `library`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES -(1, '', '{\"addfolders2\":{\"folder\":\"uikit\",\"path\":\"\\/media\\/\"}}', '', 4, '', 1, '2017-11-25 00:09:15', '2017-11-25 21:59:43', 7, '', 1), +(1, '', '{\"addfolders0\":{\"folder\":\"uikit-v2\",\"path\":\"\\/media\\/\"}}', '', 4, '', 1, '2017-11-25 00:09:15', '2017-12-10 15:10:31', 8, '', 1), (2, '', '', '{\"addurls0\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/js\\/bootstrap.min.js\",\"type\":\"1\"},\"addurls1\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/css\\/bootstrap.min.css\",\"type\":\"1\"}}', 2, '', 1, '2017-11-25 16:17:36', '2017-11-26 20:48:33', 6, '', 2), -(3, '', '', '{\"addurls1\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/css\\/uikit.min.css\",\"type\":\"1\"},\"addurls2\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit.min.js\",\"type\":\"1\"},\"addurls3\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit-icons.min.js\",\"type\":\"1\"}}', 3, '', 1, '2017-11-25 21:47:40', '0000-00-00 00:00:00', 1, '', 3), -(4, '', '{\"addfolders0\":{\"folder\":\"footable2\",\"path\":\"\\/media\\/\"}}', '', 5, '', 1, '2017-11-25 22:00:43', '2017-11-25 22:13:15', 2, '', 4), -(5, '', '{\"addfolders1\":{\"folder\":\"footable3\",\"path\":\"\\/media\\/\"}}', '', 6, '', 1, '2017-11-25 22:12:42', '0000-00-00 00:00:00', 1, '', 5); +(3, '', '', '{\"addurls0\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit.min.js\",\"type\":\"2\"},\"addurls1\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit-icons.min.js\",\"type\":\"2\"},\"addurls2\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/css\\/uikit.min.css\",\"type\":\"2\"}}', 3, '', 1, '2017-11-25 21:47:40', '2017-12-10 15:09:17', 7, '', 3), +(4, '', '', '', 5, '', 1, '2017-11-25 22:00:43', '2017-12-10 15:53:54', 3, '', 4), +(5, '', '', '', 6, '', 1, '2017-11-25 22:12:42', '2017-12-10 15:54:36', 2, '', 5); diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php index 0185f4688..ae727d1e8 100644 --- a/admin/views/admin_fields/view.html.php +++ b/admin/views/admin_fields/view.html.php @@ -189,11 +189,14 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields.css"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields/submitbutton.js"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields.css"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php index eaee3c985..258023cf4 100644 --- a/admin/views/admin_fields_conditions/view.html.php +++ b/admin/views/admin_fields_conditions/view.html.php @@ -189,13 +189,16 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields_conditions.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields_conditions.css"); // Add Ajax Token - $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields_conditions/submitbutton.js"); + $this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields_conditions/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index be7cf1121..83d6f70c8 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -189,22 +189,25 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_view.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_view.css"); // Add Ajax Token - $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_view/submitbutton.js"); + $this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_view/submitbutton.js"); // add JavaScripts - $document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit/js/uikit.min.js' ); - $document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit/js/components/lightbox.min.js', 'text/javascript', true); - $document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit/js/components/notify.min.js', 'text/javascript', true); + $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' ); + $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', 'text/javascript', true); + $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', 'text/javascript', true); // add the style sheets - $document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit/css/uikit.gradient.min.css' ); - $document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit/css/components/notify.gradient.min.css' ); + $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' ); + $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' ); // add var key - $document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';"); + $this->document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 8bc3797a9..faa2387f4 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -209,9 +209,12 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_ADMIN_VIEWS')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_views.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_ADMIN_VIEWS')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_views.css"); } /** diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php index ef291f7f3..859c1b73f 100644 --- a/admin/views/admins_fields/view.html.php +++ b/admin/views/admins_fields/view.html.php @@ -199,9 +199,12 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admins_fields.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admins_fields.css"); } /** diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php index 54002e5a3..3166300ec 100644 --- a/admin/views/admins_fields_conditions/view.html.php +++ b/admin/views/admins_fields_conditions/view.html.php @@ -199,9 +199,12 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admins_fields_conditions.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admins_fields_conditions.css"); } /** diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index 10f6457ae..f16dd8152 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -150,7 +150,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy // Load the header checker class. require_once( JPATH_COMPONENT_ADMINISTRATOR.'/helpers/headercheck.php' ); // Initialize the header checker. - $HeaderCheck = new componentbuilderHeaderCheck; + $HeaderCheck = new componentbuilderHeaderCheck; // Load uikit options. $uikit = $this->params->get('uikit_load'); @@ -162,12 +162,12 @@ class ComponentbuilderViewCompiler extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit/css/uikit'.$style.$size.'.css'); + $this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css'); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit/js/uikit'.$size.'.js'); + $this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit'.$size.'.js'); } // Load the needed uikit components in this view. @@ -182,16 +182,16 @@ class ComponentbuilderViewCompiler extends JViewLegacy foreach (ComponentbuilderHelper::$uk_components[$class] as $name) { // check if the CSS file exists. - if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit/css/components/'.$name.$style.$size.'.css')) + if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit/css/components/'.$name.$style.$size.'.css'); + $this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css'); } // check if the JavaScript file exists. - if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit/js/components/'.$name.$size.'.js')) + if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit/js/components/'.$name.$size.'.js', 'text/javascript', true); + $this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', 'text/javascript', true); } } } diff --git a/admin/views/component_admin_views/view.html.php b/admin/views/component_admin_views/view.html.php index 4bc5d441b..f45388ca2 100644 --- a/admin/views/component_admin_views/view.html.php +++ b/admin/views/component_admin_views/view.html.php @@ -189,11 +189,14 @@ class ComponentbuilderViewComponent_admin_views extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_admin_views.css"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_admin_views/submitbutton.js"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_admin_views.css"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_admin_views/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/component_config/view.html.php b/admin/views/component_config/view.html.php index 23ec93697..cda3ec878 100644 --- a/admin/views/component_config/view.html.php +++ b/admin/views/component_config/view.html.php @@ -189,11 +189,14 @@ class ComponentbuilderViewComponent_config extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_config.css"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_config/submitbutton.js"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_config.css"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_config/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/component_custom_admin_menus/view.html.php b/admin/views/component_custom_admin_menus/view.html.php index d471a79b4..9e482d3f9 100644 --- a/admin/views/component_custom_admin_menus/view.html.php +++ b/admin/views/component_custom_admin_menus/view.html.php @@ -189,11 +189,14 @@ class ComponentbuilderViewComponent_custom_admin_menus extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_custom_admin_menus.css"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_custom_admin_menus/submitbutton.js"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_custom_admin_menus.css"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_custom_admin_menus/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/component_custom_admin_views/view.html.php b/admin/views/component_custom_admin_views/view.html.php index b7a40099a..e711fc0c7 100644 --- a/admin/views/component_custom_admin_views/view.html.php +++ b/admin/views/component_custom_admin_views/view.html.php @@ -189,11 +189,14 @@ class ComponentbuilderViewComponent_custom_admin_views extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_custom_admin_views.css"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_custom_admin_views/submitbutton.js"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_custom_admin_views.css"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_custom_admin_views/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/component_dashboard/view.html.php b/admin/views/component_dashboard/view.html.php index 84ebe747c..a5891d95d 100644 --- a/admin/views/component_dashboard/view.html.php +++ b/admin/views/component_dashboard/view.html.php @@ -189,11 +189,14 @@ class ComponentbuilderViewComponent_dashboard extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_dashboard.css"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_dashboard/submitbutton.js"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_dashboard.css"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_dashboard/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/component_files_folders/view.html.php b/admin/views/component_files_folders/view.html.php index f9169ba2e..c9414e0ec 100644 --- a/admin/views/component_files_folders/view.html.php +++ b/admin/views/component_files_folders/view.html.php @@ -189,11 +189,14 @@ class ComponentbuilderViewComponent_files_folders extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_files_folders.css"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_files_folders/submitbutton.js"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_files_folders.css"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_files_folders/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/component_mysql_tweaks/view.html.php b/admin/views/component_mysql_tweaks/view.html.php index c51dc3c07..62fb13e0b 100644 --- a/admin/views/component_mysql_tweaks/view.html.php +++ b/admin/views/component_mysql_tweaks/view.html.php @@ -189,11 +189,14 @@ class ComponentbuilderViewComponent_mysql_tweaks extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_mysql_tweaks.css"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_mysql_tweaks/submitbutton.js"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_mysql_tweaks.css"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_mysql_tweaks/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/component_site_views/view.html.php b/admin/views/component_site_views/view.html.php index 53e366920..375038297 100644 --- a/admin/views/component_site_views/view.html.php +++ b/admin/views/component_site_views/view.html.php @@ -189,11 +189,14 @@ class ComponentbuilderViewComponent_site_views extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_site_views.css"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_site_views/submitbutton.js"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_site_views.css"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_site_views/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/component_updates/view.html.php b/admin/views/component_updates/view.html.php index bbca8e53a..c5ac97f52 100644 --- a/admin/views/component_updates/view.html.php +++ b/admin/views/component_updates/view.html.php @@ -189,11 +189,14 @@ class ComponentbuilderViewComponent_updates extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_updates.css"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_updates/submitbutton.js"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_updates.css"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_updates/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/components_admin_views/view.html.php b/admin/views/components_admin_views/view.html.php index 58071c04d..51bb66131 100644 --- a/admin/views/components_admin_views/view.html.php +++ b/admin/views/components_admin_views/view.html.php @@ -199,9 +199,12 @@ class ComponentbuilderViewComponents_admin_views extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_admin_views.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_admin_views.css"); } /** diff --git a/admin/views/components_config/view.html.php b/admin/views/components_config/view.html.php index 47e3f3b39..68e6423f2 100644 --- a/admin/views/components_config/view.html.php +++ b/admin/views/components_config/view.html.php @@ -199,9 +199,12 @@ class ComponentbuilderViewComponents_config extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_CONFIG')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_config.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_CONFIG')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_config.css"); } /** diff --git a/admin/views/components_custom_admin_menus/view.html.php b/admin/views/components_custom_admin_menus/view.html.php index 19a5aee42..aad36661f 100644 --- a/admin/views/components_custom_admin_menus/view.html.php +++ b/admin/views/components_custom_admin_menus/view.html.php @@ -199,9 +199,12 @@ class ComponentbuilderViewComponents_custom_admin_menus extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_MENUS')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_custom_admin_menus.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_MENUS')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_custom_admin_menus.css"); } /** diff --git a/admin/views/components_custom_admin_views/view.html.php b/admin/views/components_custom_admin_views/view.html.php index 73c9f1e89..2e1e2f255 100644 --- a/admin/views/components_custom_admin_views/view.html.php +++ b/admin/views/components_custom_admin_views/view.html.php @@ -199,9 +199,12 @@ class ComponentbuilderViewComponents_custom_admin_views extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_VIEWS')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_custom_admin_views.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_VIEWS')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_custom_admin_views.css"); } /** diff --git a/admin/views/components_dashboard/view.html.php b/admin/views/components_dashboard/view.html.php index bc3d99c8c..1037680be 100644 --- a/admin/views/components_dashboard/view.html.php +++ b/admin/views/components_dashboard/view.html.php @@ -199,9 +199,12 @@ class ComponentbuilderViewComponents_dashboard extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_DASHBOARD')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_dashboard.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_DASHBOARD')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_dashboard.css"); } /** diff --git a/admin/views/components_files_folders/view.html.php b/admin/views/components_files_folders/view.html.php index 61e4e5017..eee0cb519 100644 --- a/admin/views/components_files_folders/view.html.php +++ b/admin/views/components_files_folders/view.html.php @@ -199,9 +199,12 @@ class ComponentbuilderViewComponents_files_folders extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_FILES_FOLDERS')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_files_folders.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_FILES_FOLDERS')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_files_folders.css"); } /** diff --git a/admin/views/components_mysql_tweaks/view.html.php b/admin/views/components_mysql_tweaks/view.html.php index a96303ce5..2a8497c2d 100644 --- a/admin/views/components_mysql_tweaks/view.html.php +++ b/admin/views/components_mysql_tweaks/view.html.php @@ -199,9 +199,12 @@ class ComponentbuilderViewComponents_mysql_tweaks extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_MYSQL_TWEAKS')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_mysql_tweaks.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_MYSQL_TWEAKS')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_mysql_tweaks.css"); } /** diff --git a/admin/views/components_site_views/view.html.php b/admin/views/components_site_views/view.html.php index 314695c04..6b3fc9ebf 100644 --- a/admin/views/components_site_views/view.html.php +++ b/admin/views/components_site_views/view.html.php @@ -199,9 +199,12 @@ class ComponentbuilderViewComponents_site_views extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_SITE_VIEWS')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_site_views.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_SITE_VIEWS')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_site_views.css"); } /** diff --git a/admin/views/components_updates/view.html.php b/admin/views/components_updates/view.html.php index 12f3aa8ee..c7f4a335b 100644 --- a/admin/views/components_updates/view.html.php +++ b/admin/views/components_updates/view.html.php @@ -199,9 +199,12 @@ class ComponentbuilderViewComponents_updates extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_UPDATES')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_updates.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_UPDATES')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_updates.css"); } /** diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index 5923c04ff..a15701e48 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -189,13 +189,16 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_view.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_view.css"); // Add Ajax Token - $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_admin_view/submitbutton.js"); + $this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_admin_view/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index 597440e68..1ba34a80a 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -214,9 +214,12 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_views.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_views.css"); } /** diff --git a/admin/views/custom_code/view.html.php b/admin/views/custom_code/view.html.php index 3864fadad..02aa89c25 100644 --- a/admin/views/custom_code/view.html.php +++ b/admin/views/custom_code/view.html.php @@ -189,19 +189,22 @@ class ComponentbuilderViewCustom_code extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_CODE_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_CODE_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_code.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_CODE_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_CODE_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_code.css"); // Add Ajax Token - $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_code/submitbutton.js"); + $this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_code/submitbutton.js"); // add JavaScripts - $document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit/js/uikit.min.js' ); - $document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit/js/components/notify.min.js', 'text/javascript', true); + $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' ); + $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', 'text/javascript', true); // add the style sheets - $document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit/css/uikit.gradient.min.css' ); - $document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit/css/components/notify.gradient.min.css' ); + $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' ); + $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' ); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php index 667a78256..c0132c7d5 100644 --- a/admin/views/custom_codes/view.html.php +++ b/admin/views/custom_codes/view.html.php @@ -297,9 +297,12 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_CUSTOM_CODES')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_codes.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_CUSTOM_CODES')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_codes.css"); } /** diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php index b49ad64e1..2a489f16b 100644 --- a/admin/views/dynamic_get/view.html.php +++ b/admin/views/dynamic_get/view.html.php @@ -189,13 +189,16 @@ class ComponentbuilderViewDynamic_get extends JViewLegacy protected function setDocument() { $isNew = ($this->item->id < 1); - $document = JFactory::getDocument(); - $document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_DYNAMIC_GET_NEW' : 'COM_COMPONENTBUILDER_DYNAMIC_GET_EDIT')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_get.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_DYNAMIC_GET_NEW' : 'COM_COMPONENTBUILDER_DYNAMIC_GET_EDIT')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_get.css"); // Add Ajax Token - $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); - $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/dynamic_get/submitbutton.js"); + $this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); + $this->document->addScript(JURI::root() . $this->script); + $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/dynamic_get/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php index 6fb2fa17a..3d35741dd 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -253,9 +253,12 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy */ protected function setDocument() { - $document = JFactory::getDocument(); - $document->setTitle(JText::_('COM_COMPONENTBUILDER_DYNAMIC_GETS')); - $document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_gets.css"); + if (!isset($this->document)) + { + $this->document = JFactory::getDocument(); + } + $this->document->setTitle(JText::_('COM_COMPONENTBUILDER_DYNAMIC_GETS')); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_gets.css"); } /** diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php index bf21df8e6..87402cc39 100644 --- a/admin/views/field/tmpl/edit.php +++ b/admin/views/field/tmpl/edit.php @@ -137,48 +137,33 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');