diff --git a/includes/pages/admin_free.php b/includes/pages/admin_free.php index 4aac524b..7ef1d9ed 100644 --- a/includes/pages/admin_free.php +++ b/includes/pages/admin_free.php @@ -86,12 +86,15 @@ function admin_free() } } + $email = ($usr->contact->email ? $usr->contact->email : $usr->email); $free_users_table[] = [ 'name' => User_Nick_render($usr) . User_Pronoun_render($usr), 'shift_state' => User_shift_state_render($usr), 'last_shift' => User_last_shift_render($usr), - 'dect' => $usr->contact->dect, - 'email' => $usr->settings->email_human ? ($usr->contact->email ? $usr->contact->email : $usr->email) : glyph('eye-close'), + 'dect' => sprintf('%1$s', $usr->contact->dect), + 'email' => $usr->settings->email_human + ? sprintf('%1$s', $email) + : glyph('eye-close'), 'actions' => auth()->can('admin_user') ? button(page_link_to('admin_user', ['id' => $usr->id]), __('edit'), 'btn-xs') diff --git a/includes/view/User_view.php b/includes/view/User_view.php index 0e34f209..c8cef972 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -207,7 +207,7 @@ function Users_view( $u['name'] = User_Nick_render($user) . User_Pronoun_render($user); $u['first_name'] = $user->personalData->first_name; $u['last_name'] = $user->personalData->last_name; - $u['dect'] = $user->contact->dect; + $u['dect'] = sprintf('%1$s', $user->contact->dect); $u['arrived'] = glyph_bool($user->state->arrived); $u['got_voucher'] = $user->state->got_voucher; $u['freeloads'] = $user->getAttribute('freeloads'); @@ -668,7 +668,10 @@ function User_view( ]), div('row', [ div('col-md-2', [ - heading(glyph('phone') . $user_source->contact->dect, 1) + heading(glyph('phone') + . '' + . $user_source->contact->dect, 1) + . '' ]), User_view_state($admin_user_privilege, $freeloader, $user_source), User_angeltypes_render($user_angeltypes),