Changed function name
This commit is contained in:
parent
9f01052dd2
commit
b8fa75b2dd
34 changed files with 54 additions and 54 deletions
|
@ -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->getNickname()]);
|
Logger::info(API_LOG_PREFIX . 'nickname {nickname}', ['module' => 'api', 'action' => 'call', 'nickname' => $a->getUserNickname()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger::debug(API_LOG_PREFIX . 'parameters', ['module' => 'api', 'action' => 'call', 'parameters' => $_REQUEST]);
|
Logger::debug(API_LOG_PREFIX . 'parameters', ['module' => 'api', 'action' => 'call', 'parameters' => $_REQUEST]);
|
||||||
|
|
|
@ -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->getNickname();
|
$nick = $a->getUserNickname();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ function editpost_content(App $a)
|
||||||
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
|
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
|
||||||
'$ispublic' => ' ', // DI::l10n()->t('Visible to <strong>everybody</strong>'),
|
'$ispublic' => ' ', // DI::l10n()->t('Visible to <strong>everybody</strong>'),
|
||||||
'$geotag' => $geotag,
|
'$geotag' => $geotag,
|
||||||
'$nickname' => $a->getNickname(),
|
'$nickname' => $a->getUserNickname(),
|
||||||
'$is_mobile' => DI::mode()->isMobile(),
|
'$is_mobile' => DI::mode()->isMobile(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
|
@ -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->getNickname(), false);
|
$tabs = BaseProfile::getTabsHTML($a, 'events', true, $a->getUserNickname(), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
$mode = 'view';
|
$mode = 'view';
|
||||||
|
|
|
@ -88,7 +88,7 @@ function fbrowser_content(App $a)
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
DI::baseUrl() . '/photos/' . $a->getNickname() . '/image/' . $rr['resource-id'],
|
DI::baseUrl() . '/photos/' . $a->getUserNickname() . '/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->getNickname(),
|
'$nickname' => $a->getUserNickname(),
|
||||||
'$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->getNickname(),
|
'$nickname' => $a->getUserNickname(),
|
||||||
'$upload' => DI::l10n()->t('Upload')
|
'$upload' => DI::l10n()->t('Upload')
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -175,7 +175,7 @@ function follow_process(App $a, string $url)
|
||||||
{
|
{
|
||||||
$return_path = 'follow?url=' . urlencode($url);
|
$return_path = 'follow?url=' . urlencode($url);
|
||||||
|
|
||||||
$result = Contact::createFromProbe($a->getUserId(), $url);
|
$result = Contact::createFromProbeForUser($a->getUserId(), $url);
|
||||||
|
|
||||||
if ($result['success'] == false) {
|
if ($result['success'] == false) {
|
||||||
// Possibly it is a remote item and not an account
|
// Possibly it is a remote item and not an account
|
||||||
|
|
|
@ -112,7 +112,7 @@ function message_content(App $a)
|
||||||
return Login::form();
|
return Login::form();
|
||||||
}
|
}
|
||||||
|
|
||||||
$myprofile = DI::baseUrl() . '/profile/' . $a->getNickname();
|
$myprofile = DI::baseUrl() . '/profile/' . $a->getUserNickname();
|
||||||
|
|
||||||
$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->getNickname(),
|
'$nickname' => $a->getUserNickname(),
|
||||||
'$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->getNickname(),
|
'$nickname' => $a->getUserNickname(),
|
||||||
'$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->getNickname();
|
$myprofile = DI::baseUrl() . '/profile/' . $a->getUserNickname();
|
||||||
|
|
||||||
foreach ($msg as $rr) {
|
foreach ($msg as $rr) {
|
||||||
if ($rr['unknown']) {
|
if ($rr['unknown']) {
|
||||||
|
|
|
@ -45,7 +45,7 @@ function notes_content(App $a, $update = false)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$o = BaseProfile::getTabsHTML($a, 'notes', true, $a->getNickname(), false);
|
$o = BaseProfile::getTabsHTML($a, 'notes', true, $a->getUserNickname(), false);
|
||||||
|
|
||||||
if (!$update) {
|
if (!$update) {
|
||||||
$o .= '<h3>' . DI::l10n()->t('Personal Notes') . '</h3>';
|
$o .= '<h3>' . DI::l10n()->t('Personal Notes') . '</h3>';
|
||||||
|
|
|
@ -111,7 +111,7 @@ function ostatus_subscribe_content(App $a)
|
||||||
|
|
||||||
$probed = Contact::getByURL($url);
|
$probed = Contact::getByURL($url);
|
||||||
if (in_array($probed['network'], Protocol::FEDERATED)) {
|
if (in_array($probed['network'], Protocol::FEDERATED)) {
|
||||||
$result = Contact::createFromProbe($a->getUserId(), $probed['url']);
|
$result = Contact::createFromProbeForUser($a->getUserId(), $probed['url']);
|
||||||
if ($result['success']) {
|
if ($result['success']) {
|
||||||
$o .= ' - ' . DI::l10n()->t('success');
|
$o .= ' - ' . DI::l10n()->t('success');
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -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->getNickname() . '/album/' . bin2hex($newalbum));
|
DI::baseUrl()->redirect('photos/' . $a->getUserNickname() . '/album/' . bin2hex($newalbum));
|
||||||
return; // NOTREACHED
|
return; // NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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->getNickname();
|
$myurl = DI::baseUrl() . '/profile/' . $a->getUserNickname();
|
||||||
$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' ",
|
||||||
|
|
|
@ -70,7 +70,7 @@ function repair_ostatus_content(App $a) {
|
||||||
|
|
||||||
$o .= "<p>".DI::l10n()->t("Keep this window open until done.")."</p>";
|
$o .= "<p>".DI::l10n()->t("Keep this window open until done.")."</p>";
|
||||||
|
|
||||||
Contact::createFromProbe($a->getUserId(), $r[0]["url"]);
|
Contact::createFromProbeForUser($a->getUserId(), $r[0]["url"]);
|
||||||
|
|
||||||
DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="1; URL=' . DI::baseUrl() . '/repair_ostatus?counter='.$counter.'">';
|
DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="1; URL=' . DI::baseUrl() . '/repair_ostatus?counter='.$counter.'">';
|
||||||
|
|
||||||
|
|
|
@ -594,7 +594,7 @@ function settings_content(App $a)
|
||||||
|
|
||||||
$username = $user['username'];
|
$username = $user['username'];
|
||||||
$email = $user['email'];
|
$email = $user['email'];
|
||||||
$nickname = $a->getNickname();
|
$nickname = $a->getUserNickname();
|
||||||
$timezone = $user['timezone'];
|
$timezone = $user['timezone'];
|
||||||
$language = $user['language'];
|
$language = $user['language'];
|
||||||
$notify = $user['notify-flags'];
|
$notify = $user['notify-flags'];
|
||||||
|
|
|
@ -166,7 +166,7 @@ class App
|
||||||
* Fetch the user nick name
|
* Fetch the user nick name
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getNickname()
|
public function getUserNickname()
|
||||||
{
|
{
|
||||||
return $this->nickname;
|
return $this->nickname;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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->getNickname())) {
|
} elseif (!empty($app->getUserNickname())) {
|
||||||
$homebase = 'profile/' . $app->getNickname();
|
$homebase = 'profile/' . $app->getUserNickname();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($homebase)) {
|
if (isset($homebase)) {
|
||||||
|
|
|
@ -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()->getNickname() . ' - form element ' . $typename);
|
Logger::log('checkFormSecurityToken failed: user ' . DI::app()->getUserNickname() . ' - 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()->getNickname() . ' - form element ' . $typename);
|
Logger::log('checkFormSecurityToken failed: user ' . DI::app()->getUserNickname() . ' - 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();
|
||||||
|
|
|
@ -164,7 +164,7 @@ HELP;
|
||||||
$network = CliPrompt::prompt();
|
$network = CliPrompt::prompt();
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = ContactModel::createFromProbe($user['uid'], $url, $network);
|
$result = ContactModel::createFromProbeForUser($user['uid'], $url, $network);
|
||||||
|
|
||||||
if ($result['success']) {
|
if ($result['success']) {
|
||||||
$this->out('User ' . $user['nickname'] . ' now connected to ' . $url . ', contact ID ' . $result['cid']);
|
$this->out('User ' . $user['nickname'] . ' now connected to ' . $url . ', contact ID ' . $result['cid']);
|
||||||
|
|
|
@ -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->getNickname() ? $a->getNickname() . '@' : '');
|
$myident = !empty($a->getUserNickname()) ? $a->getUserNickname() . '@' : '';
|
||||||
|
|
||||||
$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->getNickname(), DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
|
$nav['usermenu'][] = ['profile/' . $a->getUserNickname(), DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
|
||||||
$nav['usermenu'][] = ['profile/' . $a->getNickname() . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
|
$nav['usermenu'][] = ['profile/' . $a->getUserNickname() . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
|
||||||
$nav['usermenu'][] = ['photos/' . $a->getNickname(), DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
|
$nav['usermenu'][] = ['photos/' . $a->getUserNickname(), DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
|
||||||
$nav['usermenu'][] = ['videos/' . $a->getNickname(), DI::l10n()->t('Videos'), '', DI::l10n()->t('Your videos')];
|
$nav['usermenu'][] = ['videos/' . $a->getUserNickname(), 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->getNickname())) {
|
if (local_user() && !empty($a->getUserNickname())) {
|
||||||
$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->getNickname(), DI::l10n()->t('Home'), '', DI::l10n()->t('Your posts and conversations')];
|
$nav['home'] = ['profile/' . $a->getUserNickname(), 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) {
|
||||||
|
|
|
@ -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->getNickname() ?? '';
|
$this->nick = $app->getUserNickname() ?? '';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -2319,7 +2319,7 @@ class Contact
|
||||||
* @throws HTTPException\NotFoundException
|
* @throws HTTPException\NotFoundException
|
||||||
* @throws \ImagickException
|
* @throws \ImagickException
|
||||||
*/
|
*/
|
||||||
public static function createFromProbe(int $uid, $url, $network = '')
|
public static function createFromProbeForUser(int $uid, $url, $network = '')
|
||||||
{
|
{
|
||||||
$result = ['cid' => -1, 'success' => false, 'message' => ''];
|
$result = ['cid' => -1, 'success' => false, 'message' => ''];
|
||||||
|
|
||||||
|
@ -2580,7 +2580,7 @@ class Contact
|
||||||
{
|
{
|
||||||
$contact = self::getById($cid, ['url']);
|
$contact = self::getById($cid, ['url']);
|
||||||
|
|
||||||
$result = self::createFromProbe($uid, $contact['url']);
|
$result = self::createFromProbeForUser($uid, $contact['url']);
|
||||||
|
|
||||||
return $result['cid'];
|
return $result['cid'];
|
||||||
}
|
}
|
||||||
|
@ -2738,7 +2738,7 @@ class Contact
|
||||||
}
|
}
|
||||||
} elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) {
|
} elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) {
|
||||||
if (($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) && ($network != Protocol::DIASPORA)) {
|
if (($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) && ($network != Protocol::DIASPORA)) {
|
||||||
self::createFromProbe($importer['uid'], $url, $network);
|
self::createFromProbeForUser($importer['uid'], $url, $network);
|
||||||
}
|
}
|
||||||
|
|
||||||
$condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
|
$condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
|
||||||
|
|
|
@ -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->getNickname() . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
|
$sender_handle = $a->getUserNickname() . '@' . 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;
|
||||||
|
|
|
@ -168,7 +168,7 @@ class Contact extends BaseModule
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($contact['network'] == Protocol::OSTATUS) {
|
if ($contact['network'] == Protocol::OSTATUS) {
|
||||||
$result = Model\Contact::createFromProbe($contact['uid'], $contact['url'], $contact['network']);
|
$result = Model\Contact::createFromProbeForUser($contact['uid'], $contact['url'], $contact['network']);
|
||||||
|
|
||||||
if ($result['success']) {
|
if ($result['success']) {
|
||||||
DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]);
|
DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]);
|
||||||
|
|
|
@ -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()->getNickname());
|
DI::baseUrl()->redirect('profile/' . DI::app()->getUserNickname());
|
||||||
// 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()->getNickname());
|
$identities[$key]['selected'] = ($identity['nickname'] === DI::app()->getUserNickname());
|
||||||
|
|
||||||
$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'];
|
||||||
|
|
|
@ -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->getNickname();
|
$nickname = $a->getUserNickname();
|
||||||
} elseif (empty($parameters['action'])) {
|
} elseif (empty($parameters['action'])) {
|
||||||
// Show the profile hCard
|
// Show the profile hCard
|
||||||
$nickname = $parameters['profile'];
|
$nickname = $parameters['profile'];
|
||||||
|
|
|
@ -42,7 +42,7 @@ class Home extends BaseModule
|
||||||
|
|
||||||
Hook::callAll('home_init', $ret);
|
Hook::callAll('home_init', $ret);
|
||||||
|
|
||||||
if (local_user() && ($app->getNickname())) {
|
if (local_user() && ($app->getUserNickname())) {
|
||||||
DI::baseUrl()->redirect('network');
|
DI::baseUrl()->redirect('network');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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->getNickname()
|
. "\r\n" . "\r\n" . DI::baseUrl()->get() . '/profile/' . $app->getUserNickname()
|
||||||
. "\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')
|
||||||
|
|
|
@ -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->getNickname();
|
$which = $a->getUserNickname();
|
||||||
} else {
|
} else {
|
||||||
System::jsonError(403, 'Authentication required');
|
System::jsonError(403, 'Authentication required');
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,7 +58,7 @@ class Schedule extends BaseProfile
|
||||||
|
|
||||||
$a = DI::app();
|
$a = DI::app();
|
||||||
|
|
||||||
$o = self::getTabsHTML($a, 'schedule', true, $a->getNickname(), false);
|
$o = self::getTabsHTML($a, 'schedule', true, $a->getUserNickname(), false);
|
||||||
|
|
||||||
$schedule = [];
|
$schedule = [];
|
||||||
$delayed = DBA::select('delayed-post', [], ['uid' => local_user()]);
|
$delayed = DBA::select('delayed-post', [], ['uid' => local_user()]);
|
||||||
|
|
|
@ -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()->getNickname();
|
$path = 'profile/' . DI::app()->getUserNickname();
|
||||||
|
|
||||||
$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()->getNickname());
|
DI::baseUrl()->redirect('profile/' . DI::app()->getUserNickname());
|
||||||
}
|
}
|
||||||
|
|
||||||
$Image = Photo::getImageForPhoto($photos[0]);
|
$Image = Photo::getImageForPhoto($photos[0]);
|
||||||
|
|
|
@ -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()->getNickname() . '">'
|
: '<a href="' . DI::baseUrl() . '/photos/' . DI::app()->getUserNickname() . '">'
|
||||||
. DI::l10n()->t('select a photo from your photo albums') . '</a>'
|
. DI::l10n()->t('select a photo from your photo albums') . '</a>'
|
||||||
),
|
),
|
||||||
]);
|
]);
|
||||||
|
|
|
@ -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()->getNickname() . '.' . $action . '"');
|
header('Content-Disposition: attachment; filename="' . DI::app()->getUserNickname() . '.' . $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()->getNickname() . '.' . $action . '"');
|
header('Content-Disposition: attachment; filename="' . DI::app()->getUserNickname() . '.' . $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()->getNickname() . '-contacts.csv' . '"');
|
header('Content-Disposition: attachment; filename="' . DI::app()->getUserNickname() . '-contacts.csv' . '"');
|
||||||
self::exportContactsAsCSV(local_user());
|
self::exportContactsAsCSV(local_user());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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->getNickname()) . EOL;
|
$disclaimer .= $l10n->t('You may visit them online at %s', $baseUrl . '/profile/' . $a->getUserNickname()) . 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->getNickname() . '"><img src="' . $authorThumb . '" alt="' . $user['username'] . '" /></a><br /><br />';
|
$link = '<a href="' . $baseUrl . '/profile/' . $a->getUserNickname() . '"><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>';;
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ class AddContact
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = Contact::createFromProbe($uid, $url);
|
$result = Contact::createFromProbeForUser($uid, $url);
|
||||||
Logger::info('Added contact', ['uid' => $uid, 'url' => $url, 'result' => $result]);
|
Logger::info('Added contact', ['uid' => $uid, 'url' => $url, 'result' => $result]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,7 @@ function vier_init(App $a)
|
||||||
|
|
||||||
$args = DI::args();
|
$args = DI::args();
|
||||||
|
|
||||||
if ($args->get(0) === 'profile' && $args->get(1) === ($a->getNickname() ?? '') || $args->get(0) === 'network' && local_user()
|
if ($args->get(0) === 'profile' && $args->get(1) === ($a->getUserNickname() ?? '') || $args->get(0) === 'network' && local_user()
|
||||||
) {
|
) {
|
||||||
vier_community_info();
|
vier_community_info();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue