From e8ecc8c674a353bff61bb99f77b15f6bccee4a71 Mon Sep 17 00:00:00 2001 From: AlekVolsk Date: Tue, 3 Nov 2020 06:00:18 +0400 Subject: [PATCH] v1.2.16 --- README.md | 6 +- component.php | 2 - html/com_contact/categories/default.php | 2 +- html/com_contact/categories/default_items.php | 8 +- html/com_contact/category/default.php | 2 +- .../com_contact/category/default_children.php | 2 +- html/com_contact/category/default_items.php | 42 +- html/com_contact/contact/default.php | 18 +- html/com_contact/contact/default_address.php | 20 +- html/com_contact/contact/default_articles.php | 2 +- html/com_contact/contact/default_form.php | 10 +- html/com_contact/contact/default_links.php | 2 +- html/com_contact/contact/default_profile.php | 2 +- .../contact/default_user_custom_fields.php | 4 +- html/com_contact/featured/default.php | 10 +- html/com_contact/featured/default_items.php | 8 +- html/com_content/archive/default.php | 18 +- html/com_content/archive/default_items.php | 91 ++- html/com_content/article/default.php | 18 +- html/com_content/article/default_links.php | 6 +- html/com_content/categories/default.php | 2 +- html/com_content/categories/default_items.php | 12 +- html/com_content/category/blog.php | 22 +- html/com_content/category/blog_children.php | 12 +- html/com_content/category/blog_item.php | 12 +- html/com_content/category/blog_links.php | 4 +- html/com_content/category/default.php | 4 +- .../com_content/category/default_articles.php | 50 +- .../com_content/category/default_children.php | 12 +- html/com_content/featured/default.php | 8 +- html/com_content/featured/default_item.php | 6 +- html/com_content/featured/default_links.php | 2 +- html/com_content/form/edit.php | 18 +- html/com_privacy/confirm/default.php | 44 +- html/com_privacy/remind/default.php | 44 +- html/com_privacy/request/default.php | 56 +- html/com_search/search/default.php | 8 +- html/com_search/search/default_error.php | 2 +- html/com_search/search/default_form.php | 26 +- html/com_search/search/default_results.php | 2 +- html/com_tags/tag/default.php | 12 +- html/com_tags/tag/default_items.php | 25 +- html/com_tags/tag/list.php | 12 +- html/com_tags/tag/list_items.php | 33 +- html/com_tags/tags/default.php | 8 +- html/com_tags/tags/default_items.php | 46 +- html/com_users/login/default.php | 6 +- html/com_users/login/default_login.php | 24 +- html/com_users/login/default_logout.php | 16 +- html/com_users/profile/default.php | 4 +- html/com_users/profile/default_core.php | 6 +- html/com_users/profile/default_custom.php | 2 +- html/com_users/profile/default_params.php | 2 +- html/com_users/profile/edit.php | 28 +- html/com_users/registration/complete.php | 2 +- html/com_users/registration/default.php | 16 +- html/com_users/remind/default.php | 14 +- html/com_users/reset/complete.php | 14 +- html/com_users/reset/confirm.php | 14 +- html/com_users/reset/default.php | 14 +- html/com_wrapper/wrapper/default.php | 4 +- html/layouts/com_contact/field/render.php | 2 +- html/layouts/com_contact/fields/render.php | 2 +- .../com_contact/joomla/form/renderfield.php | 2 +- html/layouts/com_fields/field/render.php | 13 +- html/layouts/com_fields/fields/render.php | 6 +- .../com_users/joomla/form/renderfield.php | 28 +- html/layouts/joomla/content/associations.php | 4 +- .../content/blog_style_default_item_title.php | 2 +- .../content/blog_style_default_links.php | 2 +- .../joomla/content/categories_default.php | 2 +- .../content/categories_default_items.php | 2 +- .../joomla/content/category_default.php | 6 +- html/layouts/joomla/content/full_image.php | 6 +- html/layouts/joomla/content/icons.php | 6 +- html/layouts/joomla/content/icons/create.php | 6 +- html/layouts/joomla/content/icons/edit.php | 6 +- .../joomla/content/icons/edit_lock.php | 6 +- html/layouts/joomla/content/icons/email.php | 6 +- .../joomla/content/icons/print_popup.php | 6 +- .../joomla/content/icons/print_screen.php | 6 +- html/layouts/joomla/content/info_block.php | 10 +- .../content/info_block/associations.php | 3 +- .../joomla/content/info_block/author.php | 4 +- .../joomla/content/info_block/block.php | 2 +- .../joomla/content/info_block/category.php | 6 +- .../joomla/content/info_block/create_date.php | 6 +- .../joomla/content/info_block/hits.php | 6 +- .../joomla/content/info_block/modify_date.php | 6 +- .../content/info_block/parent_category.php | 8 +- .../content/info_block/publish_date.php | 6 +- html/layouts/joomla/content/intro_image.php | 6 +- html/layouts/joomla/content/language.php | 3 +- .../joomla/content/options_default.php | 2 +- html/layouts/joomla/content/readmore.php | 6 +- html/layouts/joomla/content/tags.php | 4 +- html/layouts/joomla/content/text_filters.php | 2 +- html/layouts/joomla/error/backtrace.php | 2 +- html/layouts/joomla/form/field/calendar.php | 8 +- html/layouts/joomla/form/field/checkboxes.php | 4 +- .../joomla/form/field/color/advanced.php | 2 +- .../joomla/form/field/color/simple.php | 4 +- html/layouts/joomla/form/field/combo.php | 10 +- .../joomla/form/field/contenthistory.php | 9 +- html/layouts/joomla/form/field/email.php | 4 +- html/layouts/joomla/form/field/file.php | 21 +- html/layouts/joomla/form/field/hidden.php | 6 +- html/layouts/joomla/form/field/media.php | 8 +- html/layouts/joomla/form/field/meter.php | 6 +- .../layouts/joomla/form/field/moduleorder.php | 4 +- html/layouts/joomla/form/field/number.php | 6 +- html/layouts/joomla/form/field/password.php | 6 +- html/layouts/joomla/form/field/radio.php | 6 +- html/layouts/joomla/form/field/range.php | 6 +- .../joomla/form/field/subform/default.php | 2 +- .../form/field/subform/repeatable-table.php | 2 +- .../repeatable-table/section-byfieldsets.php | 31 +- .../subform/repeatable-table/section.php | 31 +- .../joomla/form/field/subform/repeatable.php | 9 +- .../repeatable/section-byfieldsets.php | 21 +- .../form/field/subform/repeatable/section.php | 21 +- html/layouts/joomla/form/field/tel.php | 6 +- html/layouts/joomla/form/field/text.php | 6 +- html/layouts/joomla/form/field/textarea.php | 4 +- html/layouts/joomla/form/field/url.php | 6 +- html/layouts/joomla/form/field/user.php | 12 +- html/layouts/joomla/form/renderfield.php | 2 +- html/layouts/joomla/form/renderlabel.php | 2 +- html/layouts/joomla/pagination/link.php | 2 +- html/layouts/joomla/pagination/links.php | 4 +- html/layouts/joomla/pagination/list.php | 2 +- html/layouts/joomla/system/message.php | 8 +- html/layouts/joomla/system/message_alert.php | 2 +- .../joomla/system/message_notification.php | 4 +- .../libraries/cms/html/bootstrap/addtab.php | 2 +- .../cms/html/bootstrap/addtabscript.php | 2 +- .../libraries/cms/html/bootstrap/endtab.php | 4 +- .../cms/html/bootstrap/endtabset.php | 4 +- .../cms/html/bootstrap/starttabset.php | 4 +- .../cms/html/bootstrap/starttabsetscript.php | 2 +- .../plugins/system/privacyconsent/label.php | 20 +- .../plugins/system/privacyconsent/message.php | 2 +- .../plugins/user/profile/fields/dob.php | 2 +- html/layouts/plugins/user/terms/label.php | 16 +- html/layouts/plugins/user/terms/message.php | 2 +- html/mod_articles_archive/default.php | 2 +- html/mod_articles_categories/default.php | 2 +- .../mod_articles_categories/default_items.php | 2 +- html/mod_articles_category/default.php | 2 +- html/mod_articles_latest/default.php | 2 +- html/mod_articles_news/_item.php | 4 +- html/mod_articles_news/default.php | 2 +- html/mod_articles_news/horizontal.php | 2 +- html/mod_articles_news/vertical.php | 2 +- html/mod_articles_popular/default.php | 2 +- html/mod_banners/default.php | 8 +- html/mod_custom/default.php | 2 +- html/mod_custom/empty.php | 3 +- html/mod_custom/webp.php | 2 +- html/mod_languages/default.php | 10 +- html/mod_login/default.php | 35 +- html/mod_login/default_logout.php | 14 +- html/mod_menu/default.php | 2 +- html/mod_menu/default_component.php | 2 +- html/mod_menu/default_heading.php | 2 +- html/mod_menu/default_url.php | 2 +- html/mod_menu/navbar.php | 2 +- html/mod_menu/navbar_component.php | 6 +- html/mod_menu/navbar_heading.php | 6 +- html/mod_menu/navbar_url.php | 6 +- html/mod_menu/subnav.php | 4 +- html/mod_menu/subnav_component.php | 2 +- html/mod_menu/subnav_heading.php | 2 +- html/mod_menu/subnav_url.php | 2 +- html/mod_related_items/default.php | 2 +- html/mod_search/default.php | 10 +- html/mod_tags_popular/cloud.php | 2 +- html/mod_tags_popular/default.php | 2 +- html/mod_tags_similar/default.php | 2 +- html/mod_wrapper/default.php | 2 +- html/modules.php | 4 +- html/pagination.php | 34 +- html/plg_content_pagebreak/navigation.php | 38 +- html/plg_content_pagebreak/toc.php | 28 +- html/plg_content_pagenavigation/default.php | 46 +- html/plg_content_vote/rating.php | 24 +- html/plg_content_vote/vote.php | 22 +- html/plg_fields_calendar/calendar.php | 6 +- html/plg_fields_checkboxes/checkboxes.php | 10 +- html/plg_fields_color/color.php | 6 +- html/plg_fields_editor/editor.php | 4 +- html/plg_fields_imagelist/imagelist.php | 52 +- html/plg_fields_list/list.php | 10 +- html/plg_fields_media/media.php | 26 +- html/plg_fields_radio/radio.php | 10 +- html/plg_fields_repeatable/repeatable.php | 26 +- html/plg_fields_sql/sql.php | 26 +- html/plg_fields_textarea/textarea.php | 4 +- html/plg_fields_url/url.php | 14 +- html/plg_fields_user/user.php | 26 +- index.php | 5 +- language/en-GB/en-GB.tpl_master3.ini | 5 + language/en-GB/en-GB.tpl_master3.sys.ini | 5 + layouts/template.default-original.php | 44 +- layouts/template.error-original.php | 43 +- layouts/template.offline-original.php | 22 +- offline.php | 1 - script.php | 516 +++++++++--------- .../joomla/form/field/subform/tabs.php | 56 +- .../form/field/subform/tabs/section.php | 32 +- script/libraries/master3/config.php | 42 +- script/libraries/master3/fields/aes.php | 2 +- script/media/master3/aes/aes.css | 2 +- script/media/system/css/subform-tabs.css | 38 +- templateDetails.xml | 32 +- 215 files changed, 1483 insertions(+), 1401 deletions(-) diff --git a/README.md b/README.md index aeedcb3..4a4fe31 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ [![Documentation](https://img.shields.io/badge/-documentation-28A5F5.svg?style=for-the-badge)](https://master3.alekvolsk.info/documentation) [![Suppurt](https://img.shields.io/badge/-support-28A5F5.svg?style=for-the-badge)](https://master3.alekvolsk.info/support) -![Last Update](https://img.shields.io/badge/last_update-2020.05.12-28A5F5.svg?style=for-the-badge) -![Version](https://img.shields.io/badge/version-1.2.15-28A5F5.svg?style=for-the-badge) -![UIkit](https://img.shields.io/badge/UIkit-3.4.0-1e87f0.svg?style=for-the-badge) +![Last Update](https://img.shields.io/badge/last_update-2020.11.03-28A5F5.svg?style=for-the-badge) +![Version](https://img.shields.io/badge/version-1.2.16-28A5F5.svg?style=for-the-badge) +![UIkit](https://img.shields.io/badge/UIkit-3.5.9-1e87f0.svg?style=for-the-badge) ![Joomla](https://img.shields.io/badge/joomla-3.9+-1A3867.svg?style=for-the-badge) ![Php](https://img.shields.io/badge/php-5.6+-8892BF.svg?style=for-the-badge) diff --git a/component.php b/component.php index f7a7fe6..3cb6c8b 100644 --- a/component.php +++ b/component.php @@ -9,9 +9,7 @@ defined('_JEXEC') or die; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $config = \Master3Config::getInstance(); - $systemOutput = $config->getSystemOutput(); ?> diff --git a/html/com_contact/categories/default.php b/html/com_contact/categories/default.php index dd9644f..a337c16 100644 --- a/html/com_contact/categories/default.php +++ b/html/com_contact/categories/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/com_contact/categories/default_items.php b/html/com_contact/categories/default_items.php index 92cd144..56d706a 100644 --- a/html/com_contact/categories/default_items.php +++ b/html/com_contact/categories/default_items.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -19,13 +19,13 @@
  • escape($item->title); ?> - + params->get('show_cat_items_cat') == 1) { ?> numitems; ?> -
    - + params->get('show_subcat_desc_cat') == 1 && $item->description) { ?>
    description, '', 'com_contact.categories'); ?> diff --git a/html/com_contact/category/default.php b/html/com_contact/category/default.php index d0dbee2..05b5175 100644 --- a/html/com_contact/category/default.php +++ b/html/com_contact/category/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/com_contact/category/default_children.php b/html/com_contact/category/default_children.php index e0b4b1b..7b465d5 100644 --- a/html/com_contact/category/default_children.php +++ b/html/com_contact/category/default_children.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/com_contact/category/default_items.php b/html/com_contact/category/default_items.php index c893000..86559f6 100644 --- a/html/com_contact/category/default_items.php +++ b/html/com_contact/category/default_items.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,6 +12,10 @@ use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; +JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); +$templateConfig = \Master3Config::getInstance(); +$jsIcons = $templateConfig->params->get('jsIcons', 'none'); + ?>
    params->get('filter_field') || $this->params->get('show_pagination_limit')) { ?> @@ -26,7 +30,7 @@ class="uk-input uk-form-width-small" onchange="document.adminForm.submit();" placeholder="" - /> + >
    - +
    name; ?> - + items[$i]->published == 0) { ?> event->beforeDisplayContent; ?>
      - - params->get('show_position_headings')) { ?> -
    • con_position; ?>
      • + + params->get('show_position_headings')) { ?> +
    • ' : Text::_('COM_CONTACT_POSITION') . ': '), $item->con_position; ?>
      • params->get('show_email_headings')) { ?> -
    • email_to; ?>
      • +
    • ' : Text::_('COM_CONTACT_EMAIL_LABEL') . ': '), $item->email_to; ?>
      • country; } ?> -
      • +
    • ' : Text::_('COM_CONTACT_ADDRESS') . ': '), implode(', ', $location); ?>
      • params->get('show_telephone_headings') && !empty($item->telephone)) { ?> -
    • telephone); ?>
      • +
    • ' : ''), Text::sprintf('COM_CONTACT_TELEPHONE_NUMBER', $item->telephone); ?>
      • - + params->get('show_fax_headings') && !empty($item->fax)) { ?> -
    • fax); ?>
      • +
    • ' : ''), Text::sprintf('COM_CONTACT_FAX_NUMBER', $item->fax); ?>
      • - + params->get('show_mobile_headings') && !empty($item->mobile)) { ?> -
    • mobile); ?>
      • +
    • ' : ''), Text::sprintf('COM_CONTACT_MOBILE_NUMBER', $item->mobile); ?>
    @@ -117,7 +121,7 @@ class="uk-input uk-form-width-small"
    event->afterDisplayContent; ?> - +
    • ">
    pagination->getPagesLinks(); ?>
    - +
    pagination->getPagesCounter(); ?>
    - +
    - - + +
    diff --git a/html/com_contact/contact/default.php b/html/com_contact/contact/default.php index 1873570..6aa19a3 100644 --- a/html/com_contact/contact/default.php +++ b/html/com_contact/contact/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,12 +16,16 @@ use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Layout\FileLayout; +JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); +$templateConfig = \Master3Config::getInstance(); +$jsIcons = $templateConfig->params->get('jsIcons', 'none'); + $tparams = $this->item->params; ?>
    - + contact->name && $tparams->get('show_name')) { ?>

    item->published == 0) { ?> @@ -76,7 +80,7 @@ params->get('show_info', 1)) { @@ -107,7 +111,7 @@ if ($this->contact->con_position && $tparams->get('show_position')) { ?>
    -
    :
    +
    ' : ''), Text::_('COM_CONTACT_POSITION'); ?>:
    contact->con_position; ?>
    get('show_email_form') && ($this->contact->email_to || $this->contact->user_id)) { if ($presentation_style === 'sliders') { ?> @@ -166,7 +170,7 @@ } } - + // links if ($tparams->get('show_links')) { echo $this->loadTemplate('links'); @@ -285,7 +289,7 @@ } elseif ($tabSetStarted) { echo HTMLHelper::_('bootstrap.endTabSet'); } - + echo $this->item->event->afterDisplayContent; ?>

    diff --git a/html/com_contact/contact/default_address.php b/html/com_contact/contact/default_address.php index 1d62e3f..1919ab7 100644 --- a/html/com_contact/contact/default_address.php +++ b/html/com_contact/contact/default_address.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,6 +11,10 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\String\PunycodeHelper; +JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); +$templateConfig = \Master3Config::getInstance(); +$jsIcons = $templateConfig->params->get('jsIcons', 'none'); + ?>
    @@ -34,42 +38,42 @@ } $address = implode(', ', $address); ?> -
    :
    +
    ' : ''), Text::_('COM_CONTACT_ADDRESS'); ?>:
    contact->email_to && $this->params->get('show_email')) { ?> -
    :
    +
    ' : ''), Text::_('COM_CONTACT_EMAIL_LABEL'); ?>:
    contact->email_to; ?>
    contact->telephone && $this->params->get('show_telephone')) { ?> -
    :
    +
    ' : ''), Text::_('COM_CONTACT_TELEPHONE'); ?>:
    contact->telephone; ?>
    contact->fax && $this->params->get('show_fax')) { ?> -
    :
    +
    ' : ''), Text::_('COM_CONTACT_FAX'); ?>:
    contact->fax; ?>
    contact->mobile && $this->params->get('show_mobile')) { ?> -
    :
    +
    ' : ''), Text::_('COM_CONTACT_MOBILE'); ?>:
    contact->mobile; ?>
    contact->webpage && $this->params->get('show_webpage')) { ?> -
    :
    +
    ' : ''), Text::_('URL'); ?>:
    diff --git a/html/com_contact/contact/default_articles.php b/html/com_contact/contact/default_articles.php index 4115f7f..1c4387c 100644 --- a/html/com_contact/contact/default_articles.php +++ b/html/com_contact/contact/default_articles.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/com_contact/contact/default_form.php b/html/com_contact/contact/default_form.php index a6932a2..90cc55f 100644 --- a/html/com_contact/contact/default_form.php +++ b/html/com_contact/contact/default_form.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -41,10 +41,10 @@ } ?>
    - - - - + + + +
    diff --git a/html/com_contact/contact/default_links.php b/html/com_contact/contact/default_links.php index 2a7bf2b..5ef0eed 100644 --- a/html/com_contact/contact/default_links.php +++ b/html/com_contact/contact/default_links.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/com_contact/contact/default_profile.php b/html/com_contact/contact/default_profile.php index aa59815..53a3c38 100644 --- a/html/com_contact/contact/default_profile.php +++ b/html/com_contact/contact/default_profile.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/com_contact/contact/default_user_custom_fields.php b/html/com_contact/contact/default_user_custom_fields.php index 359a7d4..13a25f1 100644 --- a/html/com_contact/contact/default_user_custom_fields.php +++ b/html/com_contact/contact/default_user_custom_fields.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -68,7 +68,7 @@ } ?> - + diff --git a/html/com_contact/featured/default.php b/html/com_contact/featured/default.php index fe0107a..eef9266 100644 --- a/html/com_contact/featured/default.php +++ b/html/com_contact/featured/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,7 +16,7 @@ // It will be a separate class if the user starts it with a space ?>
    - + params->get('show_page_heading') != 0) { ?>

    escape($this->params->get('page_heading')); ?>

    ">
    pagination->getPagesLinks(); ?>
    - +
    pagination->getPagesCounter(); ?>
    - +
    - + diff --git a/html/com_contact/featured/default_items.php b/html/com_contact/featured/default_items.php index 93d50b8..f99193b 100644 --- a/html/com_contact/featured/default_items.php +++ b/html/com_contact/featured/default_items.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -19,7 +19,7 @@
    - + params->get('show_headings')) { ?> @@ -66,7 +66,7 @@ items as $i => $item) { ?> - + - + diff --git a/html/com_content/archive/default.php b/html/com_content/archive/default.php index 29f9ead..6302f1d 100644 --- a/html/com_content/archive/default.php +++ b/html/com_content/archive/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_content - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,16 +16,16 @@ ?>
    - + params->get('show_page_heading')) { ?>

    escape($this->params->get('page_heading')); ?>

    - +
    - +
    params->get('filter_field') !== 'hide') { ?> - + - - - + + +
    loadTemplate('items'); ?> - +
    diff --git a/html/com_content/archive/default_items.php b/html/com_content/archive/default_items.php index 370ea3e..f677f07 100644 --- a/html/com_content/archive/default_items.php +++ b/html/com_content/archive/default_items.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_content - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -18,7 +18,7 @@ ?>
    - + items as $i => $item) { $info = $item->params->get('info_block_position', 0); @@ -40,12 +40,11 @@ if ($useDefList && ($info == 0 || $info == 2)) { ?> -
    -
    -
    - +
    +
    + get('show_author') && !empty($item->author)) { ?> - +
    get('show_parent_category') && !empty($item->parent_slug)) { ?> -
    +
    escape($item->parent_title); if ($params->get('link_parent_category') && !empty($item->parent_slug)) { @@ -71,13 +70,13 @@ echo Text::sprintf('COM_CONTENT_PARENT', '' . $title . ''); } ?> -
    +
    get('show_category')) { ?> -
    +
    escape($item->category_title); if ($params->get('link_category') && $item->catslug) { @@ -87,52 +86,52 @@ echo Text::sprintf('COM_CONTENT_CATEGORY', '' . $title . ''); } ?> -
    +
    get('show_publish_date')) { ?> -
    +
    -
    + get('show_modify_date')) { ?> -
    +
    -
    + get('show_create_date')) { + if ($params->get('show_create_date')) { ?> -
    +
    -
    + get('show_hits')) { + if ($params->get('show_hits')) { ?> -
    +
    hits); ?> -
    + - + ?> + -
    -
    -
    - +
    +
    + get('show_author') && !empty($item->author)) { ?> - +
    get('show_parent_category') && !empty($item->parent_slug)) { ?> -
    +
    escape($item->parent_title); if ($params->get('link_parent_category') && !empty($item->parent_slug)) { @@ -180,13 +178,13 @@ echo Text::sprintf('COM_CONTENT_PARENT', '' . $title . ''); } ?> -
    +
    get('show_category')) { ?> -
    +
    escape($item->category_title); if ($params->get('link_category') && $item->catslug) { @@ -196,53 +194,52 @@ echo Text::sprintf('COM_CONTENT_CATEGORY', '' . $title . ''); } ?> -
    + get('show_publish_date')) { ?> -
    +
    -
    + get('show_modify_date')) { ?> -
    +
    -
    + get('show_create_date')) { ?> -
    +
    -
    + get('show_hits')) { ?> -
    +
    hits); ?> -
    + - event->afterDisplayContent; ?> diff --git a/html/com_content/article/default.php b/html/com_content/article/default.php index 50dd548..2a1df67 100644 --- a/html/com_content/article/default.php +++ b/html/com_content/article/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_content - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -47,7 +47,7 @@ $params->get('show_author') || $assocParam); ?> - + get('show_page_heading') && !$params->get('show_title')) { ?>

    escape($params->get('page_heading')); ?>

    get('show_title') != false) { ?> @@ -55,7 +55,7 @@ - + print) { if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) { @@ -63,7 +63,7 @@ } } else { if ($useDefList) { - echo HTMLHelper::_('icon.print_screen', $this->item, $params, ['class' => 'uk-button uk-button-link', 'data-uk-tooltip' => Text::sprintf('JGLOBAL_PRINT_TITLE', $this->item->title)]); + echo HTMLHelper::_('icon.print_screen', $this->item, $params, ['class' => 'uk-button uk-button-link', 'data-uk-tooltip' => str_replace(['<', '>'], ['«', '»'], Text::sprintf('JGLOBAL_PRINT_TITLE', $this->item->title))]); } } @@ -83,7 +83,7 @@ item->publish_down) < strtotime(Factory::getDate())) && $this->item->publish_down != Factory::getDbo()->getNullDate()) { ?>
    - + - + get('show_tags', 1) && !empty($this->item->tags->itemTags)) { @@ -119,7 +119,7 @@ echo $this->item->toc; } ?> - +
    item->text; ?>
    @@ -147,7 +147,7 @@ elseif ($params->get('show_noauth') == true && $user->get('guest')) { echo LayoutHelper::render('joomla.content.intro_image', $this->item); echo HTMLHelper::_('content.prepare', $this->item->introtext); - + // Optional link to let them register to see the whole article. if ($params->get('show_readmore') && $this->item->fulltext != null) { $menu = Factory::getApplication()->getMenu(); @@ -183,7 +183,7 @@ if (!empty($this->item->pagination) && $this->item->pagination && $this->item->paginationposition && $this->item->paginationrelative) { echo $this->item->pagination; } - + // Content is generated by content plugin event "onContentAfterDisplay" echo $this->item->event->afterDisplayContent; ?> diff --git a/html/com_content/article/default_links.php b/html/com_content/article/default_links.php index 795114e..3a0e749 100644 --- a/html/com_content/article/default_links.php +++ b/html/com_content/article/default_links.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_content - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -35,10 +35,10 @@ if (!$link) { continue; } - + // If no label is present, take the link $label = $label ? : $link; - + // If no target is present, use the default $target = $target ? : $params->get('target' . $id); diff --git a/html/com_content/categories/default.php b/html/com_content/categories/default.php index 5e355a9..ee1ed90 100644 --- a/html/com_content/categories/default.php +++ b/html/com_content/categories/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_content - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/com_content/categories/default_items.php b/html/com_content/categories/default_items.php index 36f2340..8727215 100644 --- a/html/com_content/categories/default_items.php +++ b/html/com_content/categories/default_items.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_content - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -21,19 +21,19 @@ ?>
  • escape($item->title); ?> - + params->get('show_cat_num_articles_cat') == 1) { ?> numitems; ?> - + getChildren()) > 0 && $this->maxLevelcat > 1) { ?> - + params->get('show_description_image') && $item->getParams()->get('image')) { ?> - <?php echo htmlspecialchars($item->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8'); ?> + <?php echo htmlspecialchars($item->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8'); ?> - + params->get('show_subcat_desc_cat') == 1 && $item->description) { ?>
    description, '', 'com_content.categories'); ?> diff --git a/html/com_content/category/blog.php b/html/com_content/category/blog.php index 3ed2b8c..0a19318 100644 --- a/html/com_content/category/blog.php +++ b/html/com_content/category/blog.php @@ -1,8 +1,8 @@ -
    - + params->get( 'show_page_heading' ) ) { ?>

    escape( $this->params->get( 'page_heading' ) ); ?>

    params->get( 'show_description_image' ) && $this->category->getParams()->get( 'image' ) ) { ?> - <?php echo htmlspecialchars( $this->category->getParams()->get( 'image_alt' ), ENT_COMPAT, 'UTF-8' ); ?> + <?php echo htmlspecialchars( $this->category->getParams()->get( 'image_alt' ), ENT_COMPAT, 'UTF-8' ); ?> lead_items ) ) { @@ -123,13 +123,13 @@
    link_items ) ) { echo $this->loadTemplate( 'links' ); } - + if ( $this->maxLevel != 0 && !empty( $this->children[$this->category->id] ) ) { ?> @@ -143,7 +143,7 @@ ?>
    - + params->def( 'show_pagination', 2 ) == 1 || ( $this->params->get( 'show_pagination' ) == 2 ); $show_pagination_results = $this->params->def( 'show_pagination_results', 1 ); @@ -154,11 +154,11 @@
    pagination->getPagesLinks(); ?>
    - +
    pagination->getPagesCounter(); ?>
    - +
    diff --git a/html/com_content/category/blog_children.php b/html/com_content/category/blog_children.php index cf2ee20..fbb8c1d 100644 --- a/html/com_content/category/blog_children.php +++ b/html/com_content/category/blog_children.php @@ -1,8 +1,8 @@ -getAuthorisedViewLevels(); -if ( count( $this->children[$this->category->id] ) > 0 ) +if ( count( $this->children[$this->category->id] ) > 0 ) { ?>
    • - + - + params->get( 'list_show_date' ) ) { ?> - + params->get( 'list_show_author' ) ) { ?> - + params->get( 'list_show_hits' ) ) { ?> - + params->get( 'list_show_votes', 0 ) && $this->vote ) { ?> - + params->get( 'list_show_ratings', 0 ) && $this->vote ) { ?> - + - + items as $i => $article ) { ?> - + - + - + params->get( 'list_show_date' ) ) { ?> - + params->get( 'list_show_author', 1 ) ) { ?> - + params->get( 'list_show_hits', 1 ) ) { ?> - + params->get( 'list_show_votes', 0 ) && $this->vote ) { ?> - + params->get( 'list_show_ratings', 0 ) && $this->vote ) { ?> - + diff --git a/html/com_content/category/default_children.php b/html/com_content/category/default_children.php index 141432c..9d23b9a 100644 --- a/html/com_content/category/default_children.php +++ b/html/com_content/category/default_children.php @@ -1,8 +1,8 @@ -getAuthorisedViewLevels() ; -if ( count( $this->children[$this->category->id] ) > 0 ) +if ( count( $this->children[$this->category->id] ) > 0 ) { ?>
    @@ -107,7 +107,7 @@ params->get('show_country_headings')) { ?> country; ?>
    <
    access, $this->user->getAuthorisedViewLevels() ) ) @@ -181,7 +181,7 @@ } } } - + if ( $article->state == 0 ) { ?> @@ -202,11 +202,11 @@ } ?> displayDate, $this->escape( $this->params->get( 'date_format', Text::_( 'd.m.Y' ) ) ) ); ?> hits; ?> rating_count ); ?> rating ); ?> params->get( 'access-edit' ) ) { echo HTMLHelper::_( 'icon.edit', $article, $params, ['class' => 'uk-button uk-button-link', 'data-uk-tooltip' => Text::_( 'JGLOBAL_EDIT_TITLE' ) ] ); } ?>
    - + params->get('show_headings')) { ?> @@ -61,21 +70,21 @@ - + items as $i => $item) { $class = $item->core_state != 0 ? : ' class="uk-text-muted"'; ?> > - + - + params->get('tag_list_show_date')) { ?> @@ -84,7 +93,7 @@
    escape($item->core_title); ?> core_state == 0) { ?> displayDate, $this->escape($this->params->get('date_format', Text::_('d.m.Y')))); ?>
    - + items) && ($this->pagination->pagesTotal > 1)) { diff --git a/html/com_tags/tags/default.php b/html/com_tags/tags/default.php index 7dca2de..d533d7e 100644 --- a/html/com_tags/tags/default.php +++ b/html/com_tags/tags/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_tags - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -18,7 +18,7 @@ ?>
    - + params->get('show_page_heading')) { ?>

    escape($this->params->get('page_heading')); ?>

    params->get('all_tags_show_description_image') && !empty($descriptionImage)) { ?> -
    +
    loadTemplate('items'); ?> diff --git a/html/com_tags/tags/default_items.php b/html/com_tags/tags/default_items.php index 95e7621..ec1de24 100644 --- a/html/com_tags/tags/default_items.php +++ b/html/com_tags/tags/default_items.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_tags - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -19,6 +19,10 @@ HTMLHelper::_('behavior.caption'); HTMLHelper::_('behavior.core'); +JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); +$templateConfig = \Master3Config::getInstance(); +$jsIcons = $templateConfig->params->get('jsIcons', 'none'); + $user = Factory::getUser(); $canEdit = $user->authorise('core.edit', 'com_tags'); @@ -53,15 +57,20 @@
    params->get('filter_field')) { ?>
    - - - + + + + + + + +
    params->get('show_pagination_limit')) { echo '
    '; - + $limits = []; for ($i = 5; $i <= 30; $i += 5) { $limits[] = HTMLHelper::_('select.option', "$i"); @@ -69,21 +78,21 @@ $limits[] = HTMLHelper::_('select.option', '50', Text::_('J50')); $limits[] = HTMLHelper::_('select.option', '100', Text::_('J100')); $limits[] = HTMLHelper::_('select.option', '0', Text::_('JALL')); - + $selected = filter_input(INPUT_POST, 'limit', FILTER_SANITIZE_NUMBER_INT); if (!isset($selected)) { $selected = 0; } echo HTMLHelper::_('select.genericlist', $limits, $this->prefix . 'limit', 'class="uk-select uk-form-width-mini uk-form-small" onchange="this.form.submit()"', 'value', 'text', $selected); - + echo '
    '; } ?> - - - - + + + +
    1 ? - '
    ' : + + echo $columns > 1 ? + '
    ' : '
      '; $itemHtmlTag = $columns > 1 ? 'div' : 'li'; - + foreach ($this->items as $i => $item) { if ((!empty($item->access)) && in_array($item->access, $this->user->getAuthorisedViewLevels())) { echo '<' . $itemHtmlTag . '>'; @@ -122,7 +131,8 @@ ?> src="image_intro; ?>" alt="image_intro_alt); ?>" - /> + loading="lazy" + >
    @@ -134,7 +144,7 @@ description) { ?> description, $this->params->get('all_tags_tag_maximum_characters')); ?> - + (hits); ?>) @@ -150,7 +160,7 @@ if (!empty($this->items)) { $show_pagination = $this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2); $show_pagination_results = $this->params->def('show_pagination_results', 1); - + if ($show_pagination && ($this->pagination->pagesTotal > 1)) { ?>
    diff --git a/html/com_users/login/default.php b/html/com_users/login/default.php index dc4bd56..6d59e37 100644 --- a/html/com_users/login/default.php +++ b/html/com_users/login/default.php @@ -2,16 +2,14 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $denyUserAuthorization = $templateConfig->getDUA(); if (!$denyUserAuthorization) { @@ -26,4 +24,4 @@ echo $this->loadTemplate('logout'); } -} \ No newline at end of file +} diff --git a/html/com_users/login/default_login.php b/html/com_users/login/default_login.php index 7bae829..0c75d4c 100644 --- a/html/com_users/login/default_login.php +++ b/html/com_users/login/default_login.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,7 +16,7 @@ ?>
    - + params->get('show_page_heading')) { ?>

    escape($this->params->get('page_heading')); ?>

    params->get('login_image') != '') { ?> - +
    - + form->getFieldset('credentials') as $field) { if (!$field->hidden) { ?>
    - form->setFieldAttribute($field->fieldname, 'hint', html_entity_decode(trim(strip_tags($field->label)))); echo $this->form->getField($field->fieldname)->input; ?> @@ -55,7 +55,7 @@ if ($this->tfa) { ?>
    - form->setFieldAttribute('secretkey', 'hint', html_entity_decode(trim(strip_tags($this->form->getField('secretkey')->label)))); echo $this->form->getField('secretkey')->input; ?> @@ -66,32 +66,32 @@ if (PluginHelper::isEnabled('system', 'remember')) { ?>
    - +
    - +
    form->getValue('return', '', $this->params->get('login_redirect_url', $this->params->get('login_redirect_menuitem'))); ?> - +
      - +
      • - +
      • - + get('allowUserRegistration')) { diff --git a/html/com_users/login/default_logout.php b/html/com_users/login/default_logout.php index 0f99b3f..71f38a4 100644 --- a/html/com_users/login/default_logout.php +++ b/html/com_users/login/default_logout.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,7 @@ ?>
      - + params->get('show_page_heading')) { ?>

      escape($this->params->get('page_heading')); ?>

      params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description')) != '') || $this->params->get('logout_image') != '') { ?>
      - + params->get('logoutdescription_show') == 1) { echo $this->params->get('logout_description'); @@ -32,17 +32,17 @@ if ($this->params->get('logout_image') != '') { ?> - <?php echo Text::_('COM_USER_LOGOUT_IMAGE_ALT'); ?> + <?php echo Text::_('COM_USER_LOGOUT_IMAGE_ALT'); ?>
      - +
      - - - + + +
      diff --git a/html/com_users/profile/default.php b/html/com_users/profile/default.php index 25c0ba6..2abe0af 100644 --- a/html/com_users/profile/default.php +++ b/html/com_users/profile/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,7 @@ ?>
      - + params->get('show_page_heading')) { ?>

      escape($this->params->get('page_heading')); ?>

      data->name; ?>
      - +
      data->username, ENT_COMPAT, 'UTF-8'); ?>
      data->registerDate, Text::_('d.m.Y')); ?>
      - +
      data->lastvisitDate != $this->db->getNullDate()) { ?>
      data->lastvisitDate, Text::_('d.m.Y')); ?>
      diff --git a/html/com_users/profile/default_custom.php b/html/com_users/profile/default_custom.php index 020e81e..036dbd3 100644 --- a/html/com_users/profile/default_custom.php +++ b/html/com_users/profile/default_custom.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/com_users/profile/default_params.php b/html/com_users/profile/default_params.php index cedaede..7bfed47 100644 --- a/html/com_users/profile/default_params.php +++ b/html/com_users/profile/default_params.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/com_users/profile/edit.php b/html/com_users/profile/edit.php index ded4394..a9d8d74 100644 --- a/html/com_users/profile/edit.php +++ b/html/com_users/profile/edit.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -22,10 +22,10 @@ ?>
      - + params->get('show_page_heading')) { ?>

      escape($this->params->get('page_heading')); ?>

      -
      - +
        form->getFieldsets() as $group => $fieldset) { @@ -64,7 +64,7 @@
      - +
      • - +
        @@ -143,7 +143,7 @@ twofactormethods, 'jform[twofactor][method]', ['class' => 'uk-select', 'onchange' => 'Joomla.twoFactorMethodChange()'], 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
      - +
      twofactorform as $form) { ?> otpConfig->method ? 'display: block' : 'display: none'; ?> @@ -154,11 +154,11 @@
      - +
      - + otpConfig->otep)) { ?>
    - +
    - - - + + + diff --git a/html/com_users/registration/complete.php b/html/com_users/registration/complete.php index a6fa8f8..22eb799 100644 --- a/html/com_users/registration/complete.php +++ b/html/com_users/registration/complete.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/com_users/registration/default.php b/html/com_users/registration/default.php index 9344412..e0b3957 100644 --- a/html/com_users/registration/default.php +++ b/html/com_users/registration/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,21 +13,19 @@ use Joomla\CMS\Router\Route; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $denyUserAuthorization = $templateConfig->getDUA(); if (!$denyUserAuthorization) { ?>
    - + params->get('show_page_heading')) { ?>

    escape($this->params->get('page_heading')); ?>

    - +
      form->getFieldsets() as $fieldset) { @@ -39,7 +37,7 @@ } ?>
    - +
      label); ?> " title="">
    - - + + diff --git a/html/com_users/remind/default.php b/html/com_users/remind/default.php index 1e77d43..d22d2b3 100644 --- a/html/com_users/remind/default.php +++ b/html/com_users/remind/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,19 +13,17 @@ use Joomla\CMS\Router\Route; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $denyUserAuthorization = $templateConfig->getDUA(); if (!$denyUserAuthorization) { ?>
    - + params->get('show_page_heading')) { ?>

    escape($this->params->get('page_heading')); ?>

    - +
    form->getFieldsets() as $fieldset) { @@ -59,13 +57,13 @@ } } ?> - +
    - +
    - +
    diff --git a/html/com_users/reset/complete.php b/html/com_users/reset/complete.php index 2c350bc..4138538 100644 --- a/html/com_users/reset/complete.php +++ b/html/com_users/reset/complete.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,19 +13,17 @@ use Joomla\CMS\Router\Route; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $denyUserAuthorization = $templateConfig->getDUA(); if (!$denyUserAuthorization) { ?>
    - + params->get('show_page_heading')) { ?>

    escape($this->params->get('page_heading')); ?>

    - +
    form->getFieldsets() as $fieldset) { @@ -59,13 +57,13 @@ } } ?> - +
    - +
    - +
    diff --git a/html/com_users/reset/confirm.php b/html/com_users/reset/confirm.php index 274f1e9..9fd6a91 100644 --- a/html/com_users/reset/confirm.php +++ b/html/com_users/reset/confirm.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,19 +13,17 @@ use Joomla\CMS\Router\Route; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $denyUserAuthorization = $templateConfig->getDUA(); if (!$denyUserAuthorization) { ?>
    - + params->get('show_page_heading')) { ?>

    escape($this->params->get('page_heading')); ?>

    - +
    form->getFieldsets() as $fieldset) { @@ -59,13 +57,13 @@ } } ?> - +
    - +
    - +
    diff --git a/html/com_users/reset/default.php b/html/com_users/reset/default.php index 9115dda..a262582 100644 --- a/html/com_users/reset/default.php +++ b/html/com_users/reset/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_users - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,19 +13,17 @@ use Joomla\CMS\Router\Route; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $denyUserAuthorization = $templateConfig->getDUA(); if (!$denyUserAuthorization) { ?>
    - + params->get('show_page_heading')) { ?>

    escape($this->params->get('page_heading')); ?>

    - +
    form->getFieldsets() as $fieldset) { @@ -59,13 +57,13 @@ } } ?> - +
    - +
    - +
    diff --git a/html/com_wrapper/wrapper/default.php b/html/com_wrapper/wrapper/default.php index cf728bb..fd3a063 100644 --- a/html/com_wrapper/wrapper/default.php +++ b/html/com_wrapper/wrapper/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_wrapper - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -17,7 +17,7 @@ ?>
    - + params->get('show_page_heading')) { ?>

    diff --git a/html/layouts/com_contact/field/render.php b/html/layouts/com_contact/field/render.php index e6bbf76..1dee5a8 100644 --- a/html/layouts/com_contact/field/render.php +++ b/html/layouts/com_contact/field/render.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/com_contact/fields/render.php b/html/layouts/com_contact/fields/render.php index 717870a..75daa41 100644 --- a/html/layouts/com_contact/fields/render.php +++ b/html/layouts/com_contact/fields/render.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_contact - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/html/layouts/com_contact/joomla/form/renderfield.php b/html/layouts/com_contact/joomla/form/renderfield.php index 0f10d67..ba2d350 100644 --- a/html/layouts/com_contact/joomla/form/renderfield.php +++ b/html/layouts/com_contact/joomla/form/renderfield.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/com_fields/field/render.php b/html/layouts/com_fields/field/render.php index a5f95ea..9994253 100644 --- a/html/layouts/com_fields/field/render.php +++ b/html/layouts/com_fields/field/render.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_fields - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -18,13 +18,18 @@ $label = Text::_($field->label); $value = $field->value; $showLabel = $field->params->get('showlabel'); +$class = $displayData['class']; if ($value == '') { return; } ?> - +
    + : - - + +
    +
    + +
    diff --git a/html/layouts/com_fields/fields/render.php b/html/layouts/com_fields/fields/render.php index 7df1949..72eddff 100644 --- a/html/layouts/com_fields/fields/render.php +++ b/html/layouts/com_fields/fields/render.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage com_fields - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -49,8 +49,6 @@ } $class = $field->params->get('render_class'); ?> -
    - $field)); ?> -
    + $field, 'class' => $class)); ?> diff --git a/html/layouts/com_users/joomla/form/renderfield.php b/html/layouts/com_users/joomla/form/renderfield.php index 56f82c2..298bbf6 100644 --- a/html/layouts/com_users/joomla/form/renderfield.php +++ b/html/layouts/com_users/joomla/form/renderfield.php @@ -4,7 +4,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -24,8 +24,8 @@ */ if (!empty($options['showonEnabled'])) { - HTMLHelper::_('jquery.framework'); - HTMLHelper::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true)); + HTMLHelper::_('jquery.framework'); + HTMLHelper::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true)); } $class = empty($options['class']) ? '' : ' ' . $options['class']; @@ -49,15 +49,15 @@ ?>
    > - -
    - - - -
    - -
    + +
    + + + +
    + +
    diff --git a/html/layouts/joomla/content/associations.php b/html/layouts/joomla/content/associations.php index 7f0506a..c4c9e97 100644 --- a/html/layouts/joomla/content/associations.php +++ b/html/layouts/joomla/content/associations.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -17,5 +17,5 @@
  • link; ?>
    • -get('show_category_title', 1)) { ?>

    title, '', $extension . '.category.title'); ?>

    - + get('show_description', 1) || $params->def('show_description_image', 1)) { echo '
    '; if ($params->get('show_description_image') && $category->getParams()->get('image')) { - echo '' . htmlspecialchars($category->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8') . ''; + echo '' . htmlspecialchars($category->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8') . ''; } echo $beforeDisplayContent; diff --git a/html/layouts/joomla/content/full_image.php b/html/layouts/joomla/content/full_image.php index 119b7c9..2a1fea1 100644 --- a/html/layouts/joomla/content/full_image.php +++ b/html/layouts/joomla/content/full_image.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -19,7 +19,7 @@
    image_fulltext_caption) { echo 'class="caption" title="' . htmlspecialchars($images->image_fulltext_caption, ENT_COMPAT, 'UTF-8') . '"'; - } ?> src="image_fulltext, ENT_COMPAT, 'UTF-8'); ?>" alt="" itemprop="image"/> + } ?> src="image_fulltext, ENT_COMPAT, 'UTF-8'); ?>" alt="" itemprop="image" loading="lazy">
    get('show_print_icon') || $displayData['params']->get('show_email_icon')) { if ($displayData['params']->get('show_print_icon')) { - echo HTMLHelper::_('icon.print_popup', $displayData['item'], $displayData['params'], ['class' => 'uk-button uk-button-link uk-margin-small-right', 'data-uk-tooltip' => Text::sprintf('JGLOBAL_PRINT_TITLE', $displayData['item']->title)]); + echo HTMLHelper::_('icon.print_popup', $displayData['item'], $displayData['params'], ['class' => 'uk-button uk-button-link uk-margin-small-right', 'data-uk-tooltip' => str_replace(['<', '>'], ['«', '»'], Text::sprintf('JGLOBAL_PRINT_TITLE', $displayData['item']->title))]); } if ($displayData['params']->get('show_email_icon')) { @@ -32,7 +32,7 @@ } } } else { - echo HTMLHelper::_('icon.print_screen', $displayData['item'], $displayData['params'], ['class' => 'uk-button uk-button-link', 'data-uk-tooltip' => Text::sprintf('JGLOBAL_PRINT_TITLE', $displayData['item']->title)]); + echo HTMLHelper::_('icon.print_screen', $displayData['item'], $displayData['params'], ['class' => 'uk-button uk-button-link', 'data-uk-tooltip' => str_replace(['<', '>'], ['«', '»'], Text::sprintf('JGLOBAL_PRINT_TITLE', $displayData['item']->title))]); } ?>
    diff --git a/html/layouts/joomla/content/icons/create.php b/html/layouts/joomla/content/icons/create.php index 17358d2..d9a21ce 100644 --- a/html/layouts/joomla/content/icons/create.php +++ b/html/layouts/joomla/content/icons/create.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,9 +11,7 @@ use Joomla\CMS\Language\Text; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); -echo ($jsIcons !== 'none' ? '' : trim(Text::_('JNEW'))); +echo ($jsIcons !== 'none' ? '' : trim(Text::_('JNEW'))); diff --git a/html/layouts/joomla/content/icons/edit.php b/html/layouts/joomla/content/icons/edit.php index 7dc6a4f..d7af4ac 100644 --- a/html/layouts/joomla/content/icons/edit.php +++ b/html/layouts/joomla/content/icons/edit.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,9 +11,7 @@ use Joomla\CMS\Language\Text; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); -echo ($jsIcons !== 'none' ? '' : trim(Text::_('JGLOBAL_EDIT'))); +echo ($jsIcons !== 'none' ? '' : trim(Text::_('JGLOBAL_EDIT'))); diff --git a/html/layouts/joomla/content/icons/edit_lock.php b/html/layouts/joomla/content/icons/edit_lock.php index 5a43560..83b0a95 100644 --- a/html/layouts/joomla/content/icons/edit_lock.php +++ b/html/layouts/joomla/content/icons/edit_lock.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,9 +11,7 @@ use Joomla\CMS\Language\Text; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); -echo ($jsIcons !== 'none' ? '' : trim(Text::_('JLIB_HTML_CHECKED_OUT'))); +echo ($jsIcons !== 'none' ? '' : trim(Text::_('JLIB_HTML_CHECKED_OUT'))); diff --git a/html/layouts/joomla/content/icons/email.php b/html/layouts/joomla/content/icons/email.php index 37000a0..353309b 100644 --- a/html/layouts/joomla/content/icons/email.php +++ b/html/layouts/joomla/content/icons/email.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,9 +11,7 @@ use Joomla\CMS\Language\Text; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); -echo ($jsIcons !== 'none' ? '' : trim(Text::_('JGLOBAL_EMAIL'))); +echo ($jsIcons !== 'none' ? '' : trim(Text::_('JGLOBAL_EMAIL'))); diff --git a/html/layouts/joomla/content/icons/print_popup.php b/html/layouts/joomla/content/icons/print_popup.php index 7d6b546..4e23f65 100644 --- a/html/layouts/joomla/content/icons/print_popup.php +++ b/html/layouts/joomla/content/icons/print_popup.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,9 +11,7 @@ use Joomla\CMS\Language\Text; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); -echo ($jsIcons !== 'none' ? '' : trim(Text::_('JGLOBAL_PRINT'))); +echo ($jsIcons !== 'none' ? '' : trim(Text::_('JGLOBAL_PRINT'))); diff --git a/html/layouts/joomla/content/icons/print_screen.php b/html/layouts/joomla/content/icons/print_screen.php index 7d6b546..4e23f65 100644 --- a/html/layouts/joomla/content/icons/print_screen.php +++ b/html/layouts/joomla/content/icons/print_screen.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,9 +11,7 @@ use Joomla\CMS\Language\Text; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); -echo ($jsIcons !== 'none' ? '' : trim(Text::_('JGLOBAL_PRINT'))); +echo ($jsIcons !== 'none' ? '' : trim(Text::_('JGLOBAL_PRINT'))); diff --git a/html/layouts/joomla/content/info_block.php b/html/layouts/joomla/content/info_block.php index 5fcf5a1..ccbebeb 100644 --- a/html/layouts/joomla/content/info_block.php +++ b/html/layouts/joomla/content/info_block.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,11 +13,13 @@ $blockPosition = $displayData['params']->get('info_block_position', 0); ?> -
    +
    get('info_block_show_title', 1)) echo '
    ' . Text::_('COM_CONTENT_ARTICLE_INFO') . '
    '; + if ($displayData['params']->get('info_block_show_title', 1)) { + echo '
    ' . Text::_('COM_CONTENT_ARTICLE_INFO') . '
    '; + } if ($displayData['params']->get('show_author') && !empty($displayData['item']->author)) { echo $this->sublayout('author', $displayData); @@ -56,4 +58,4 @@ } } ?> -
    \ No newline at end of file +
    diff --git a/html/layouts/joomla/content/info_block/associations.php b/html/layouts/joomla/content/info_block/associations.php index 5679993..df81c28 100644 --- a/html/layouts/joomla/content/info_block/associations.php +++ b/html/layouts/joomla/content/info_block/associations.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,6 @@ use Joomla\CMS\Filesystem\Path; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateName = \Master3Config::getTemplateName(); if (!empty($displayData['item']->associations)) { diff --git a/html/layouts/joomla/content/info_block/author.php b/html/layouts/joomla/content/info_block/author.php index 59c08d7..8c76a51 100644 --- a/html/layouts/joomla/content/info_block/author.php +++ b/html/layouts/joomla/content/info_block/author.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,9 +12,7 @@ use Joomla\CMS\HTML\HTMLHelper; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); ?> diff --git a/html/layouts/joomla/content/info_block/block.php b/html/layouts/joomla/content/info_block/block.php index 840cd29..5d27de1 100644 --- a/html/layouts/joomla/content/info_block/block.php +++ b/html/layouts/joomla/content/info_block/block.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/joomla/content/info_block/category.php b/html/layouts/joomla/content/info_block/category.php index 475c8a3..f9bd095 100644 --- a/html/layouts/joomla/content/info_block/category.php +++ b/html/layouts/joomla/content/info_block/category.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,9 +12,7 @@ use Joomla\CMS\Router\Route; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); ?> @@ -31,4 +29,4 @@ echo Text::sprintf('COM_CONTENT_CATEGORY', '' . $title . ''); } ?> - \ No newline at end of file + diff --git a/html/layouts/joomla/content/info_block/create_date.php b/html/layouts/joomla/content/info_block/create_date.php index 6c1502c..2141875 100644 --- a/html/layouts/joomla/content/info_block/create_date.php +++ b/html/layouts/joomla/content/info_block/create_date.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,9 +12,7 @@ use Joomla\CMS\HTML\HTMLHelper; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); ?> @@ -27,4 +25,4 @@ - \ No newline at end of file + diff --git a/html/layouts/joomla/content/info_block/hits.php b/html/layouts/joomla/content/info_block/hits.php index d177aea..d78109f 100644 --- a/html/layouts/joomla/content/info_block/hits.php +++ b/html/layouts/joomla/content/info_block/hits.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,9 +11,7 @@ use Joomla\CMS\Language\Text; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); ?> @@ -25,4 +23,4 @@ ?> hits); ?> - \ No newline at end of file + diff --git a/html/layouts/joomla/content/info_block/modify_date.php b/html/layouts/joomla/content/info_block/modify_date.php index ad0a0e8..f3114a5 100644 --- a/html/layouts/joomla/content/info_block/modify_date.php +++ b/html/layouts/joomla/content/info_block/modify_date.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,9 +12,7 @@ use Joomla\CMS\HTML\HTMLHelper; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); ?> @@ -27,4 +25,4 @@ - \ No newline at end of file + diff --git a/html/layouts/joomla/content/info_block/parent_category.php b/html/layouts/joomla/content/info_block/parent_category.php index 97568a8..19ef3ac 100644 --- a/html/layouts/joomla/content/info_block/parent_category.php +++ b/html/layouts/joomla/content/info_block/parent_category.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,14 +12,12 @@ use Joomla\CMS\Router\Route; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); ?>
    - ' : ''; $title = $this->escape($displayData['item']->parent_title); if ($displayData['params']->get('link_parent_category') && !empty($displayData['item']->parent_slug)) { @@ -29,4 +27,4 @@ echo Text::sprintf('COM_CONTENT_PARENT', '' . $icon . $title . ''); } ?> -
    \ No newline at end of file + diff --git a/html/layouts/joomla/content/info_block/publish_date.php b/html/layouts/joomla/content/info_block/publish_date.php index d57dea9..ea71b1e 100644 --- a/html/layouts/joomla/content/info_block/publish_date.php +++ b/html/layouts/joomla/content/info_block/publish_date.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,9 +12,7 @@ use Joomla\CMS\HTML\HTMLHelper; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); - $jsIcons = $templateConfig->params->get('jsIcons', 'none'); ?> @@ -27,4 +25,4 @@ - \ No newline at end of file + diff --git a/html/layouts/joomla/content/intro_image.php b/html/layouts/joomla/content/intro_image.php index c162fe8..5febe4a 100644 --- a/html/layouts/joomla/content/intro_image.php +++ b/html/layouts/joomla/content/intro_image.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -23,11 +23,11 @@ image_intro_caption) { echo 'class="caption" title="' . htmlspecialchars($images->image_intro_caption) . '"'; - } ?> src="image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="" itemprop="thumbnailUrl"/> + } ?> src="image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="" itemprop="thumbnailUrl" loading="lazy"> image_intro_caption) { echo 'class="caption" title="' . htmlspecialchars($images->image_intro_caption, ENT_COMPAT, 'UTF-8') . '"'; - } ?> src="image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="" itemprop="thumbnailUrl"/> + } ?> src="image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="" itemprop="thumbnailUrl" loading="lazy">
    get('access-view')) { ?> - @@ -28,7 +28,7 @@ get('show_readmore_title', 0) != 0) { ?> title, $params->get('readmore_limit')); ?> - get('show_readmore_title', 0) == 0) { ?> diff --git a/html/layouts/joomla/content/tags.php b/html/layouts/joomla/content/tags.php index f39d92e..26d9dd6 100644 --- a/html/layouts/joomla/content/tags.php +++ b/html/layouts/joomla/content/tags.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -33,5 +33,5 @@ } ?> -params->get('jsIcons', 'none'); + extract($displayData); // Get some system objects. @@ -130,7 +134,7 @@ title="" - > + >' : '↓'; ?>
    diff --git a/html/layouts/joomla/form/field/checkboxes.php b/html/layouts/joomla/form/field/checkboxes.php index ce78bd2..55cf2f0 100644 --- a/html/layouts/joomla/form/field/checkboxes.php +++ b/html/layouts/joomla/form/field/checkboxes.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -52,7 +52,7 @@ * %3 - value * %4 = any other attributes */ -$format = ''; +$format = ''; // The alt option for Text::alt $alt = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name); diff --git a/html/layouts/joomla/form/field/color/advanced.php b/html/layouts/joomla/form/field/color/advanced.php index 9d7063d..4997054 100644 --- a/html/layouts/joomla/form/field/color/advanced.php +++ b/html/layouts/joomla/form/field/color/advanced.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright ( C ) 2005 - 2018 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright ( C ) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/joomla/form/field/color/simple.php b/html/layouts/joomla/form/field/color/simple.php index b29cf50..dffa622 100644 --- a/html/layouts/joomla/form/field/color/simple.php +++ b/html/layouts/joomla/form/field/color/simple.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright ( C ) 2005 - 2018 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright ( C ) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -57,7 +57,7 @@ HTMLHelper::_('script', 'system/color-field-init.min.js', ['version' => 'auto', 'relative' => true]); ?> id="" value="" /> + id="" value="" > diff --git a/html/layouts/joomla/form/field/file.php b/html/layouts/joomla/form/field/file.php index 3368a07..fd332fb 100644 --- a/html/layouts/joomla/form/field/file.php +++ b/html/layouts/joomla/form/field/file.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -55,14 +55,15 @@ $hint = isset($hint) && $hint ? $hint . ', ' . $maxSize : $maxSize; ?>
    - /> + + >
    diff --git a/html/layouts/joomla/form/field/hidden.php b/html/layouts/joomla/form/field/hidden.php index c820691..5712ac6 100644 --- a/html/layouts/joomla/form/field/hidden.php +++ b/html/layouts/joomla/form/field/hidden.php @@ -1,8 +1,8 @@ - - /> +> diff --git a/html/layouts/joomla/form/field/media.php b/html/layouts/joomla/form/field/media.php index fde4ecd..5fd2f3c 100644 --- a/html/layouts/joomla/form/field/media.php +++ b/html/layouts/joomla/form/field/media.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -101,10 +101,10 @@ break; } -echo ''; ?> -
    \ No newline at end of file +
    diff --git a/html/layouts/joomla/form/field/meter.php b/html/layouts/joomla/form/field/meter.php index b9ce57e..477485d 100644 --- a/html/layouts/joomla/form/field/meter.php +++ b/html/layouts/joomla/form/field/meter.php @@ -1,8 +1,8 @@ - $max ? $max : $value; ?> - \ No newline at end of file + diff --git a/html/layouts/joomla/form/field/moduleorder.php b/html/layouts/joomla/form/field/moduleorder.php index f9f249e..0025eb4 100644 --- a/html/layouts/joomla/form/field/moduleorder.php +++ b/html/layouts/joomla/form/field/moduleorder.php @@ -1,8 +1,8 @@ - 'auto', 'relative' => true, 'conditional' => 'lt IE 9')); ?> - /> +> diff --git a/html/layouts/joomla/form/field/password.php b/html/layouts/joomla/form/field/password.php index d12b30f..d79c167 100644 --- a/html/layouts/joomla/form/field/password.php +++ b/html/layouts/joomla/form/field/password.php @@ -1,8 +1,8 @@ - - /> +> diff --git a/html/layouts/joomla/form/field/radio.php b/html/layouts/joomla/form/field/radio.php index ac3372b..d1153eb 100644 --- a/html/layouts/joomla/form/field/radio.php +++ b/html/layouts/joomla/form/field/radio.php @@ -1,8 +1,8 @@ -'; +$format = ''; $alt = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name); ?>
    - /> +> diff --git a/html/layouts/joomla/form/field/subform/default.php b/html/layouts/joomla/form/field/subform/default.php index dad8163..cbacb8f 100644 --- a/html/layouts/joomla/form/field/subform/default.php +++ b/html/layouts/joomla/form/field/subform/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/joomla/form/field/subform/repeatable-table.php b/html/layouts/joomla/form/field/subform/repeatable-table.php index ce18969..c2f5e9f 100644 --- a/html/layouts/joomla/form/field/subform/repeatable-table.php +++ b/html/layouts/joomla/form/field/subform/repeatable-table.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php b/html/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php index 79e1f4b..83abdfa 100644 --- a/html/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php +++ b/html/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php @@ -2,13 +2,14 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + /** * Make thing clear * @var JForm $form The form instance for render the section @@ -18,6 +19,10 @@ */ extract($displayData); +JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); +$templateConfig = \Master3Config::getInstance(); +$jsIcons = $templateConfig->params->get('jsIcons', 'none'); + ?> @@ -29,10 +34,10 @@ ?>
    @@ -58,10 +63,16 @@ class="uk-type); ?>" -
    - - - +
    + + + + + + + + +
    diff --git a/html/layouts/joomla/form/field/subform/repeatable-table/section.php b/html/layouts/joomla/form/field/subform/repeatable-table/section.php index 062a884..1eb8080 100644 --- a/html/layouts/joomla/form/field/subform/repeatable-table/section.php +++ b/html/layouts/joomla/form/field/subform/repeatable-table/section.php @@ -2,13 +2,14 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + /** * Make thing clear * @var JForm $form The form instance for render the section @@ -18,6 +19,10 @@ */ extract($displayData); +JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); +$templateConfig = \Master3Config::getInstance(); +$jsIcons = $templateConfig->params->get('jsIcons', 'none'); + ?> @@ -26,10 +31,10 @@ type) === 'checkbox') { ?>
    @@ -54,10 +59,16 @@ class="uk-type); ?>" -
    - - - +
    + + + + + + + + +
    diff --git a/html/layouts/joomla/form/field/subform/repeatable.php b/html/layouts/joomla/form/field/subform/repeatable.php index 6d3b66c..8b3cae2 100644 --- a/html/layouts/joomla/form/field/subform/repeatable.php +++ b/html/layouts/joomla/form/field/subform/repeatable.php @@ -2,13 +2,14 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; use Joomla\CMS\HTML\HTMLHelper; + /** * Make thing clear * @var JForm $tmpl The Empty form for template @@ -25,6 +26,10 @@ */ extract($displayData); +JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); +$templateConfig = \Master3Config::getInstance(); +$jsIcons = $templateConfig->params->get('jsIcons', 'none'); + if (!$buttons['add'] && !$buttons['remove'] && !$buttons['move']) { $buttons = []; } @@ -43,7 +48,7 @@ data-bt-add="a.group-add" data-bt-remove="a.group-remove" data-bt-move="a.group-move" data-repeatable-element="div.subform-repeatable-group" data-minimum="" data-maximum=""> - + ' : Text::_('JGLOBAL_FIELD_ADD'); ?> $form) { diff --git a/html/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php b/html/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php index e99bd9a..88958f0 100644 --- a/html/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php +++ b/html/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php @@ -2,13 +2,14 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + /** * Make thing clear * @var JForm $form The form instance for render the section @@ -18,15 +19,25 @@ */ extract($displayData); +JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); +$templateConfig = \Master3Config::getInstance(); +$jsIcons = $templateConfig->params->get('jsIcons', 'none'); + ?>
    - - - + + + + + + + + +
    @@ -40,7 +51,7 @@ label); ?> getFieldset($fieldset->name) as $field) { echo $field->renderField(); } diff --git a/html/layouts/joomla/form/field/subform/repeatable/section.php b/html/layouts/joomla/form/field/subform/repeatable/section.php index d2721fc..25db05f 100644 --- a/html/layouts/joomla/form/field/subform/repeatable/section.php +++ b/html/layouts/joomla/form/field/subform/repeatable/section.php @@ -2,13 +2,14 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + /** * Make thing clear * @var JForm $form The form instance for render the section @@ -18,20 +19,30 @@ */ extract($displayData); +JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); +$templateConfig = \Master3Config::getInstance(); +$jsIcons = $templateConfig->params->get('jsIcons', 'none'); + ?>
    - - - + + + + + + + + +
    getGroup('') as $field) { echo $field->renderField(); } diff --git a/html/layouts/joomla/form/field/tel.php b/html/layouts/joomla/form/field/tel.php index b1a6d90..e71e016 100644 --- a/html/layouts/joomla/form/field/tel.php +++ b/html/layouts/joomla/form/field/tel.php @@ -1,8 +1,8 @@ - - id="" value="" /> + id="" value="" > diff --git a/html/layouts/joomla/form/field/text.php b/html/layouts/joomla/form/field/text.php index a4216df..7000ac3 100644 --- a/html/layouts/joomla/form/field/text.php +++ b/html/layouts/joomla/form/field/text.php @@ -1,8 +1,8 @@ - - value="" /> + value="" > diff --git a/html/layouts/joomla/form/field/textarea.php b/html/layouts/joomla/form/field/textarea.php index 005c17f..d6fbe8a 100644 --- a/html/layouts/joomla/form/field/textarea.php +++ b/html/layouts/joomla/form/field/textarea.php @@ -1,8 +1,8 @@ - - name="" id="" value="" /> + name="" id="" value="" > diff --git a/html/layouts/joomla/form/field/user.php b/html/layouts/joomla/form/field/user.php index a7125e2..3c02a98 100644 --- a/html/layouts/joomla/form/field/user.php +++ b/html/layouts/joomla/form/field/user.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,6 +13,10 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper; +JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); +$templateConfig = \Master3Config::getInstance(); +$jsIcons = $templateConfig->params->get('jsIcons', 'none'); + extract($displayData); /** * Layout variables @@ -89,13 +93,13 @@ ?>
    - readonly /> + readonly> ', $anchorAttributes); + echo HTMLHelper::_('link', (string)$uri, $jsIcons ? '' : '↓', $anchorAttributes); } ?>
    - + - +
    diff --git a/html/layouts/joomla/pagination/list.php b/html/layouts/joomla/pagination/list.php index eefa084..5318973 100644 --- a/html/layouts/joomla/pagination/list.php +++ b/html/layouts/joomla/pagination/list.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/joomla/system/message.php b/html/layouts/joomla/system/message.php index 4d9d6f5..1c35c18 100644 --- a/html/layouts/joomla/system/message.php +++ b/html/layouts/joomla/system/message.php @@ -2,20 +2,18 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('JPATH_BASE') or die; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $templateConfig = \Master3Config::getInstance(); +$type = $templateConfig->params->get('systemmsg', 'alert'); $msgList = $displayData['msgList']; -$type = $templateConfig->params->get('systemmsg', 'alert'); - echo '
    '; include realpath(__DIR__ . ($type == 'alert' ? '/message_alert.php' : '/message_notification.php')); -echo '
    '; \ No newline at end of file +echo '
    '; diff --git a/html/layouts/joomla/system/message_alert.php b/html/layouts/joomla/system/message_alert.php index f2c74aa..4e4a433 100644 --- a/html/layouts/joomla/system/message_alert.php +++ b/html/layouts/joomla/system/message_alert.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/joomla/system/message_notification.php b/html/layouts/joomla/system/message_notification.php index 239e8d4..ba7b0e5 100644 --- a/html/layouts/joomla/system/message_notification.php +++ b/html/layouts/joomla/system/message_notification.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -46,4 +46,4 @@ $buffer[] = ''; } -echo implode("\n", $buffer); \ No newline at end of file +echo implode("\n", $buffer); diff --git a/html/layouts/libraries/cms/html/bootstrap/addtab.php b/html/layouts/libraries/cms/html/bootstrap/addtab.php index 6db12d5..3e78e8e 100644 --- a/html/layouts/libraries/cms/html/bootstrap/addtab.php +++ b/html/layouts/libraries/cms/html/bootstrap/addtab.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/libraries/cms/html/bootstrap/addtabscript.php b/html/layouts/libraries/cms/html/bootstrap/addtabscript.php index 6fa54de..13c6772 100644 --- a/html/layouts/libraries/cms/html/bootstrap/addtabscript.php +++ b/html/layouts/libraries/cms/html/bootstrap/addtabscript.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/libraries/cms/html/bootstrap/endtab.php b/html/layouts/libraries/cms/html/bootstrap/endtab.php index 92dfb44..5a6fbaf 100644 --- a/html/layouts/libraries/cms/html/bootstrap/endtab.php +++ b/html/layouts/libraries/cms/html/bootstrap/endtab.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -10,4 +10,4 @@ ?> -
    \ No newline at end of file +
    diff --git a/html/layouts/libraries/cms/html/bootstrap/endtabset.php b/html/layouts/libraries/cms/html/bootstrap/endtabset.php index cccdf47..8db1ab7 100644 --- a/html/layouts/libraries/cms/html/bootstrap/endtabset.php +++ b/html/layouts/libraries/cms/html/bootstrap/endtabset.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -10,4 +10,4 @@ ?> - \ No newline at end of file + diff --git a/html/layouts/libraries/cms/html/bootstrap/starttabset.php b/html/layouts/libraries/cms/html/bootstrap/starttabset.php index aa1d2a8..94b1ddf 100644 --- a/html/layouts/libraries/cms/html/bootstrap/starttabset.php +++ b/html/layouts/libraries/cms/html/bootstrap/starttabset.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,4 +13,4 @@ ?>
      -
        \ No newline at end of file +
          diff --git a/html/layouts/libraries/cms/html/bootstrap/starttabsetscript.php b/html/layouts/libraries/cms/html/bootstrap/starttabsetscript.php index a168230..0e9016c 100644 --- a/html/layouts/libraries/cms/html/bootstrap/starttabsetscript.php +++ b/html/layouts/libraries/cms/html/bootstrap/starttabsetscript.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage Layout - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/plugins/system/privacyconsent/label.php b/html/layouts/plugins/system/privacyconsent/label.php index d12ec90..177bca0 100644 --- a/html/layouts/plugins/system/privacyconsent/label.php +++ b/html/layouts/plugins/system/privacyconsent/label.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage System.privacyconsent * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -68,11 +68,11 @@ // If a description is specified, use it to build a tooltip. if (!empty($description)) { - if ($text && $text !== $description) { - $label .= ' data-uk-tooltip="' . htmlspecialchars($description) . '"'; - } else { - $label .= ' data-uk-tooltip="' . HTMLHelper::_('tooltipText', trim($text, ':'), htmlspecialchars($description), 0) . '"'; - } + if ($text && $text !== $description) { + $label .= ' data-uk-tooltip="' . htmlspecialchars($description) . '"'; + } else { + $label .= ' data-uk-tooltip="' . HTMLHelper::_('tooltipText', trim($text, ':'), htmlspecialchars($description), 0) . '"'; + } } $attribs = []; @@ -80,10 +80,10 @@ $attribs['rel'] = '{handler: \'iframe\', size: {x:800, y:500}}'; if ($article) { - $link = HTMLHelper::_('link', Route::_($article->link . '&tmpl=component'), $text, $attribs); - } else { - $link = $text; - } + $link = HTMLHelper::_('link', Route::_($article->link . '&tmpl=component'), $text, $attribs); + } else { + $link = $text; + } // Add the label text and closing tag. $label .= '>' . $link . ' *'; diff --git a/html/layouts/plugins/system/privacyconsent/message.php b/html/layouts/plugins/system/privacyconsent/message.php index bff5f55..44f75bc 100644 --- a/html/layouts/plugins/system/privacyconsent/message.php +++ b/html/layouts/plugins/system/privacyconsent/message.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage System.privacyconsent * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/plugins/user/profile/fields/dob.php b/html/layouts/plugins/user/profile/fields/dob.php index e8257bd..ab68700 100644 --- a/html/layouts/plugins/user/profile/fields/dob.php +++ b/html/layouts/plugins/user/profile/fields/dob.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/layouts/plugins/user/terms/label.php b/html/layouts/plugins/user/terms/label.php index 3ccbf03..62b4d22 100644 --- a/html/layouts/plugins/user/terms/label.php +++ b/html/layouts/plugins/user/terms/label.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage User.terms * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -68,11 +68,11 @@ // If a description is specified, use it to build a tooltip. if (!empty($description)) { - if ($text && $text !== $description) { - $label .= ' data-uk-tooltip="' . htmlspecialchars($description) . '"'; - } else { - $label .= ' data-uk-tooltip="' . HTMLHelper::_('tooltipText', trim($text, ':'), htmlspecialchars($description), 0) . '"'; - } + if ($text && $text !== $description) { + $label .= ' data-uk-tooltip="' . htmlspecialchars($description) . '"'; + } else { + $label .= ' data-uk-tooltip="' . HTMLHelper::_('tooltipText', trim($text, ':'), htmlspecialchars($description), 0) . '"'; + } } $attribs = []; @@ -80,9 +80,9 @@ $attribs['rel'] = '{handler: \'iframe\', size: {x:800, y:500}}'; if ($article) { - $link = HTMLHelper::_('link', Route::_($article->link . '&tmpl=component'), $text, $attribs); + $link = HTMLHelper::_('link', Route::_($article->link . '&tmpl=component'), $text, $attribs); } else { - $link = $text; + $link = $text; } // Add the label text and closing tag. diff --git a/html/layouts/plugins/user/terms/message.php b/html/layouts/plugins/user/terms/message.php index cd7a681..19e0432 100644 --- a/html/layouts/plugins/user/terms/message.php +++ b/html/layouts/plugins/user/terms/message.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage User.terms * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_articles_archive/default.php b/html/mod_articles_archive/default.php index 753bcfd..a837cc4 100644 --- a/html/mod_articles_archive/default.php +++ b/html/mod_articles_archive/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_articles_archive - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_articles_categories/default.php b/html/mod_articles_categories/default.php index 4836974..b6f1589 100644 --- a/html/mod_articles_categories/default.php +++ b/html/mod_articles_categories/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_articles_categories - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_articles_categories/default_items.php b/html/mod_articles_categories/default_items.php index eb32d69..a53ffe5 100644 --- a/html/mod_articles_categories/default_items.php +++ b/html/mod_articles_categories/default_items.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_articles_categories - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_articles_category/default.php b/html/mod_articles_category/default.php index 11c5f1c..a003845 100644 --- a/html/mod_articles_category/default.php +++ b/html/mod_articles_category/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_articles_category - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_articles_latest/default.php b/html/mod_articles_latest/default.php index 547d4cf..c39df53 100644 --- a/html/mod_articles_latest/default.php +++ b/html/mod_articles_latest/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_articles_latest - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_articles_news/_item.php b/html/mod_articles_news/_item.php index 3cd968c..796c014 100644 --- a/html/mod_articles_news/_item.php +++ b/html/mod_articles_news/_item.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_articles_news - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -21,7 +21,7 @@ if ($params->get('img_intro_full') !== 'none' && !empty($item->imageSrc)) { echo '
          '; - echo '' . $item->imageAlt . ''; + echo '' . $item->imageAlt . ''; if (!empty($item->imageCaption)) { echo '
          ' . $item->imageCaption . '
          '; } diff --git a/html/mod_articles_news/default.php b/html/mod_articles_news/default.php index e3095dc..e30c36d 100644 --- a/html/mod_articles_news/default.php +++ b/html/mod_articles_news/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_articles_news - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_articles_news/horizontal.php b/html/mod_articles_news/horizontal.php index 6cf21a5..d1c4f46 100644 --- a/html/mod_articles_news/horizontal.php +++ b/html/mod_articles_news/horizontal.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_articles_news - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_articles_news/vertical.php b/html/mod_articles_news/vertical.php index e295291..a7126b7 100644 --- a/html/mod_articles_news/vertical.php +++ b/html/mod_articles_news/vertical.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_articles_news - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_articles_popular/default.php b/html/mod_articles_popular/default.php index 85294b3..a159d0e 100644 --- a/html/mod_articles_popular/default.php +++ b/html/mod_articles_popular/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_articles_popular - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_banners/default.php b/html/mod_banners/default.php index 8bd8219..ae1fb72 100644 --- a/html/mod_banners/default.php +++ b/html/mod_banners/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_banners - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -18,7 +18,7 @@
          -
          @@ -37,13 +37,13 @@ if (BannerHelper::isImage($imageurl)) { $name = htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8'); - + // Image based banner $baseurl = strpos($imageurl, 'http') === 0 ? '' : Uri::base(); $alt = $item->params->get('alt'); $alt = $alt ? : $item->name; $alt = $alt ? : Text::_('MOD_BANNERS_BANNER'); - $img = '' . $alt . ''; + $img = '' . $alt . ''; if ($item->clickurl) { // Wrap the banner in a link diff --git a/html/mod_custom/default.php b/html/mod_custom/default.php index d39392e..4d51181 100644 --- a/html/mod_custom/default.php +++ b/html/mod_custom/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_custom - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_custom/empty.php b/html/mod_custom/empty.php index 68039e9..0f5b526 100644 --- a/html/mod_custom/empty.php +++ b/html/mod_custom/empty.php @@ -2,11 +2,10 @@ /** * @package Joomla.Site * @subpackage mod_custom - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; echo $module->content; - diff --git a/html/mod_custom/webp.php b/html/mod_custom/webp.php index 4dca9cd..a6fea1b 100644 --- a/html/mod_custom/webp.php +++ b/html/mod_custom/webp.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_custom - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/html/mod_languages/default.php b/html/mod_languages/default.php index bdbac80..5e032d7 100644 --- a/html/mod_languages/default.php +++ b/html/mod_languages/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * @subpackage mod_languages - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -21,12 +21,12 @@ if ($params->get('dropdown', 0) && !$params->get('dropdownimage', 1)) { ?> - +
          @@ -84,7 +84,7 @@
      - +
      '], $module->content); -} \ No newline at end of file +} diff --git a/html/pagination.php b/html/pagination.php index a0ea04b..3e301f5 100644 --- a/html/pagination.php +++ b/html/pagination.php @@ -1,14 +1,17 @@ \n"; $html .= $list['pageslinks']; - $html .= "\n"; + $html .= "\n"; $html .= "\n"; return $html; } + /** * Renders the pagination list * @param array $list Array containing pagination information @@ -113,6 +119,7 @@ function pagination_list_render($list) return implode("\n", $html); } + /** * Renders an active item in the pagination block * @param PaginationObject $item The current pagination object @@ -121,37 +128,42 @@ function pagination_list_render($list) */ function pagination_item_active(&$item) { + $config = \Master3Config::getInstance(); + $jsIcons = $config->params->get('jsIcons', 'none'); + $cls = ''; $title = ''; + $name = ''; if ($item->text == Text::_('JNEXT')) { - $item->text = ''; + $item->text = $jsIcons !== 'none' ? '' : $item->text; $cls = "next"; $title = Text::_('JNEXT'); } else if ($item->text == Text::_('JPREV')) { - $item->text = ''; + $item->text = $jsIcons !== 'none' ? '' : $item->text; $cls = "previous"; $title = Text::_('JPREV'); } else if ($item->text == Text::_('JLIB_HTML_START')) { - $item->text = ''; + $item->text = $jsIcons !== 'none' ? '' : $item->text; $cls = "first"; $title = Text::_('JLIB_HTML_START'); } else if ($item->text == Text::_('JLIB_HTML_END')) { - $item->text = ''; + $item->text = $jsIcons !== 'none' ? '' : $item->text; $cls = "last"; $title = Text::_('JLIB_HTML_END'); + } else { + $name = ' name="' . Text::sprintf('JLIB_HTML_GOTO_PAGE', $item->text) . '"'; } if ($cls) { $cls = ' class="' . $cls . '"'; - } - - if ($cls) { + $name = ' name="' . $title . '"'; $title = ' data-uk-tooltip="' . $title . '"'; } - return '
    • ' . $item->text . '
      • '; + return '
    • ' . $item->text . '
      • '; } + /** * Renders an inactive item in the pagination block * @param PaginationObject $item The current pagination object diff --git a/html/plg_content_pagebreak/navigation.php b/html/plg_content_pagebreak/navigation.php index ca7d5bb..e9b5304 100644 --- a/html/plg_content_pagebreak/navigation.php +++ b/html/plg_content_pagebreak/navigation.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Content.pagebreak * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,22 +13,22 @@ ?> diff --git a/html/plg_content_pagebreak/toc.php b/html/plg_content_pagebreak/toc.php index 055749c..5221c5e 100644 --- a/html/plg_content_pagebreak/toc.php +++ b/html/plg_content_pagebreak/toc.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Content.pagebreak * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,18 +11,18 @@ ?>
      - -

      - + +

      + - +
      diff --git a/html/plg_content_pagenavigation/default.php b/html/plg_content_pagenavigation/default.php index 034ad1d..35d9f11 100644 --- a/html/plg_content_pagenavigation/default.php +++ b/html/plg_content_pagenavigation/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Plugin * @subpackage Content.pagenavigation - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -10,25 +10,33 @@ use Joomla\CMS\Factory; +JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); +$templateConfig = \Master3Config::getInstance(); +$jsIcons = $templateConfig->params->get('jsIcons', 'none'); + $lang = Factory::getLanguage(); ?>
      - - prev) { ?> -
    • - -
      • - - - next) { ?> -
    • - -
      • - + + prev) { ?> +
      + +
      + + + next) { ?> +
      + +
      +
      diff --git a/html/plg_content_vote/rating.php b/html/plg_content_vote/rating.php index 343c852..a154288 100644 --- a/html/plg_content_vote/rating.php +++ b/html/plg_content_vote/rating.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Content.vote * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -24,7 +24,7 @@ if ($context == 'com_content.categories') { - return; + return; } $rating = (int) $row->rating; @@ -38,22 +38,22 @@ for ($i = 0; $i < $rating; $i++) { - $img .= $starImageOn; + $img .= $starImageOn; } for ($i = $rating; $i < 5; $i++) { - $img .= $starImageOff; + $img .= $starImageOff; } ?>
      - - -

      - ' . $rating . '', '5'); ?> - - -

      - + + +

      + ' . $rating . '', '5'); ?> + + +

      +
      diff --git a/html/plg_content_vote/vote.php b/html/plg_content_vote/vote.php index cbbd1fa..23fbad2 100644 --- a/html/plg_content_vote/vote.php +++ b/html/plg_content_vote/vote.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Content.vote * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -32,18 +32,18 @@ for ($i = 1; $i < 6; $i++) { - $options[] = HTMLHelper::_('select.option', $i, Text::sprintf('PLG_VOTE_VOTE', $i)); + $options[] = HTMLHelper::_('select.option', $i, Text::sprintf('PLG_VOTE_VOTE', $i)); } ?>
      - - - 'uk-select uk-form-small uk-width-small'], 'value', 'text', '5', 'content_vote_' . (int) $row->id); ?> - - - - - - + + + 'uk-select uk-form-small uk-width-small'], 'value', 'text', '5', 'content_vote_' . (int) $row->id); ?> + + + + + +
      diff --git a/html/plg_fields_calendar/calendar.php b/html/plg_fields_calendar/calendar.php index 2e38456..3e9c4c5 100644 --- a/html/plg_fields_calendar/calendar.php +++ b/html/plg_fields_calendar/calendar.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Fields.Calendar * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -15,11 +15,11 @@ $value = $field->value; if ($value == '') { - return; + return; } if (is_array($value)) { - $value = implode(', ', $value); + $value = implode(', ', $value); } $formatString = $field->fieldparams->get('showtime', 0) ? 'd.m.Y H:i' : 'd.m.Y'; diff --git a/html/plg_fields_checkboxes/checkboxes.php b/html/plg_fields_checkboxes/checkboxes.php index 45898df..f076180 100644 --- a/html/plg_fields_checkboxes/checkboxes.php +++ b/html/plg_fields_checkboxes/checkboxes.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Fields.Checkboxes * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,7 @@ $fieldValue = $field->value; if ($fieldValue === '' || $fieldValue === null) { - return; + return; } $fieldValue = (array)$fieldValue; @@ -22,9 +22,9 @@ $options = $this->getOptionsFromField($field); foreach ($options as $value => $name) { - if (in_array((string)$value, $fieldValue)) { - $texts[] = Text::_($name); - } + if (in_array((string)$value, $fieldValue)) { + $texts[] = Text::_($name); + } } echo htmlentities(implode(', ', $texts)); diff --git a/html/plg_fields_color/color.php b/html/plg_fields_color/color.php index 2ad1f9f..b9e264c 100644 --- a/html/plg_fields_color/color.php +++ b/html/plg_fields_color/color.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Fields.Color * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,11 +12,11 @@ $value = $field->value; if ($value == '') { - return; + return; } if (is_array($value)) { - $value = htmlentities(implode(', ', $value)); + $value = htmlentities(implode(', ', $value)); } echo ' ' . $value; diff --git a/html/plg_fields_editor/editor.php b/html/plg_fields_editor/editor.php index 9a15f43..d802a57 100644 --- a/html/plg_fields_editor/editor.php +++ b/html/plg_fields_editor/editor.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Fields.Editor * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,7 @@ $value = $field->value; if ($value == '') { - return; + return; } echo HTMLHelper::_('content.prepare', $value); diff --git a/html/plg_fields_imagelist/imagelist.php b/html/plg_fields_imagelist/imagelist.php index e445049..d3b2bb6 100644 --- a/html/plg_fields_imagelist/imagelist.php +++ b/html/plg_fields_imagelist/imagelist.php @@ -3,21 +3,21 @@ * @package Joomla.Plugin * @subpackage Fields.Imagelist * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; if ($field->value == '') { - return; + return; } $class = $fieldParams->get('image_class'); if ($class) { - // space before, so if no class sprintf below works - $class = ' class="' . htmlentities($class, ENT_COMPAT, 'UTF-8', true) . '"'; + // space before, so if no class sprintf below works + $class = ' class="' . htmlentities($class, ENT_COMPAT, 'UTF-8', true) . '"'; } $value = (array)$field->value; @@ -25,28 +25,28 @@ $i = 1; foreach ($value as $path) { - if (!$path || $path == '-1') { - continue; - } - - if ($fieldParams->get('directory', '/') !== '/') { - $buffer .= sprintf( - '', - $fieldParams->get('directory'), - htmlentities($path, ENT_COMPAT, 'UTF-8', true), - $class, - ' alt="' . $field->label . ' – ' . $i . '"' - ); - } else { - $buffer .= sprintf( - '', - htmlentities($path, ENT_COMPAT, 'UTF-8', true), - $class, - ' alt="' . $field->label . ' – ' . $i . '"' - ); - } - - $i++; + if (!$path || $path == '-1') { + continue; + } + + if ($fieldParams->get('directory', '/') !== '/') { + $buffer .= sprintf( + '', + $fieldParams->get('directory'), + htmlentities($path, ENT_COMPAT, 'UTF-8', true), + $class, + ' alt="' . $field->label . ' – ' . $i . '"' + ); + } else { + $buffer .= sprintf( + '', + htmlentities($path, ENT_COMPAT, 'UTF-8', true), + $class, + ' alt="' . $field->label . ' – ' . $i . '"' + ); + } + + $i++; } echo $buffer; diff --git a/html/plg_fields_list/list.php b/html/plg_fields_list/list.php index 14572df..c8d5a4b 100644 --- a/html/plg_fields_list/list.php +++ b/html/plg_fields_list/list.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Fields.List * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,7 @@ $fieldValue = $field->value; if ($fieldValue == '') { - return; + return; } $fieldValue = (array)$fieldValue; @@ -22,9 +22,9 @@ $options = $this->getOptionsFromField($field); foreach ($options as $value => $name) { - if (in_array((string)$value, $fieldValue)) { - $texts[] = Text::_($name); - } + if (in_array((string)$value, $fieldValue)) { + $texts[] = Text::_($name); + } } diff --git a/html/plg_fields_media/media.php b/html/plg_fields_media/media.php index 4642a13..3b37ceb 100644 --- a/html/plg_fields_media/media.php +++ b/html/plg_fields_media/media.php @@ -3,36 +3,36 @@ * @package Joomla.Plugin * @subpackage Fields.Media * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; if ($field->value == '') { - return; + return; } $class = $fieldParams->get('image_class'); if ($class) { - $class = ' class="' . htmlentities($class, ENT_COMPAT, 'UTF-8', true) . '"'; + $class = ' class="' . htmlentities($class, ENT_COMPAT, 'UTF-8', true) . '"'; } $value = (array)$field->value; $buffer = ''; foreach ($value as $path) { - if (!$path) { - continue; - } - - $buffer .= sprintf( - '', - htmlentities($path, ENT_COMPAT, 'UTF-8', true), - $class, - ' alt="' . $field->label . '"' - ); + if (!$path) { + continue; + } + + $buffer .= sprintf( + '', + htmlentities($path, ENT_COMPAT, 'UTF-8', true), + $class, + ' alt="' . $field->label . '"' + ); } echo $buffer; diff --git a/html/plg_fields_radio/radio.php b/html/plg_fields_radio/radio.php index 7a8cc68..5b7caa9 100644 --- a/html/plg_fields_radio/radio.php +++ b/html/plg_fields_radio/radio.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Fields.Radio * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,7 @@ $value = $field->value; if ($value == '') { - return; + return; } $value = (array)$value; @@ -22,9 +22,9 @@ $options = $this->getOptionsFromField($field); foreach ($options as $optionValue => $optionText) { - if (in_array((string)$optionValue, $value)) { - $texts[] = Text::_($optionText); - } + if (in_array((string)$optionValue, $value)) { + $texts[] = Text::_($optionText); + } } diff --git a/html/plg_fields_repeatable/repeatable.php b/html/plg_fields_repeatable/repeatable.php index ae6457a..03652f8 100644 --- a/html/plg_fields_repeatable/repeatable.php +++ b/html/plg_fields_repeatable/repeatable.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Fields.Repeatable * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,34 +12,34 @@ $tmpFields = $field->fieldparams->get('fields'); $aFields = []; foreach ($tmpFields as $tmpField) { - $aFields[$tmpField->fieldname] = $tmpField->fieldtype; + $aFields[$tmpField->fieldname] = $tmpField->fieldtype; } $fieldValue = $field->value; if ($fieldValue === '') { - return; + return; } // Get the values $fieldValues = json_decode($fieldValue, true); if (empty($fieldValues)) { - return; + return; } $html = ''; diff --git a/html/plg_fields_sql/sql.php b/html/plg_fields_sql/sql.php index 667e2e4..624972c 100644 --- a/html/plg_fields_sql/sql.php +++ b/html/plg_fields_sql/sql.php @@ -4,7 +4,7 @@ * @package Joomla.Plugin * @subpackage Fields.Sql * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; @@ -14,7 +14,7 @@ $value = $field->value; if ($value == '') { - return; + return; } $db = Factory::getDbo(); @@ -22,11 +22,11 @@ $condition = ''; foreach ($value as $v) { - if (!$v) { - continue; - } + if (!$v) { + continue; + } - $condition .= ', ' . $db->q($v); + $condition .= ', ' . $db->q($v); } $query = $fieldParams->get('query', ''); @@ -35,19 +35,19 @@ $db->setQuery($query . ' having value in (' . trim($condition, ',') . ')'); try { - $items = $db->loadObjectlist(); + $items = $db->loadObjectlist(); } catch (\Exception $e) { - // If the query failed, we fetch all elements - $db->setQuery($query); - $items = $db->loadObjectlist(); + // If the query failed, we fetch all elements + $db->setQuery($query); + $items = $db->loadObjectlist(); } $texts = []; foreach ($items as $item) { - if (in_array($item->value, $value)) { - $texts[] = $item->text; - } + if (in_array($item->value, $value)) { + $texts[] = $item->text; + } } echo htmlentities(implode(', ', $texts)); diff --git a/html/plg_fields_textarea/textarea.php b/html/plg_fields_textarea/textarea.php index dd6c7d9..1655108 100644 --- a/html/plg_fields_textarea/textarea.php +++ b/html/plg_fields_textarea/textarea.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Fields.Textarea * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,7 @@ $value = $field->value; if ($value == '') { - return; + return; } echo HTMLHelper::_('content.prepare', $value); diff --git a/html/plg_fields_url/url.php b/html/plg_fields_url/url.php index e9b58de..dd85dc7 100644 --- a/html/plg_fields_url/url.php +++ b/html/plg_fields_url/url.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Fields.URL * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,18 +14,18 @@ $value = $field->value; if ($value == '') { - return; + return; } $attributes = ''; if (!Uri::isInternal($value)) { - $attributes = ' rel="nofollow noopener noreferrer" target="_blank"'; + $attributes = ' rel="nofollow noopener noreferrer" target="_blank"'; } echo sprintf( - '%s', - htmlspecialchars($value), - $attributes, - htmlspecialchars($value) + '%s', + htmlspecialchars($value), + $attributes, + htmlspecialchars($value) ); diff --git a/html/plg_fields_user/user.php b/html/plg_fields_user/user.php index 298835f..a68b881 100644 --- a/html/plg_fields_user/user.php +++ b/html/plg_fields_user/user.php @@ -3,7 +3,7 @@ * @package Joomla.Plugin * @subpackage Fields.User * - * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,27 +14,27 @@ $value = $field->value; if ($value == '') { - return; + return; } $value = (array)$value; $texts = []; foreach ($value as $userId) { - if (!$userId) { - continue; - } + if (!$userId) { + continue; + } - $user = Factory::getUser($userId); + $user = Factory::getUser($userId); - if ($user) { - // Use the Username - $texts[] = $user->name; - continue; - } + if ($user) { + // Use the Username + $texts[] = $user->name; + continue; + } - // Fallback and add the User ID if we get no JUser Object - $texts[] = $userId; + // Fallback and add the User ID if we get no JUser Object + $texts[] = $userId; } echo htmlentities(implode(', ', $texts)); diff --git a/index.php b/index.php index d418b28..ca66e3a 100644 --- a/index.php +++ b/index.php @@ -9,7 +9,6 @@ defined('_JEXEC') or die; JLoader::register('Master3Config', JPATH_LIBRARIES . '/master3/config.php'); - $config = \Master3Config::getInstance(); $htmlAttrs = $config->getHtmlAttrsibutes(); @@ -25,8 +24,8 @@ > - - + + To install %s upgrade Joomla! version to minimum %s.

      " J_PHP_COMPATIBLE="

      To install %s upgrade PHP version to minimum %s.

      " diff --git a/layouts/template.default-original.php b/layouts/template.default-original.php index cdae8bf..3ac06c9 100644 --- a/layouts/template.default-original.php +++ b/layouts/template.default-original.php @@ -29,11 +29,11 @@