"getUserNickname" is now "getLoggedInUserNickname"

This commit is contained in:
Michael 2021-08-09 19:48:39 +00:00
parent 27177f19c9
commit 15b93b4459
27 changed files with 45 additions and 45 deletions

View File

@ -322,7 +322,7 @@ function api_call(App $a, App\Arguments $args = null)
if (!empty($info['auth']) && api_user() === false) { if (!empty($info['auth']) && api_user() === false) {
api_login($a); api_login($a);
Logger::info(API_LOG_PREFIX . 'nickname {nickname}', ['module' => 'api', 'action' => 'call', 'nickname' => $a->getUserNickname()]); Logger::info(API_LOG_PREFIX . 'nickname {nickname}', ['module' => 'api', 'action' => 'call', 'nickname' => $a->getLoggedInUserNickname()]);
} }
Logger::debug(API_LOG_PREFIX . 'parameters', ['module' => 'api', 'action' => 'call', 'parameters' => $_REQUEST]); Logger::debug(API_LOG_PREFIX . 'parameters', ['module' => 'api', 'action' => 'call', 'parameters' => $_REQUEST]);

View File

@ -62,7 +62,7 @@ function display_init(App $a)
if (local_user()) { if (local_user()) {
$item = Post::selectFirstForUser(local_user(), $fields, ['guid' => DI::args()->getArgv()[1], 'uid' => local_user()]); $item = Post::selectFirstForUser(local_user(), $fields, ['guid' => DI::args()->getArgv()[1], 'uid' => local_user()]);
if (DBA::isResult($item)) { if (DBA::isResult($item)) {
$nick = $a->getUserNickname(); $nick = $a->getLoggedInUserNickname();
} }
} }

View File

@ -68,7 +68,7 @@ function editpost_content(App $a)
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$ispublic' => '&nbsp;', // DI::l10n()->t('Visible to <strong>everybody</strong>'), '$ispublic' => '&nbsp;', // DI::l10n()->t('Visible to <strong>everybody</strong>'),
'$geotag' => $geotag, '$geotag' => $geotag,
'$nickname' => $a->getUserNickname(), '$nickname' => $a->getLoggedInUserNickname(),
'$is_mobile' => DI::mode()->isMobile(), '$is_mobile' => DI::mode()->isMobile(),
]); ]);

View File

@ -280,7 +280,7 @@ function events_content(App $a)
$tabs = ''; $tabs = '';
// tabs // tabs
if ($a->getThemeInfoValue('events_in_profile')) { if ($a->getThemeInfoValue('events_in_profile')) {
$tabs = BaseProfile::getTabsHTML($a, 'events', true, $a->getUserNickname(), false); $tabs = BaseProfile::getTabsHTML($a, 'events', true, $a->getLoggedInUserNickname(), false);
} }
$mode = 'view'; $mode = 'view';

View File

@ -88,7 +88,7 @@ function fbrowser_content(App $a)
} }
return [ return [
DI::baseUrl() . '/photos/' . $a->getUserNickname() . '/image/' . $rr['resource-id'], DI::baseUrl() . '/photos/' . $a->getLoggedInUserNickname() . '/image/' . $rr['resource-id'],
$filename_e, $filename_e,
DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
]; ];
@ -103,7 +103,7 @@ function fbrowser_content(App $a)
'$folders' => $albums, '$folders' => $albums,
'$files' => $files, '$files' => $files,
'$cancel' => DI::l10n()->t('Cancel'), '$cancel' => DI::l10n()->t('Cancel'),
'$nickname' => $a->getUserNickname(), '$nickname' => $a->getLoggedInUserNickname(),
'$upload' => DI::l10n()->t('Upload') '$upload' => DI::l10n()->t('Upload')
]); ]);
@ -132,7 +132,7 @@ function fbrowser_content(App $a)
'$folders' => false, '$folders' => false,
'$files' => $files, '$files' => $files,
'$cancel' => DI::l10n()->t('Cancel'), '$cancel' => DI::l10n()->t('Cancel'),
'$nickname' => $a->getUserNickname(), '$nickname' => $a->getLoggedInUserNickname(),
'$upload' => DI::l10n()->t('Upload') '$upload' => DI::l10n()->t('Upload')
]); ]);
} }

