diff --git a/misuzu.php b/misuzu.php index 018e4bed..ff6d6099 100644 --- a/misuzu.php +++ b/misuzu.php @@ -208,7 +208,7 @@ if($authToken->isValid()) { } else { $userDisplayInfo = DB::prepare(' SELECT - u.`user_id`, u.`username`, u.`user_background_settings`, u.`user_deleted`, + u.`user_id`, u.`username`, COALESCE(u.`user_colour`, r.`role_colour`) AS `user_colour` FROM `msz_users` AS u LEFT JOIN `msz_roles` AS r diff --git a/src/TwigMisuzu.php b/src/TwigMisuzu.php index 1c5104a6..b913cdc1 100644 --- a/src/TwigMisuzu.php +++ b/src/TwigMisuzu.php @@ -12,8 +12,6 @@ final class TwigMisuzu extends Twig_Extension { new Twig_Filter('html_colour', 'html_colour'), new Twig_Filter('country_name', 'get_country_name'), new Twig_Filter('byte_symbol', 'byte_symbol'), - new Twig_Filter('html_link', 'html_link'), - // deprecate this call, convert to html in php new Twig_Filter('parse_text', fn(string $text, int $parser): string => Parser::instance($parser)->parseText($text)), new Twig_Filter('perms_check', 'perms_check'), new Twig_Filter('bg_settings', 'user_background_settings_strings'), diff --git a/templates/_layout/footer.twig b/templates/_layout/footer.twig index f9c038e7..d7354153 100644 --- a/templates/_layout/footer.twig +++ b/templates/_layout/footer.twig @@ -5,16 +5,16 @@ {% set git_tag = git_tag() %} {% set git_branch = git_branch() %}
- {{ 'https://flash.moe'|html_link('Flashwave', 'footer__link') }} 2013-{{ - ''|date('Y') }} / + Flashwave + 2013-{{ ''|date('Y') }} / {% set git_branch = git_branch() %} {% if git_branch != 'HEAD' %} - {{ ('https://github.com/flashwave/misuzu/tree/' ~ git_branch)|html_link(git_branch, 'footer__link') }} + {{ git_branch }} {% else %} {% set git_tag = git_tag() %} - {{ ('https://github.com/flashwave/misuzu/tree/' ~ git_tag)|html_link(git_tag, 'footer__link') }} + {{ git_tag }} {% endif %} - # {{ ('https://github.com/flashwave/misuzu/commit/' ~ git_commit_hash(true))|html_link(git_commit_hash(), 'footer__link') }} + # {{ git_commit_hash() }} {% if constant('MSZ_DEBUG') or current_user.user_id|default(0) == 1 %} / SQL Queries: {{ sql_query_count()|number_format }} / Took: {{ startup_time()|number_format(5) }} seconds diff --git a/templates/_layout/header.twig b/templates/_layout/header.twig index 72ff8858..ecc8c964 100644 --- a/templates/_layout/header.twig +++ b/templates/_layout/header.twig @@ -111,7 +111,7 @@ {% for item in site_menu %} {% if item.display is not defined or item.display %}
- {{ item.url|html_link(item.title, {'class': 'header__desktop__link header__desktop__menu__link'})|raw }} + {{ item.title }} {% if item.menu is defined and item.menu is iterable %}
@@ -119,7 +119,7 @@
{% for subitem in item.menu %} {% if subitem.display is not defined or subitem.display %} - {{ subitem.url|html_link(subitem.title, {'class': 'header__desktop__link header__desktop__submenu__link'})|raw }} + {{ subitem.title }} {% endif %} {% endfor %}
@@ -183,12 +183,12 @@
{% for item in site_menu %} {% if item.display is not defined or item.display %} - {{ item.url|html_link(item.title, {'class': 'header__mobile__link header__mobile__link--primary'})|raw }} + {{ item.title }} {% if item.menu is defined and item.menu is iterable %} {% for subitem in item.menu %} {% if subitem.display is not defined or subitem.display %} - {{ subitem.url|html_link(subitem.title, {'class': 'header__mobile__link'})|raw }} + {{ subitem.title }} {% endif %} {% endfor %} {% endif %} diff --git a/templates/master_minimal.twig b/templates/master_minimal.twig deleted file mode 100644 index b344e050..00000000 --- a/templates/master_minimal.twig +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - {{ title|default(globals.site_name) }} - - - - - - - -
- {% block content %} - This page has no content! - {% endblock %} -
- -
-
-
- {% autoescape false %} -
- {{ 'https://flash.moe'|html_link('Flashwave', 'footer__link') }} 2013-{{ - ''|date('Y') }} / - {% set git_branch = git_branch() %} - {% if git_branch != 'HEAD' %} - {{ ('https://github.com/flashwave/misuzu/tree/' ~ git_branch)|html_link(git_branch, 'footer__link') }} - {% else %} - {% set git_tag = git_tag() %} - {{ ('https://github.com/flashwave/misuzu/tree/' ~ git_tag)|html_link(git_tag, 'footer__link') }} - {% endif %} - # {{ ('https://github.com/flashwave/misuzu/commit/' ~ git_commit_hash(true))|html_link(git_commit_hash(), 'footer__link') }} -
- {% endautoescape %} -
-
- - diff --git a/templates/profile/_layout/header.twig b/templates/profile/_layout/header.twig index 64b57376..c62b3191 100644 --- a/templates/profile/_layout/header.twig +++ b/templates/profile/_layout/header.twig @@ -42,9 +42,9 @@ {% endif %}
-
+
- {{ profile_user.user_country|country_name }}{% if profile_user.user_age > 0 %}, {{ profile_user.user_age }} year{{ profile_user.user_age != 's' ? 's' : '' }} old{% endif %} + {{ profile_user.countryName }}{% if profile_user.user_age > 0 %}, {{ profile_user.user_age }} year{{ profile_user.user_age != 's' ? 's' : '' }} old{% endif %}
{% else %} diff --git a/templates/profile/index.twig b/templates/profile/index.twig index 5e0aec15..fd89e3a6 100644 --- a/templates/profile/index.twig +++ b/templates/profile/index.twig @@ -127,7 +127,7 @@ {% if field.format_link is empty %} {{ profile_field_value }} {% else %} - {{ field.format_link|format(field.field_value)|html_link(profile_field_value, 'profile__accounts__link')|raw }} + {{ profile_field_value }} {% endif %}
{% endif %} diff --git a/utility.php b/utility.php index 83b16dc8..12878e9b 100644 --- a/utility.php +++ b/utility.php @@ -183,30 +183,6 @@ function render_info_or_json(bool $json, string $message, int $httpCode = 200, s return render_info($message, $httpCode, $template); } -function html_link(string $url, ?string $content = null, $attributes = []): string { - $content = $content ?? $url; - $attributes = array_merge( - is_string($attributes) ? ['class' => $attributes] : $attributes, - ['href' => $url] - ); - - if(mb_strpos($url, '://') !== false) { - $attributes['target'] = '_blank'; - $attributes['rel'] = 'noreferrer noopener'; - } - - $html = ' $value) { - $value = str_replace('"', '\"', $value); - $html .= " {$name}=\"{$value}\""; - } - - $html .= ">{$content}"; - - return $html; -} - function html_colour(?int $colour, $attribs = '--user-colour'): string { $colour = $colour == null ? \Misuzu\Colour::none() : new \Misuzu\Colour($colour);