diff --git a/misuzu.php b/misuzu.php index dd36ae30..27ea5cab 100644 --- a/misuzu.php +++ b/misuzu.php @@ -267,37 +267,6 @@ MIG; 'site_url' => config_get('Site', 'url'), ]); - tpl_add_filter('json_decode'); - tpl_add_filter('byte_symbol'); - tpl_add_filter('html_link'); - tpl_add_filter('html_colour'); - tpl_add_filter('url_construct'); - tpl_add_filter('country_name', 'get_country_name'); - tpl_add_filter('flip', 'array_flip'); - tpl_add_filter('first_paragraph'); - tpl_add_filter('colour_get_css'); - tpl_add_filter('colour_get_css_contrast'); - tpl_add_filter('colour_get_inherit'); - tpl_add_filter('colour_get_red'); - tpl_add_filter('colour_get_green'); - tpl_add_filter('colour_get_blue'); - tpl_add_filter('parse_line'); - tpl_add_filter('parse_text'); - tpl_add_filter('asset_url'); - tpl_add_filter('vsprintf'); - tpl_add_filter('perms_check'); - tpl_add_filter('bg_settings', 'user_background_settings_strings'); - - tpl_add_function('get_browser'); - tpl_add_function('git_commit_hash'); - tpl_add_function('git_tag'); - tpl_add_function('csrf_token'); - tpl_add_function('csrf_input', 'csrf_html'); - tpl_add_function('startup_time', function (float $time = MSZ_STARTUP) { - return microtime(true) - $time; - }); - tpl_add_function('sql_query_count', 'db_query_count'); - tpl_add_path(MSZ_ROOT . '/templates'); $misuzuBypassLockdown = !empty($misuzuBypassLockdown); diff --git a/public/settings.php b/public/settings.php index 475bce93..fe27f58d 100644 --- a/public/settings.php +++ b/public/settings.php @@ -112,6 +112,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { } } +tpl_add_filter('log_format', function (string $text, string $json): string { + return vsprintf($text, json_decode($json)); +}); + $sessions = [ 'list' => [], 'active' => user_session_current('session_id'), diff --git a/src/TwigMisuzu.php b/src/TwigMisuzu.php new file mode 100644 index 00000000..9e5a1b36 --- /dev/null +++ b/src/TwigMisuzu.php @@ -0,0 +1,43 @@ + colour_get_red($colour), + 'green' => colour_get_green($colour), + 'blue' => colour_get_blue($colour), + 'inherit' => colour_get_inherit($colour), + 'luminance' => colour_get_luminance($colour), + ]; +} diff --git a/src/tpl.php b/src/tpl.php index e195f29d..b3cfe693 100644 --- a/src/tpl.php +++ b/src/tpl.php @@ -1,5 +1,6 @@ addExtension(new Twig_Extensions_Extension_Date); + $twig->addExtension(new TwigMisuzu); } function tpl_var(string $key, $value): void diff --git a/templates/changelog/change.twig b/templates/changelog/change.twig index cf753df7..2b72f005 100644 --- a/templates/changelog/change.twig +++ b/templates/changelog/change.twig @@ -20,7 +20,7 @@
-
{{ change.action_name }}
diff --git a/templates/changelog/macros.twig b/templates/changelog/macros.twig index 1c9b5c23..5c33b4bc 100644 --- a/templates/changelog/macros.twig +++ b/templates/changelog/macros.twig @@ -47,7 +47,7 @@ {% endif %} -
diff --git a/templates/manage/changelog/action_edit.twig b/templates/manage/changelog/action_edit.twig index c009a914..8f034258 100644 --- a/templates/manage/changelog/action_edit.twig +++ b/templates/manage/changelog/action_edit.twig @@ -25,31 +25,33 @@

Colour

+ {% set colour_props = edit_action.action_colour|default(constant('MSZ_COLOUR_INHERIT'))|colour_props %} + diff --git a/templates/manage/users/roles_create.twig b/templates/manage/users/roles_create.twig index 11f0d2b6..13a75a39 100644 --- a/templates/manage/users/roles_create.twig +++ b/templates/manage/users/roles_create.twig @@ -43,31 +43,33 @@
{{ container_title('Colour') }} + {% set colour_props = edit_role.role_colour|default(constant('MSZ_COLOUR_INHERIT'))|colour_props %} + diff --git a/templates/manage/users/view.twig b/templates/manage/users/view.twig index 3561dd6e..e7ab6b29 100644 --- a/templates/manage/users/view.twig +++ b/templates/manage/users/view.twig @@ -109,33 +109,33 @@
{{ container_title('Colour') }} - {% set colour_is_defined = view_user is defined and view_user.user_colour is not null and not view_user.user_colour|colour_get_inherit %} + {% set colour_props = view_user.user_colour|default(constant('MSZ_COLOUR_INHERIT'))|colour_props %}
diff --git a/templates/user/settings.twig b/templates/user/settings.twig index 6eaab920..c0c7054d 100644 --- a/templates/user/settings.twig +++ b/templates/user/settings.twig @@ -259,7 +259,7 @@
{% if log.log_action in logs.strings|keys %} - {{ logs.strings[log.log_action]|vsprintf(log.log_params|json_decode) }} + {{ logs.strings[log.log_action]|log_format(log.log_params) }} {% else %} {{ log.log_action }}({{ log.log_params }}) {% endif %}