View File

@ -112,7 +112,7 @@ function message_content(App $a)
return Login::form(); return Login::form();
} }
$myprofile = DI::baseUrl() . '/profile/' . $a->getUserNickname(); $myprofile = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
$tpl = Renderer::getMarkupTemplate('mail_head.tpl'); $tpl = Renderer::getMarkupTemplate('mail_head.tpl');
if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new') { if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new') {
@ -179,7 +179,7 @@ function message_content(App $a)
$tpl = Renderer::getMarkupTemplate('msg-header.tpl'); $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$baseurl' => DI::baseUrl()->get(true), '$baseurl' => DI::baseUrl()->get(true),
'$nickname' => $a->getUserNickname(), '$nickname' => $a->getLoggedInUserNickname(),
'$linkurl' => DI::l10n()->t('Please enter a link URL:') '$linkurl' => DI::l10n()->t('Please enter a link URL:')
]); ]);
@ -292,7 +292,7 @@ function message_content(App $a)
$tpl = Renderer::getMarkupTemplate('msg-header.tpl'); $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$baseurl' => DI::baseUrl()->get(true), '$baseurl' => DI::baseUrl()->get(true),
'$nickname' => $a->getUserNickname(), '$nickname' => $a->getLoggedInUserNickname(),
'$linkurl' => DI::l10n()->t('Please enter a link URL:') '$linkurl' => DI::l10n()->t('Please enter a link URL:')
]); ]);
@ -431,7 +431,7 @@ function render_messages(array $msg, $t)
$tpl = Renderer::getMarkupTemplate($t); $tpl = Renderer::getMarkupTemplate($t);
$rslt = ''; $rslt = '';
$myprofile = DI::baseUrl() . '/profile/' . $a->getUserNickname(); $myprofile = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
foreach ($msg as $rr) { foreach ($msg as $rr) {
if ($rr['unknown']) { if ($rr['unknown']) {

View File

@ -45,7 +45,7 @@ function notes_content(App $a, $update = false)
return; return;
} }
$o = BaseProfile::getTabsHTML($a, 'notes', true, $a->getUserNickname(), false); $o = BaseProfile::getTabsHTML($a, 'notes', true, $a->getLoggedInUserNickname(), false);
if (!$update) { if (!$update) {
$o .= '<h3>' . DI::l10n()->t('Personal Notes') . '</h3>'; $o .= '<h3>' . DI::l10n()->t('Personal Notes') . '</h3>';

View File

@ -224,7 +224,7 @@ function photos_post(App $a)
// Update the photo albums cache // Update the photo albums cache
Photo::clearAlbumCache($page_owner_uid); Photo::clearAlbumCache($page_owner_uid);
DI::baseUrl()->redirect('photos/' . $a->getUserNickname() . '/album/' . bin2hex($newalbum)); DI::baseUrl()->redirect('photos/' . $a->getLoggedInUserNickname() . '/album/' . bin2hex($newalbum));
return; // NOTREACHED return; // NOTREACHED
} }

View File

@ -193,7 +193,7 @@ function ping_init(App $a)
$intro_count = count($intros1) + count($intros2); $intro_count = count($intros1) + count($intros2);
$intros = $intros1 + $intros2; $intros = $intros1 + $intros2;
$myurl = DI::baseUrl() . '/profile/' . $a->getUserNickname(); $myurl = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
$mails = q( $mails = q(
"SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail` "SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ", WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",

View File

@ -594,7 +594,7 @@ function settings_content(App $a)
$username = $user['username']; $username = $user['username'];
$email = $user['email']; $email = $user['email'];
$nickname = $a->getUserNickname(); $nickname = $a->getLoggedInUserNickname();
$timezone = $user['timezone']; $timezone = $user['timezone'];
$language = $user['language']; $language = $user['language'];
$notify = $user['notify-flags']; $notify = $user['notify-flags'];

View File

@ -166,7 +166,7 @@ class App
* Fetch the user nick name * Fetch the user nick name
* @return string * @return string
*/ */
public function getUserNickname() public function getLoggedInUserNickname()
{ {
return $this->nickname; return $this->nickname;
} }

View File

@ -277,8 +277,8 @@ class Page implements ArrayAccess
// If you're just visiting, let javascript take you home // If you're just visiting, let javascript take you home
if (!empty($_SESSION['visitor_home'])) { if (!empty($_SESSION['visitor_home'])) {
$homebase = $_SESSION['visitor_home']; $homebase = $_SESSION['visitor_home'];
} elseif (!empty($app->getUserNickname())) { } elseif (!empty($app->getLoggedInUserNickname())) {
$homebase = 'profile/' . $app->getUserNickname(); $homebase = 'profile/' . $app->getLoggedInUserNickname();
} }
if (isset($homebase)) { if (isset($homebase)) {

View File

@ -183,7 +183,7 @@ abstract class BaseModule
public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token') public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token')
{ {
if (!self::checkFormSecurityToken($typename, $formname)) { if (!self::checkFormSecurityToken($typename, $formname)) {
Logger::log('checkFormSecurityToken failed: user ' . DI::app()->getUserNickname() . ' - form element ' . $typename); Logger::log('checkFormSecurityToken failed: user ' . DI::app()->getLoggedInUserNickname() . ' - form element ' . $typename);
Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA); Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);
notice(self::getFormSecurityStandardErrorMessage()); notice(self::getFormSecurityStandardErrorMessage());
DI::baseUrl()->redirect($err_redirect); DI::baseUrl()->redirect($err_redirect);
@ -193,7 +193,7 @@ abstract class BaseModule
public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token') public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token')
{ {
if (!self::checkFormSecurityToken($typename, $formname)) { if (!self::checkFormSecurityToken($typename, $formname)) {
Logger::log('checkFormSecurityToken failed: user ' . DI::app()->getUserNickname() . ' - form element ' . $typename); Logger::log('checkFormSecurityToken failed: user ' . DI::app()->getLoggedInUserNickname() . ' - form element ' . $typename);
Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA); Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);
throw new \Friendica\Network\HTTPException\ForbiddenException(); throw new \Friendica\Network\HTTPException\ForbiddenException();

View File

@ -154,7 +154,7 @@ class Nav
* Display the current site location as a navigation aid. * Display the current site location as a navigation aid.
*/ */
$myident = !empty($a->getUserNickname()) ? $a->getUserNickname() . '@' : ''; $myident = !empty($a->getLoggedInUserNickname()) ? $a->getLoggedInUserNickname() . '@' : '';
$sitelocation = $myident . substr(DI::baseUrl()->get($ssl_state), strpos(DI::baseUrl()->get($ssl_state), '//') + 2); $sitelocation = $myident . substr(DI::baseUrl()->get($ssl_state), strpos(DI::baseUrl()->get($ssl_state), '//') + 2);
@ -187,10 +187,10 @@ class Nav
if ($a->isLoggedIn()) { if ($a->isLoggedIn()) {
// user menu // user menu
$nav['usermenu'][] = ['profile/' . $a->getUserNickname(), DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')]; $nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
$nav['usermenu'][] = ['profile/' . $a->getUserNickname() . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')]; $nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname() . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
$nav['usermenu'][] = ['photos/' . $a->getUserNickname(), DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')]; $nav['usermenu'][] = ['photos/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
$nav['usermenu'][] = ['videos/' . $a->getUserNickname(), DI::l10n()->t('Videos'), '', DI::l10n()->t('Your videos')]; $nav['usermenu'][] = ['videos/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Videos'), '', DI::l10n()->t('Your videos')];
$nav['usermenu'][] = ['events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')]; $nav['usermenu'][] = ['events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')];
$nav['usermenu'][] = ['notes/', DI::l10n()->t('Personal notes'), '', DI::l10n()->t('Your personal notes')]; $nav['usermenu'][] = ['notes/', DI::l10n()->t('Personal notes'), '', DI::l10n()->t('Your personal notes')];
@ -267,10 +267,10 @@ class Nav
} }
// The following nav links are only show to logged in users // The following nav links are only show to logged in users
if (local_user() && !empty($a->getUserNickname())) { if (local_user() && !empty($a->getLoggedInUserNickname())) {
$nav['network'] = ['network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')]; $nav['network'] = ['network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')];
$nav['home'] = ['profile/' . $a->getUserNickname(), DI::l10n()->t('Home'), '', DI::l10n()->t('Your posts and conversations')]; $nav['home'] = ['profile/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Home'), '', DI::l10n()->t('Your posts and conversations')];
// Don't show notifications for public communities // Don't show notifications for public communities
if (Session::get('page_flags', '') != User::PAGE_FLAGS_COMMUNITY) { if (Session::get('page_flags', '') != User::PAGE_FLAGS_COMMUNITY) {

View File

@ -68,7 +68,7 @@ class Introduction extends BaseFactory
$this->l10n = $l10n; $this->l10n = $l10n;
$this->pConfig = $pConfig; $this->pConfig = $pConfig;
$this->session = $session; $this->session = $session;
$this->nick = $app->getUserNickname() ?? ''; $this->nick = $app->getLoggedInUserNickname() ?? '';
} }
/** /**

View File

@ -173,7 +173,7 @@ class Mail
$recip_host = substr($recip_host, 0, strpos($recip_host, '/')); $recip_host = substr($recip_host, 0, strpos($recip_host, '/'));
$recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host); $recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
$sender_handle = $a->getUserNickname() . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3); $sender_handle = $a->getLoggedInUserNickname() . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
$conv_guid = System::createUUID(); $conv_guid = System::createUUID();
$convuri = $recip_handle . ':' . $conv_guid; $convuri = $recip_handle . ':' . $conv_guid;

View File

@ -109,7 +109,7 @@ class Delegation extends BaseModule
$ret = []; $ret = [];
Hook::callAll('home_init', $ret); Hook::callAll('home_init', $ret);
DI::baseUrl()->redirect('profile/' . DI::app()->getUserNickname()); DI::baseUrl()->redirect('profile/' . DI::app()->getLoggedInUserNickname());
// NOTREACHED // NOTREACHED
} }
@ -130,7 +130,7 @@ class Delegation extends BaseModule
$identities[$key]['thumb'] = Contact::getAvatarUrlForId($self['id'], Proxy::SIZE_THUMB, $self['updated']); $identities[$key]['thumb'] = Contact::getAvatarUrlForId($self['id'], Proxy::SIZE_THUMB, $self['updated']);
$identities[$key]['selected'] = ($identity['nickname'] === DI::app()->getUserNickname()); $identities[$key]['selected'] = ($identity['nickname'] === DI::app()->getLoggedInUserNickname());
$condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], Notification\Type::INTRO, Notification\Type::MAIL]; $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], Notification\Type::INTRO, Notification\Type::MAIL];
$params = ['distinct' => true, 'expression' => 'parent']; $params = ['distinct' => true, 'expression' => 'parent'];

View File

@ -40,7 +40,7 @@ class HCard extends BaseModule
if ((local_user()) && ($parameters['action'] ?? '') === 'view') { if ((local_user()) && ($parameters['action'] ?? '') === 'view') {
// A logged in user views a profile of a user // A logged in user views a profile of a user
$nickname = $a->getUserNickname(); $nickname = $a->getLoggedInUserNickname();
} elseif (empty($parameters['action'])) { } elseif (empty($parameters['action'])) {
// Show the profile hCard // Show the profile hCard
$nickname = $parameters['profile']; $nickname = $parameters['profile'];

View File

@ -42,7 +42,7 @@ class Home extends BaseModule
Hook::callAll('home_init', $ret); Hook::callAll('home_init', $ret);
if (local_user() && ($app->getUserNickname())) { if (local_user() && ($app->getLoggedInUserNickname())) {
DI::baseUrl()->redirect('network'); DI::baseUrl()->redirect('network');
} }

View File

@ -171,7 +171,7 @@ class Invite extends BaseModule
DI::l10n()->t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n" DI::l10n()->t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
. $linkTxt . $linkTxt
. "\r\n" . "\r\n" . (($inviteOnly) ? DI::l10n()->t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') . DI::l10n()->t('Once you have registered, please connect with me via my profile page at:') . "\r\n" . "\r\n" . (($inviteOnly) ? DI::l10n()->t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') . DI::l10n()->t('Once you have registered, please connect with me via my profile page at:')
. "\r\n" . "\r\n" . DI::baseUrl()->get() . '/profile/' . $app->getUserNickname() . "\r\n" . "\r\n" . DI::baseUrl()->get() . '/profile/' . $app->getLoggedInUserNickname()
. "\r\n" . "\r\n" . DI::l10n()->t('For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca') . "\r\n" . "\r\n", . "\r\n" . "\r\n" . DI::l10n()->t('For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca') . "\r\n" . "\r\n",
], ],
'$submit' => DI::l10n()->t('Submit') '$submit' => DI::l10n()->t('Submit')

View File

@ -45,7 +45,7 @@ class NoScrape extends BaseModule
$which = $parameters['nick']; $which = $parameters['nick'];
} elseif (local_user() && isset($parameters['profile']) && DI::args()->get(2) == 'view') { } elseif (local_user() && isset($parameters['profile']) && DI::args()->get(2) == 'view') {
// view infos about a known profile (needs a login) // view infos about a known profile (needs a login)
$which = $a->getUserNickname(); $which = $a->getLoggedInUserNickname();
} else { } else {
System::jsonError(403, 'Authentication required'); System::jsonError(403, 'Authentication required');
} }

View File

@ -58,7 +58,7 @@ class Schedule extends BaseProfile
$a = DI::app(); $a = DI::app();
$o = self::getTabsHTML($a, 'schedule', true, $a->getUserNickname(), false); $o = self::getTabsHTML($a, 'schedule', true, $a->getLoggedInUserNickname(), false);
$schedule = []; $schedule = [];
$delayed = DBA::select('delayed-post', [], ['uid' => local_user()]); $delayed = DBA::select('delayed-post', [], ['uid' => local_user()]);

View File

@ -56,7 +56,7 @@ class Crop extends BaseSettings
$selectionW = intval($_POST['width'] ?? 0); $selectionW = intval($_POST['width'] ?? 0);
$selectionH = intval($_POST['height'] ?? 0); $selectionH = intval($_POST['height'] ?? 0);
$path = 'profile/' . DI::app()->getUserNickname(); $path = 'profile/' . DI::app()->getLoggedInUserNickname();
$base_image = Photo::selectFirst([], ['resource-id' => $resource_id, 'uid' => local_user(), 'scale' => $scale]); $base_image = Photo::selectFirst([], ['resource-id' => $resource_id, 'uid' => local_user(), 'scale' => $scale]);
if (DBA::isResult($base_image)) { if (DBA::isResult($base_image)) {
@ -184,7 +184,7 @@ class Crop extends BaseSettings
info(DI::l10n()->t('Profile picture successfully updated.')); info(DI::l10n()->t('Profile picture successfully updated.'));
DI::baseUrl()->redirect('profile/' . DI::app()->getUserNickname()); DI::baseUrl()->redirect('profile/' . DI::app()->getLoggedInUserNickname());
} }
$Image = Photo::getImageForPhoto($photos[0]); $Image = Photo::getImageForPhoto($photos[0]);

View File

@ -133,7 +133,7 @@ class Index extends BaseSettings
DI::l10n()->t('or'), DI::l10n()->t('or'),
($newuser) ? ($newuser) ?
'<a href="' . DI::baseUrl() . '">' . DI::l10n()->t('skip this step') . '</a>' '<a href="' . DI::baseUrl() . '">' . DI::l10n()->t('skip this step') . '</a>'
: '<a href="' . DI::baseUrl() . '/photos/' . DI::app()->getUserNickname() . '">' : '<a href="' . DI::baseUrl() . '/photos/' . DI::app()->getLoggedInUserNickname() . '">'
. DI::l10n()->t('select a photo from your photo albums') . '</a>' . DI::l10n()->t('select a photo from your photo albums') . '</a>'
), ),
]); ]);

View File

@ -100,17 +100,17 @@ class UserExport extends BaseSettings
switch ($action) { switch ($action) {
case "backup": case "backup":
header("Content-type: application/json"); header("Content-type: application/json");
header('Content-Disposition: attachment; filename="' . DI::app()->getUserNickname() . '.' . $action . '"'); header('Content-Disposition: attachment; filename="' . DI::app()->getLoggedInUserNickname() . '.' . $action . '"');
self::exportAll(local_user()); self::exportAll(local_user());
break; break;
case "account": case "account":
header("Content-type: application/json"); header("Content-type: application/json");
header('Content-Disposition: attachment; filename="' . DI::app()->getUserNickname() . '.' . $action . '"'); header('Content-Disposition: attachment; filename="' . DI::app()->getLoggedInUserNickname() . '.' . $action . '"');
self::exportAccount(local_user()); self::exportAccount(local_user());
break; break;
case "contact": case "contact":
header("Content-type: application/csv"); header("Content-type: application/csv");
header('Content-Disposition: attachment; filename="' . DI::app()->getUserNickname() . '-contacts.csv' . '"'); header('Content-Disposition: attachment; filename="' . DI::app()->getLoggedInUserNickname() . '-contacts.csv' . '"');
self::exportContactsAsCSV(local_user()); self::exportContactsAsCSV(local_user());
break; break;
} }

View File

@ -41,14 +41,14 @@ class ItemCCEMail extends Email
$disclaimer = '<hr />' . $l10n->t('This message was sent to you by %s, a member of the Friendica social network.', $user['username']) $disclaimer = '<hr />' . $l10n->t('This message was sent to you by %s, a member of the Friendica social network.', $user['username'])
. '<br />'; . '<br />';
$disclaimer .= $l10n->t('You may visit them online at %s', $baseUrl . '/profile/' . $a->getUserNickname()) . EOL; $disclaimer .= $l10n->t('You may visit them online at %s', $baseUrl . '/profile/' . $a->getLoggedInUserNickname()) . EOL;
$disclaimer .= $l10n->t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; $disclaimer .= $l10n->t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
if (!$item['title'] == '') { if (!$item['title'] == '') {
$subject = EmailProtocol::encodeHeader($item['title'], 'UTF-8'); $subject = EmailProtocol::encodeHeader($item['title'], 'UTF-8');
} else { } else {
$subject = EmailProtocol::encodeHeader('[Friendica]' . ' ' . $l10n->t('%s posted an update.', $user['username']), 'UTF-8'); $subject = EmailProtocol::encodeHeader('[Friendica]' . ' ' . $l10n->t('%s posted an update.', $user['username']), 'UTF-8');
} }
$link = '<a href="' . $baseUrl . '/profile/' . $a->getUserNickname() . '"><img src="' . $authorThumb . '" alt="' . $user['username'] . '" /></a><br /><br />'; $link = '<a href="' . $baseUrl . '/profile/' . $a->getLoggedInUserNickname() . '"><img src="' . $authorThumb . '" alt="' . $user['username'] . '" /></a><br /><br />';
$html = Item::prepareBody($item); $html = Item::prepareBody($item);
$message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';; $message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';;

View File

@ -27,7 +27,7 @@ function vier_init(App $a)
$args = DI::args(); $args = DI::args();
if ($args->get(0) === 'profile' && $args->get(1) === ($a->getUserNickname() ?? '') || $args->get(0) === 'network' && local_user() if ($args->get(0) === 'profile' && $args->get(1) === ($a->getLoggedInUserNickname() ?? '') || $args->get(0) === 'network' && local_user()
) { ) {
vier_community_info(); vier_community_info();