Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 07:50:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8939 from MrPetovan/task/8906-frio-viewas-redesign

Browse source 
Move "View As" form at the bottom of the profile page
This commit is contained in:
Michael Vogel 2020-07-28 18:00:17 +02:00 • committed by GitHub
commit 701dbdf7fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Module/Profile/Profile.php
View file

@ -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);