Merge pull request #9397 from vinzv/9238-red-color-unread-messages-faded

[friendica.git] / src / Module / Profile / Profile.php

diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index c187281d333dfa711a2ca168f7bc999f1d174183..b1e0673b242496ce8366511466dfbb4a5ff5b92c 100644 (file)
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -112,6 +112,7 @@ class Profile extends BaseProfile
 
                $view_as_contacts = [];
                $view_as_contact_id = 0;
+               $view_as_contact_alert = '';
                if ($is_owner) {
                        $view_as_contact_id = intval($_GET['viewas'] ?? 0);
 
@@ -122,10 +123,20 @@ class Profile extends BaseProfile
                                'blocked' => false,
                        ]);
 
+                       $view_as_contact_ids = array_column($view_as_contacts, 'id');
+
                        // User manually provided a contact ID they aren't privy to, silently defaulting to their own view
-                       if (!in_array($view_as_contact_id, array_column($view_as_contacts, 'id'))) {
+                       if (!in_array($view_as_contact_id, $view_as_contact_ids)) {
                                $view_as_contact_id = 0;
                        }
+
+                       if (($key = array_search($view_as_contact_id, $view_as_contact_ids)) !== false) {
+                               $view_as_contact_alert = DI::l10n()->t(
+                                       'You\'re currently viewing your profile as <b>%s</b> <a href="%s" class="btn btn-sm pull-right">Cancel</a>',
+                                       htmlentities($view_as_contacts[$key]['name'], ENT_COMPAT, 'UTF-8'),
+                                       'profile/' . $parameters['nickname'] . '/profile'
+                               );
+                       }
                }
 
                $basic_fields = [];
@@ -225,7 +236,9 @@ class Profile extends BaseProfile
                        '$title' => DI::l10n()->t('Profile'),
                        '$view_as_contacts' => $view_as_contacts,
                        '$view_as_contact_id' => $view_as_contact_id,
+                       '$view_as_contact_alert' => $view_as_contact_alert,
                        '$view_as' => DI::l10n()->t('View profile as:'),
+                       '$submit' => DI::l10n()->t('Submit'),
                        '$basic' => DI::l10n()->t('Basic'),
                        '$advanced' => DI::l10n()->t('Advanced'),
                        '$is_owner' => $a->profile_uid == local_user(),
@@ -238,6 +251,11 @@ class Profile extends BaseProfile
                                'title' => '',
                                'label' => DI::l10n()->t('Edit profile')
                        ],
+                       '$viewas_link' => [
+                               'url' =>  DI::args()->getQueryString() . '#viewas',
+                               'title' => '',
+                               'label' => DI::l10n()->t('View as')
+                       ],
                ]);
 
                Hook::callAll('profile_advanced', $o);