From 4e709d0d236f9ef9cbf0ce9879a16ad5f1415a92 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Fri, 31 May 2019 04:03:19 +0200
Subject: Log messages without inline HTML

---
 includes/view/AngelTypes_view.php |  7 ++++++-
 includes/view/User_view.php       | 12 ++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'includes/view')

diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php
index f4e83758..f5434e8f 100644
--- a/includes/view/AngelTypes_view.php
+++ b/includes/view/AngelTypes_view.php
@@ -12,10 +12,15 @@ use Engelsystem\ShiftsFilterRenderer;
  * Renders the angeltypes name as link.
  *
  * @param array $angeltype
+ * @param bool  $plain
  * @return string
  */
-function AngelType_name_render($angeltype)
+function AngelType_name_render($angeltype, $plain = false)
 {
+    if ($plain) {
+        return sprintf('%s (%u)', $angeltype['name'], $angeltype['id']);
+    }
+
     return '<a href="' . angeltype_link($angeltype['id']) . '">'
         . ($angeltype['restricted'] ? glyph('lock') : '') . $angeltype['name']
         . '</a>';
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 85e6920c..59f611bc 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -36,7 +36,10 @@ function User_settings_view(
                     form_info('', __('Here you can change your user details.')),
                     form_info(entry_required() . ' = ' . __('Entry required!')),
                     form_text('nick', __('Nick'), $user_source->name, true),
-                    form_info('', __('Use up to 23 letters, numbers, connecting punctuations or spaces for your nickname.')),
+                    form_info(
+                        '',
+                        __('Use up to 23 letters, numbers, connecting punctuations or spaces for your nickname.')
+                    ),
                     form_text('lastname', __('Last name'), $personalData->last_name),
                     form_text('prename', __('First name'), $personalData->first_name),
                     $enable_planned_arrival ? form_date(
@@ -856,14 +859,19 @@ function User_groups_render($user_groups)
  * Render a user nickname.
  *
  * @param array|User $user
+ * @param bool       $plain
  * @return string
  */
-function User_Nick_render($user)
+function User_Nick_render($user, $plain = false)
 {
     if (is_array($user)) {
         $user = (new User())->forceFill($user);
     }
 
+    if ($plain) {
+        return sprintf('%s (%u)', $user->name, $user->id);
+    }
+
     return render_profile_link(
         '<span class="icon-icon_angel"></span> ' . htmlspecialchars($user->name) . '</a>',
         $user->id,
-- 
cgit v1.2.3-54-g00ecf