From 9ad7500146cfdf775fc9744090a5fd50376f8709 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 8 Aug 2021 17:10:04 +0000 Subject: [PATCH] Remove the use of app function --- advancedcontentfilter/advancedcontentfilter.php | 5 ++++- opmlexport/opmlexport.php | 6 ++++-- securemail/SecureTestEmail.php | 5 ++++- statusnet/statusnet.php | 5 ++++- twitter/twitter.php | 5 ++++- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php index aedd6e8c9..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->getUserValue('language'); + $user = User::getById(local_user()); + + $lang = $user['language']; $default_dir = 'addon/advancedcontentfilter/doc/'; $help_file = 'advancedcontentfilter.md'; diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php index 28689f5d7..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->getUserValue('username') . '\'s RSS/Atom contacts'); - $outline->setAttribute('text', $a->getUserValue('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 b40f3a6f1..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->getUserValue('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 d0e96a01d..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->getUserValue('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 90e676100..56b5ead84 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -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->getUserValue('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, [