Changing Friendica\App\Mode from static methods to public methods

[friendica.git] / src / Core / NotificationsManager.php

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index 734e4eb03095acfa3c8bd2e477444275fc8b2d07..f8c4ee3f86dc9798fe2eac29867229f6292ec44c 100644 (file)
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -165,39 +165,41 @@ class NotificationsManager extends BaseObject
         */
        public function getTabs()
        {
+               $selected = defaults(self::getApp()->argv, 1, '');
+
                $tabs = [
                        [
                                'label' => L10n::t('System'),
                                'url'   => 'notifications/system',
-                               'sel'   => ((self::getApp()->argv[1] == 'system') ? 'active' : ''),
+                               'sel'   => (($selected == 'system') ? 'active' : ''),
                                'id'    => 'system-tab',
                                'accesskey' => 'y',
                        ],
                        [
                                'label' => L10n::t('Network'),
                                'url'   => 'notifications/network',
-                               'sel'   => ((self::getApp()->argv[1] == 'network') ? 'active' : ''),
+                               'sel'   => (($selected == 'network') ? 'active' : ''),
                                'id'    => 'network-tab',
                                'accesskey' => 'w',
                        ],
                        [
                                'label' => L10n::t('Personal'),
                                'url'   => 'notifications/personal',
-                               'sel'   => ((self::getApp()->argv[1] == 'personal') ? 'active' : ''),
+                               'sel'   => (($selected == 'personal') ? 'active' : ''),
                                'id'    => 'personal-tab',
                                'accesskey' => 'r',
                        ],
                        [
                                'label' => L10n::t('Home'),
                                'url'   => 'notifications/home',
-                               'sel'   => ((self::getApp()->argv[1] == 'home') ? 'active' : ''),
+                               'sel'   => (($selected == 'home') ? 'active' : ''),
                                'id'    => 'home-tab',
                                'accesskey' => 'h',
                        ],
                        [
                                'label' => L10n::t('Introductions'),
                                'url'   => 'notifications/intros',
-                               'sel'   => ((self::getApp()->argv[1] == 'intros') ? 'active' : ''),
+                               'sel'   => (($selected == 'intros') ? 'active' : ''),
                                'id'    => 'intro-tab',
                                'accesskey' => 'i',
                        ],
@@ -342,6 +344,22 @@ class NotificationsManager extends BaseObject
                                                break;
 
                                        case ACTIVITY_FRIEND:
+                                               if (!isset($it['object'])) {
+                                                       $notif = [
+                                                               'label' => 'friend',
+                                                               'link' => $default_item_link,
+                                                               'image' => $default_item_image,
+                                                               'url' => $default_item_url,
+                                                               'text' => $default_item_text,
+                                                               'when' => $default_item_when,
+                                                               'ago' => $default_item_ago,
+                                                               'seen' => $it['seen']
+                                                       ];
+                                                       break;
+                                               }
+                                               /// @todo Check if this part here is used at all
+                                               logger('Complete data: ' . json_encode($it) . ' - ' . System::callstack(20), LOGGER_DEBUG);
+
                                                $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
                                                $obj = XML::parseString($xmlhead . $it['object']);
                                                $it['fname'] = $obj->title;
@@ -639,6 +657,10 @@ class NotificationsManager extends BaseObject
                        } else {
                                $it = $this->getMissingIntroData($it);
 
+                               if (empty($it['url'])) {
+                                       continue;
+                               }
+
                                // Don't show these data until you are connected. Diaspora is doing the same.
                                if ($it['gnetwork'] === Protocol::DIASPORA) {
                                        $it['glocation'] = "";
@@ -687,22 +709,22 @@ class NotificationsManager extends BaseObject
        {
                // If the network and the addr isn't available from the gcontact
                // table entry, take the one of the contact table entry
-               if ($arr['gnetwork'] == "") {
+               if (empty($arr['gnetwork']) && !empty($arr['network'])) {
                        $arr['gnetwork'] = $arr['network'];
                }
-               if ($arr['gaddr'] == "") {
+               if (empty($arr['gaddr']) && !empty($arr['addr'])) {
                        $arr['gaddr'] = $arr['addr'];
                }
 
                // If the network and addr is still not available
                // get the missing data data from other sources
-               if ($arr['gnetwork'] == "" || $arr['gaddr'] == "") {
+               if (empty($arr['gnetwork']) || empty($arr['gaddr'])) {
                        $ret = Contact::getDetailsByURL($arr['url']);
 
-                       if ($arr['gnetwork'] == "" && $ret['network'] != "") {
+                       if (empty($arr['gnetwork']) && !empty($ret['network'])) {
                                $arr['gnetwork'] = $ret['network'];
                        }
-                       if ($arr['gaddr'] == "" && $ret['addr'] != "") {
+                       if (empty($arr['gaddr']) && !empty($ret['addr'])) {
                                $arr['gaddr'] = $ret['addr'];
                        }
                }