Remove the use of app function

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index aedd6e8c908ef898e741f488cecdd37a82a668b7..bd97b309c5e174dffa5821944b2b38f2ca2195e0 100644 (file)
--- 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 28689f5d752e18cff9bba43398ee4da6441a6406..5d6139416863b6917de2f5ad4ad753952948ddbb 100644 (file)
--- 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 b40f3a6f16e4f6bccadfadb787517ef60d308469..b3abcd509f06f7a198e0ab1fd7592685c60fe941 100644 (file)
--- 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, "<p>{$message}</p>", $message,
                        [], local_user());
        }

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index d0e96a01dc8042dd59d51cd69e44c020cdfecd1e..1a3ba1f9785049d1837d5d9ebde8bea8640a714e 100644 (file)
--- 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'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/statusnet/statusnet.css' . '" media="all" />' . "\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 .= '<div id="statusnet-info" ><img id="statusnet-avatar" src="' . $details->profile_image_url . '" /><p id="statusnet-info-block">' . DI::l10n()->t('Currently connected to: ') . '<a href="' . $details->statusnet_profile_url . '" target="_statusnet">' . $details->screen_name . '</a><br /><em>' . $details->description . '</em></p></div>';
                        }
                        $s .= '<p>' . DI::l10n()->t('If enabled all your <strong>public</strong> 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.') . '</p>';
-                       if ($a->getUserValue('hidewall')) {
+                       if ($user['hidewall']) {
                                $s .= '<p>' . DI::l10n()->t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) 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.') . '</p>';
                        }
                        $s .= '<div id="statusnet-enable-wrapper">';

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 90e6761004a76b3c658e0e11d217f10825ee5e7b..56b5ead84c43b6048c422a5df9eb67af7ac8875d 100644 (file)
--- 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'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/twitter/twitter.css' . '" media="all" />' . "\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 <strong>public</strong> 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 .= '<p>' . DI::l10n()->t('<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) 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.') . '</p>';
                                }
                                $s .= Renderer::replaceMacros($field_checkbox, [