X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FNotificationsManager.php;h=f8c4ee3f86dc9798fe2eac29867229f6292ec44c;hb=31d47ade784c080e15626305e7cc49be85ee67b6;hp=36e0fd29ed8c40c2bfeb4c5b2bab2c65dc795abf;hpb=ecea7425f8ad11ace4af39d476919e3203bff44f;p=friendica.git diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index 36e0fd29ed..f8c4ee3f86 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -9,10 +9,12 @@ namespace Friendica\Core; use Friendica\BaseObject; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; +use Friendica\Core\Protocol; use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Item; use Friendica\Util\DateTimeFormat; +use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Temporal; use Friendica\Util\XML; @@ -66,7 +68,7 @@ class NotificationsManager extends BaseObject $filter_str = []; $filter_sql = ""; foreach ($filter as $column => $value) { - $filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value)); + $filter_str[] = sprintf("`%s` = '%s'", $column, DBA::escape($value)); } if (count($filter_str) > 0) { $filter_sql = "AND " . implode(" AND ", $filter_str); @@ -134,9 +136,9 @@ class NotificationsManager extends BaseObject return q( "UPDATE `notify` SET `seen` = %d WHERE (`link` = '%s' OR (`parent` != 0 AND `parent` = %d AND `otype` = '%s')) AND `uid` = %d", intval($seen), - dbesc($note['link']), + DBA::escape($note['link']), intval($note['parent']), - dbesc($note['otype']), + DBA::escape($note['otype']), intval(local_user()) ); } @@ -163,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', ], @@ -234,7 +238,7 @@ class NotificationsManager extends BaseObject } // For feed items we use the user's contact, since the avatar is mostly self choosen. - if (!empty($it['network']) && $it['network'] == NETWORK_FEED) { + if (!empty($it['network']) && $it['network'] == Protocol::FEED) { $it['author-avatar'] = $it['contact-avatar']; } @@ -243,7 +247,7 @@ class NotificationsManager extends BaseObject case 'system': $default_item_label = 'notify'; $default_item_link = System::baseUrl(true) . '/notify/view/' . $it['id']; - $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); + $default_item_image = ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_MICRO); $default_item_url = $it['url']; $default_item_text = strip_tags(BBCode::convert($it['msg'])); $default_item_when = DateTimeFormat::local($it['date'], 'r'); @@ -253,7 +257,7 @@ class NotificationsManager extends BaseObject case 'home': $default_item_label = 'comment'; $default_item_link = System::baseUrl(true) . '/display/' . $it['parent-guid']; - $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); + $default_item_image = ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO); $default_item_url = $it['author-link']; $default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['parent-author-name']); $default_item_when = DateTimeFormat::local($it['created'], 'r'); @@ -263,7 +267,7 @@ class NotificationsManager extends BaseObject default: $default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment'); $default_item_link = System::baseUrl(true) . '/display/' . $it['parent-guid']; - $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); + $default_item_image = ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO); $default_item_url = $it['author-link']; $default_item_text = (($it['id'] == $it['parent']) ? L10n::t("%s created a new post", $it['author-name']) @@ -278,7 +282,7 @@ class NotificationsManager extends BaseObject $notif = [ 'label' => 'like', 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], - 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO), 'url' => $it['author-link'], 'text' => L10n::t("%s liked %s's post", $it['author-name'], $it['parent-author-name']), 'when' => $default_item_when, @@ -291,7 +295,7 @@ class NotificationsManager extends BaseObject $notif = [ 'label' => 'dislike', 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], - 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO), 'url' => $it['author-link'], 'text' => L10n::t("%s disliked %s's post", $it['author-name'], $it['parent-author-name']), 'when' => $default_item_when, @@ -304,7 +308,7 @@ class NotificationsManager extends BaseObject $notif = [ 'label' => 'attend', 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], - 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO), 'url' => $it['author-link'], 'text' => L10n::t("%s is attending %s's event", $it['author-name'], $it['parent-author-name']), 'when' => $default_item_when, @@ -317,7 +321,7 @@ class NotificationsManager extends BaseObject $notif = [ 'label' => 'attendno', 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], - 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO), 'url' => $it['author-link'], 'text' => L10n::t("%s is not attending %s's event", $it['author-name'], $it['parent-author-name']), 'when' => $default_item_when, @@ -330,7 +334,7 @@ class NotificationsManager extends BaseObject $notif = [ 'label' => 'attendmaybe', 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], - 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO), 'url' => $it['author-link'], 'text' => L10n::t("%s may attend %s's event", $it['author-name'], $it['parent-author-name']), 'when' => $default_item_when, @@ -340,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; @@ -347,7 +367,7 @@ class NotificationsManager extends BaseObject $notif = [ 'label' => 'friend', 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], - 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO), 'url' => $it['author-link'], 'text' => L10n::t("%s is now friends with %s", $it['author-name'], $it['fname']), 'when' => $default_item_when, @@ -622,7 +642,7 @@ class NotificationsManager extends BaseObject 'madeby_zrl' => Contact::magicLink($it['url']), 'madeby_addr' => $it['addr'], 'contact_id' => $it['contact-id'], - 'photo' => ((x($it, 'fphoto')) ? proxy_url($it['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), + 'photo' => ((x($it, 'fphoto')) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-175.jpg"), 'name' => $it['fname'], 'url' => $it['furl'], 'zrl' => Contact::magicLink($it['furl']), @@ -637,20 +657,24 @@ 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'] === NETWORK_DIASPORA) { + if ($it['gnetwork'] === Protocol::DIASPORA) { $it['glocation'] = ""; $it['gabout'] = ""; $it['ggender'] = ""; } $intro = [ - 'label' => (($it['network'] !== NETWORK_OSTATUS) ? 'friend_request' : 'follower'), - 'notify_type' => (($it['network'] !== NETWORK_OSTATUS) ? L10n::t('Friend/Connect Request') : L10n::t('New Follower')), + 'label' => (($it['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'), + 'notify_type' => (($it['network'] !== Protocol::OSTATUS) ? L10n::t('Friend/Connect Request') : L10n::t('New Follower')), 'dfrn_id' => $it['issued-id'], 'uid' => $_SESSION['uid'], 'intro_id' => $it['intro_id'], 'contact_id' => $it['contact-id'], - 'photo' => ((x($it, 'photo')) ? proxy_url($it['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), + 'photo' => ((x($it, 'photo')) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-175.jpg"), 'name' => $it['name'], 'location' => BBCode::convert($it['glocation'], false), 'about' => BBCode::convert($it['gabout'], false), @@ -685,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']; } }