Merge pull request #6219 from MrPetovan/task/remove-x

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

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index d256b9adc1b0f0ba52a6f9f54124d22fe5dab7d7..d11fea03a1b017533474c9287a8a3fe3b56005ba 100644 (file)
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -9,6 +9,7 @@ namespace Friendica\Core;
 use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -345,8 +346,20 @@ class NotificationsManager extends BaseObject
 
                                        case ACTIVITY_FRIEND:
                                                if (!isset($it['object'])) {
-                                                       logger('Incomplete data: ' . json_encode($it) . ' - ' . System::callstack(20), LOGGER_DEBUG);
+                                                       $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::log('Complete data: ' . json_encode($it) . ' - ' . System::callstack(20), Logger::DEBUG);
 
                                                $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
                                                $obj = XML::parseString($xmlhead . $it['object']);
@@ -619,7 +632,7 @@ class NotificationsManager extends BaseObject
                        // We have to distinguish between these two because they use different data.
                        // Contact suggestions
                        if ($it['fid']) {
-                               $return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->get_hostname() . ((self::getApp()->urlpath) ? '/' . self::getApp()->urlpath : ''));
+                               $return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->getHostName() . ((self::getApp()->getURLPath()) ? '/' . self::getApp()->getURLPath() : ''));
 
                                $intro = [
                                        'label' => 'friend_suggestion',
@@ -630,7 +643,7 @@ class NotificationsManager extends BaseObject
                                        'madeby_zrl' => Contact::magicLink($it['url']),
                                        'madeby_addr' => $it['addr'],
                                        'contact_id' => $it['contact-id'],
-                                       'photo' => ((x($it, 'fphoto')) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-175.jpg"),
+                                       'photo' => (!empty($it['fphoto']) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
                                        'name' => $it['fname'],
                                        'url' => $it['furl'],
                                        'zrl' => Contact::magicLink($it['furl']),
@@ -645,6 +658,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'] = "";
@@ -658,7 +675,7 @@ class NotificationsManager extends BaseObject
                                        'uid' => $_SESSION['uid'],
                                        'intro_id' => $it['intro_id'],
                                        'contact_id' => $it['contact-id'],
-                                       'photo' => ((x($it, 'photo')) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-175.jpg"),
+                                       'photo' => (!empty($it['photo']) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
                                        'name' => $it['name'],
                                        'location' => BBCode::convert($it['glocation'], false),
                                        'about' => BBCode::convert($it['gabout'], false),
@@ -693,22 +710,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'];
                        }
                }