Replaced direct calls to App->user

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index d7af3eee22052cca9fc46f9b32f86a4ce9915753..aedd6e8c908ef898e741f488cecdd37a82a668b7 100644 (file)
--- 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 67ffdd8587bf5fd716ec357b6c3ca8c5d79f9650..2cf452120a7b7eda7932ff7062493c11a14fa261 100644 (file)
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -57,7 +57,7 @@ function ifttt_settings(App $a, &$s)
        $s .= '<div id="ifttt-configuration-wrapper">';
        $s .= '<p>' . DI::l10n()->t('Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:') . '</p>';
        $s .= '<h4>URL</h4>';
-       $s .= '<p>' . DI::baseUrl()->get() . '/ifttt/' . $a->user['nickname'] . '</p>';
+       $s .= '<p>' . DI::baseUrl()->get() . '/ifttt/' . $a->getNickname() . '</p>';
        $s .= '<h4>Method</h4>';
        $s .= '<p>POST</p>';
        $s .= '<h4>Content Type</h4>';

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 0333d8ecf79dee33e0f0a7960cb51e35c13d8820..3d1a197275b22154b49d2d4c4ebb7b8dfea4220e 100644 (file)
--- 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 0cf3e552cb7dfea4be7b1c1c12723159d83ec1fc..aaf6d16f637ba64d88db4f0bfa3e9bb7dde939e0 100644 (file)
--- 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 ca65cbaab812b8c3076bd8930032272ef27c3f99..28689f5d752e18cff9bba43398ee4da6441a6406 100644 (file)
--- 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 8341f5451b1f7bd84fe461226fa73d0500680b1c..b40f3a6f16e4f6bccadfadb787517ef60d308469 100644 (file)
--- 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, "<p>{$message}</p>", $message,
                        [], local_user());
        }

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 6f4c3e20da6d2d7bf74b863fe9e55f2c81cdaff1..d0e96a01dc8042dd59d51cd69e44c020cdfecd1e 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -334,7 +334,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->user['hidewall']) {
+                       if ($a->getUserValue('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 8bc5940cf1ddd2d5b14ac4b4b741654c78156811..90e6761004a76b3c658e0e11d217f10825ee5e7b 100644 (file)
--- 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 <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->user['hidewall']) {
+                               if ($a->getUserValue('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, [

diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index c5ff6965e5bdb880fd3bed71da57d6c73c43a560..ca2dd358867b256a5ab9481183f5464c0e854531 100644 (file)
--- 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 392dbe0e983ab46e8baefd6cbfe2786e3c5938f1..c64a517a959355ee623e40705e5dd959a220cc72 100644 (file)
--- 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',