diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php index d7af3eee2..bd97b309c 100644 --- a/advancedcontentfilter/advancedcontentfilter.php +++ b/advancedcontentfilter/advancedcontentfilter.php @@ -45,6 +45,7 @@ use Friendica\DI; use Friendica\Model\Item; use Friendica\Model\Post; use Friendica\Model\Tag; +use Friendica\Model\User; use Friendica\Module\Security\Login; use Friendica\Network\HTTPException; use Friendica\Util\DateTimeFormat; @@ -200,7 +201,9 @@ function advancedcontentfilter_content(App $a) } if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'help') { - $lang = $a->user['language']; + $user = User::getById(local_user()); + + $lang = $user['language']; $default_dir = 'addon/advancedcontentfilter/doc/'; $help_file = 'advancedcontentfilter.md'; diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index fced70d6e..2b1bdd799 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -57,7 +57,7 @@ function ifttt_settings(App $a, &$s) $s .= '
'; $s .= '

' . DI::l10n()->t('Create an account at IFTTT. Create three Facebook recipes that are connected with Maker (In the form "if Facebook then Maker") with the following parameters:') . '

'; $s .= '

URL

'; - $s .= '

' . DI::baseUrl()->get() . '/ifttt/' . $a->user['nickname'] . '

'; + $s .= '

' . DI::baseUrl()->get() . '/ifttt/' . $a->getLoggedInUserNickname() . '

'; $s .= '

Method

'; $s .= '

POST

'; $s .= '

Content Type

'; diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index 0333d8ecf..0e0abfc89 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -283,7 +283,7 @@ function jappixmini_settings(App $a, &$s) } if (($username == "") && DI::config()->get("jappixmini", "default_user")) { - $username = $a->user["nickname"]; + $username = $a->getLoggedInUserNickname(); } $info_text = DI::config()->get("jappixmini", "infotext"); diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index 0cf3e552c..aeb53eebd 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -105,7 +105,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data) // Never filter own messages // TODO: find a better way to extract this - $logged_user_profile = DI::baseUrl()->get() . '/profile/' . $a->user['nickname']; + $logged_user_profile = DI::baseUrl()->get() . '/profile/' . $a->getLoggedInUserNickname(); if ($logged_user_profile == $hook_data['item']['author-link']) { return; } diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php index ca65cbaab..5d6139416 100644 --- a/opmlexport/opmlexport.php +++ b/opmlexport/opmlexport.php @@ -16,6 +16,7 @@ use Friendica\Database\DBA; use Friendica\Core\Renderer; use Friendica\Core\Protocol; use Friendica\Model\Contact; +use Friendica\Model\User; function opmlexport_install() { @@ -37,14 +38,15 @@ function opmlexport(App $a) 'network' => Protocol::FEED ]; $data = Contact::selectToArray([], $condition, ['order' => ['name']]); + $user = User::getById(local_user()); $xml = new \DOMDocument( '1.0', 'utf-8' ); $opml = $xml->createElement('opml'); $head = $xml->createElement('head'); $body = $xml->createElement('body'); $outline = $xml->createElement('outline'); - $outline->setAttribute('title', $a->user['username'] . '\'s RSS/Atom contacts'); - $outline->setAttribute('text', $a->user['username'] . '\'s RSS/Atom contacts'); + $outline->setAttribute('title', $user['username'] . '\'s RSS/Atom contacts'); + $outline->setAttribute('text', $user['username'] . '\'s RSS/Atom contacts'); foreach($data as $c) { $entry = $xml->createElement('outline'); diff --git a/securemail/SecureTestEmail.php b/securemail/SecureTestEmail.php index 8341f5451..b3abcd509 100644 --- a/securemail/SecureTestEmail.php +++ b/securemail/SecureTestEmail.php @@ -25,6 +25,7 @@ use Friendica\App; use Friendica\App\BaseURL; use Friendica\Core\Config\IConfig; use Friendica\Core\PConfig\IPConfig; +use Friendica\Model\User; use Friendica\Object\Email; /** @@ -46,13 +47,15 @@ class SecureTestEmail extends Email $sender_email = 'noreply@' . $hostname; } + $user = User::getById(local_user()); + $subject = 'Friendica - Secure Mail - Test'; $message = 'This is a test message from your Friendica Secure Mail addon.'; // enable addon for test $pConfig->set(local_user(), 'securemail', 'enable', 1); - parent::__construct($sitename, $sender_email, $sender_email, $a->user['email'], + parent::__construct($sitename, $sender_email, $sender_email, $user['email'], $subject, "

{$message}

", $message, [], local_user()); } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 6f4c3e20d..1a3ba1f97 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -216,6 +216,9 @@ function statusnet_settings(App $a, &$s) if (!local_user()) { return; } + + $user = User::getById(local_user()); + DI::page()['htmlhead'] .= '' . "\r\n"; /* * * * 1) Check that we have a base api url and a consumer key & secret @@ -334,7 +337,7 @@ function statusnet_settings(App $a, &$s) $s .= '

' . DI::l10n()->t('Currently connected to: ') . '' . $details->screen_name . '
' . $details->description . '

'; } $s .= '

' . DI::l10n()->t('If enabled all your public postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') . '

'; - if ($a->user['hidewall']) { + if ($user['hidewall']) { $s .= '

' . DI::l10n()->t('Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '

'; } $s .= '
'; diff --git a/twitter/twitter.php b/twitter/twitter.php index b3527d32f..0cf5637e3 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -146,7 +146,7 @@ function twitter_follow(App $a, array &$contact) $nickname = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $contact["url"]); $nickname = str_replace("@twitter.com", "", $nickname); - $uid = $a->user["uid"]; + $uid = $a->getLoggedInUserId(); $ckey = DI::config()->get('twitter', 'consumerkey'); $csecret = DI::config()->get('twitter', 'consumersecret'); @@ -266,6 +266,9 @@ function twitter_settings(App $a, &$s) if (!local_user()) { return; } + + $user = User::getById(local_user()); + DI::page()['htmlhead'] .= '' . "\r\n"; /* * * * 1) Check that we have global consumer key & secret @@ -356,7 +359,7 @@ function twitter_settings(App $a, &$s) $s .= Renderer::replaceMacros($field_checkbox, [ '$field' => ['twitter-enable', DI::l10n()->t('Allow posting to Twitter'), $enabled, DI::l10n()->t('If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')] ]); - if ($a->user['hidewall']) { + if ($user['hidewall']) { $s .= '

' . DI::l10n()->t('Note: Due to your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '

'; } $s .= Renderer::replaceMacros($field_checkbox, [ diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php index c5ff6965e..ca2dd3588 100644 --- a/windowsphonepush/windowsphonepush.php +++ b/windowsphonepush/windowsphonepush.php @@ -460,5 +460,5 @@ function windowsphonepush_login(App $a) DI::auth()->setForUser($a, $record); DI::session()->set('allow_api', true); - Hook::callAll('logged_in', $a->user); + Hook::callAll('logged_in', $record); } diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php index 392dbe0e9..2f359a7e8 100644 --- a/xmpp/xmpp.php +++ b/xmpp/xmpp.php @@ -153,7 +153,7 @@ function xmpp_converse(App $a) DI::pConfig()->set(local_user(), "xmpp", "password", $password); } - $jid = $a->user["nickname"] . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5); + $jid = $a->getLoggedInUserNickname() . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5); $auto_login = "auto_login: true, authentication: 'login',