From e823a1bd0555eca499a65bb44b999e04dae1881a Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 8 Aug 2021 11:17:08 +0000 Subject: [PATCH] Replaced direct calls to App->user --- advancedcontentfilter/advancedcontentfilter.php | 2 +- ifttt/ifttt.php | 2 +- jappixmini/jappixmini.php | 2 +- langfilter/langfilter.php | 2 +- opmlexport/opmlexport.php | 4 ++-- securemail/SecureTestEmail.php | 2 +- statusnet/statusnet.php | 2 +- twitter/twitter.php | 4 ++-- windowsphonepush/windowsphonepush.php | 2 +- xmpp/xmpp.php | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php index d7af3eee..aedd6e8c 100644 --- a/advancedcontentfilter/advancedcontentfilter.php +++ b/advancedcontentfilter/advancedcontentfilter.php @@ -200,7 +200,7 @@ function advancedcontentfilter_content(App $a) } if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'help') { - $lang = $a->user['language']; + $lang = $a->getUserValue('language'); $default_dir = 'addon/advancedcontentfilter/doc/'; $help_file = 'advancedcontentfilter.md'; diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 67ffdd85..2cf45212 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->getNickname() . '

'; $s .= '

Method

'; $s .= '

POST

'; $s .= '

Content Type

'; diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index 0333d8ec..3d1a1972 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->getNickname(); } $info_text = DI::config()->get("jappixmini", "infotext"); diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index 0cf3e552..aaf6d16f 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->getNickname(); if ($logged_user_profile == $hook_data['item']['author-link']) { return; } diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php index ca65cbaa..28689f5d 100644 --- a/opmlexport/opmlexport.php +++ b/opmlexport/opmlexport.php @@ -43,8 +43,8 @@ function opmlexport(App $a) $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', $a->getUserValue('username') . '\'s RSS/Atom contacts'); + $outline->setAttribute('text', $a->getUserValue('username') . '\'s RSS/Atom contacts'); foreach($data as $c) { $entry = $xml->createElement('outline'); diff --git a/securemail/SecureTestEmail.php b/securemail/SecureTestEmail.php index 8341f545..b40f3a6f 100644 --- a/securemail/SecureTestEmail.php +++ b/securemail/SecureTestEmail.php @@ -52,7 +52,7 @@ class SecureTestEmail extends Email // 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, $a->getUserValue('email'), $subject, "

{$message}

", $message, [], local_user()); } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 6f4c3e20..d0e96a01 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -334,7 +334,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 ($a->getUserValue('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 8bc5940c..90e67610 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->getUserId(); $ckey = DI::config()->get('twitter', 'consumerkey'); $csecret = DI::config()->get('twitter', 'consumersecret'); @@ -356,7 +356,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 ($a->getUserValue('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 c5ff6965..ca2dd358 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 392dbe0e..c64a517a 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->getNickname() . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5); $auto_login = "auto_login: true, authentication: 'login',