X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FNotificationsManager.php;h=8ac5d93c729d33779573990638b978af602dcf3e;hb=4913502922391d6c6852ed1d0325461dc500da21;hp=9ac24e57c061e384f186fd6365ab2c683fc946f6;hpb=71b017bfadba915fe162ad38a8230106f7ec360f;p=friendica.git diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index 9ac24e57c0..8ac5d93c72 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -9,19 +9,13 @@ namespace Friendica\Core; use Friendica\BaseObject; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\L10n; -use Friendica\Core\PConfig; -use Friendica\Core\System; -use Friendica\Database\DBM; +use Friendica\Database\DBA; use Friendica\Model\Contact; -use Friendica\Model\Profile; use Friendica\Model\Item; use Friendica\Util\DateTimeFormat; +use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Temporal; use Friendica\Util\XML; -use dba; - -require_once 'include/dba.php'; /** * @brief Methods for read and write notifications from/to database @@ -40,8 +34,9 @@ class NotificationsManager extends BaseObject * - date_rel : relative date string * - msg_html: message as html string * - msg_plain: message as plain text string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private function _set_extra($notes) + private function _set_extra(array $notes) { $rets = []; foreach ($notes as $n) { @@ -60,49 +55,28 @@ class NotificationsManager extends BaseObject * @brief Get all notifications for local_user() * * @param array $filter optional Array "column name"=>value: filter query by columns values - * @param string $order optional Space separated list of column to sort by. - * Prepend name with "+" to sort ASC, "-" to sort DESC. Default to "-date" + * @param array $order optional Array to order by * @param string $limit optional Query limits * - * @return array of results or false on errors + * @return array|bool of results or false on errors + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public function getAll($filter = [], $order = "-date", $limit = "") + public function getAll($filter = [], $order = ['date' => 'DESC'], $limit = "") { - $filter_str = []; - $filter_sql = ""; - foreach ($filter as $column => $value) { - $filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value)); - } - if (count($filter_str) > 0) { - $filter_sql = "AND " . implode(" AND ", $filter_str); - } + $params = []; - $aOrder = explode(" ", $order); - $asOrder = []; - foreach ($aOrder as $o) { - $dir = "asc"; - if ($o[0] === "-") { - $dir = "desc"; - $o = substr($o, 1); - } - if ($o[0] === "+") { - $dir = "asc"; - $o = substr($o, 1); - } - $asOrder[] = "$o $dir"; - } - $order_sql = implode(", ", $asOrder); + $params['order'] = $order; - if ($limit != "") { - $limit = " LIMIT " . $limit; + if (!empty($limit)) { + $params['limit'] = $limit; } - $r = q( - "SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit", - intval(local_user()) - ); - if (DBM::is_result($r)) { - return $this->_set_extra($r); + $dbFilter = array_merge($filter, ['uid' => local_user()]); + + $stmtNotifies = DBA::select('notify', [], $dbFilter, $params); + + if (DBA::isResult($stmtNotifies)) { + return $this->_set_extra(DBA::toArray($stmtNotifies)); } return false; @@ -113,16 +87,13 @@ class NotificationsManager extends BaseObject * * @param int $id identity * @return array note values or null if not found + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function getByID($id) { - $r = q( - "SELECT * FROM `notify` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($id), - intval(local_user()) - ); - if (DBM::is_result($r)) { - return $this->_set_extra($r)[0]; + $stmtNotify = DBA::selectFirst('notify', [], ['id' => $id, 'uid' => local_user()]); + if (DBA::isResult($stmtNotify)) { + return $this->_set_extra([$stmtNotify])[0]; } return null; } @@ -133,17 +104,17 @@ class NotificationsManager extends BaseObject * @param array $note note array * @param bool $seen optional true or false, default true * @return bool true on success, false on errors + * @throws \Exception */ public function setSeen($note, $seen = true) { - 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']), - intval($note['parent']), - dbesc($note['otype']), - intval(local_user()) - ); + return DBA::update('notify', ['seen' => $seen], [ + '(`link` = ? OR (`parent` != 0 AND `parent` = ? AND `otype` = ?)) AND `uid` = ?', + $note['link'], + $note['parent'], + $note['otype'], + local_user() + ]); } /** @@ -151,56 +122,56 @@ class NotificationsManager extends BaseObject * * @param bool $seen optional true or false. default true * @return bool true on success, false on error + * @throws \Exception */ public function setAllSeen($seen = true) { - return q( - "UPDATE `notify` SET `seen` = %d WHERE `uid` = %d", - intval($seen), - intval(local_user()) - ); + return DBA::update('notify', ['seen' => $seen], ['uid' => local_user()]); } /** * @brief List of pages for the Notifications TabBar * * @return array with with notifications TabBar data + * @throws \Exception */ 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', ], @@ -215,21 +186,21 @@ class NotificationsManager extends BaseObject * @param array $notifs The array from the db query * @param string $ident The notifications identifier (e.g. network) * @return array - * string 'label' => The type of the notification - * string 'link' => URL to the source - * string 'image' => The avatar image - * string 'url' => The profile url of the contact - * string 'text' => The notification text - * string 'when' => The date of the notification - * string 'ago' => T relative date of the notification - * bool 'seen' => Is the notification marked as "seen" + * string 'label' => The type of the notification + * string 'link' => URL to the source + * string 'image' => The avatar image + * string 'url' => The profile url of the contact + * string 'text' => The notification text + * string 'when' => The date of the notification + * string 'ago' => T relative date of the notification + * bool 'seen' => Is the notification marked as "seen" + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private function formatNotifs($notifs, $ident = "") + private function formatNotifs(array $notifs, $ident = "") { - $notif = []; $arr = []; - if (DBM::is_result($notifs)) { + if (DBA::isResult($notifs)) { foreach ($notifs as $it) { // Because we use different db tables for the notification query // we have sometimes $it['unseen'] and sometimes $it['seen]. @@ -238,12 +209,17 @@ class NotificationsManager extends BaseObject $it['seen'] = ($it['unseen'] > 0 ? false : true); } + // For feed items we use the user's contact, since the avatar is mostly self choosen. + if (!empty($it['network']) && $it['network'] == Protocol::FEED) { + $it['author-avatar'] = $it['contact-avatar']; + } + // Depending on the identifier of the notification we need to use different defaults switch ($ident) { 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 +229,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 +239,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 +254,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 +267,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 +280,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 +293,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 +306,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 +316,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::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']); $it['fname'] = $obj->title; @@ -347,7 +339,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, @@ -379,14 +371,15 @@ class NotificationsManager extends BaseObject /** * @brief Get network notifications * - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * @param int $start Start the query at this point - * @param int $limit Maximum number of query results + * @param int|string $seen If 0 only include notifications into the query + * which aren't marked as "seen" + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results * * @return array with - * string 'ident' => Notification identifier - * array 'notifications' => Network notifications + * string 'ident' => Notification identifier + * array 'notifications' => Network notifications + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function networkNotifs($seen = 0, $start = 0, $limit = 80) { @@ -399,13 +392,14 @@ class NotificationsManager extends BaseObject $condition['unseen'] = true; } - $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'created', - 'object', 'parent-author-name', 'parent-author-link', 'parent-guid']; - $params = ['order' => ['created' => true], 'limit' => [$start, $limit]]; - $items = Item::select(local_user(), $fields, $condition, $params); + $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar', + 'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid']; + $params = ['order' => ['received' => true], 'limit' => [$start, $limit]]; - if (DBM::is_result($items)) { - $notifs = $this->formatNotifs(dba::inArray($items), $ident); + $items = Item::selectForUser(local_user(), $fields, $condition, $params); + + if (DBA::isResult($items)) { + $notifs = $this->formatNotifs(Item::inArray($items), $ident); } $arr = [ @@ -419,14 +413,15 @@ class NotificationsManager extends BaseObject /** * @brief Get system notifications * - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * @param int $start Start the query at this point - * @param int $limit Maximum number of query results + * @param int|string $seen If 0 only include notifications into the query + * which aren't marked as "seen" + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results * * @return array with - * string 'ident' => Notification identifier - * array 'notifications' => System notifications + * string 'ident' => Notification identifier + * array 'notifications' => System notifications + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function systemNotifs($seen = 0, $start = 0, $limit = 80) { @@ -434,19 +429,22 @@ class NotificationsManager extends BaseObject $notifs = []; $sql_seen = ""; + $filter = ['uid' => local_user()]; if ($seen === 0) { - $sql_seen = " AND NOT `seen` "; + $filter['seen'] = false; } - $r = q( - "SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify` - WHERE `uid` = %d $sql_seen ORDER BY `date` DESC LIMIT %d, %d ", - intval(local_user()), - intval($start), - intval($limit) - ); - if (DBM::is_result($r)) { - $notifs = $this->formatNotifs($r, $ident); + $params = []; + $params['order'] = ['date' => 'DESC']; + $params['limit'] = [$start, $limit]; + + $stmtNotifies = DBA::select('notify', + ['id', 'url', 'photo', 'msg', 'date', 'seen', 'verb'], + $filter, + $params); + + if (DBA::isResult($stmtNotifies)) { + $notifs = $this->formatNotifs(DBA::toArray($stmtNotifies), $ident); } $arr = [ @@ -460,14 +458,15 @@ class NotificationsManager extends BaseObject /** * @brief Get personal notifications * - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * @param int $start Start the query at this point - * @param int $limit Maximum number of query results + * @param int|string $seen If 0 only include notifications into the query + * which aren't marked as "seen" + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results * * @return array with - * string 'ident' => Notification identifier - * array 'notifications' => Personal notifications + * string 'ident' => Notification identifier + * array 'notifications' => Personal notifications + * @throws \Exception */ public function personalNotifs($seen = 0, $start = 0, $limit = 80) { @@ -484,13 +483,14 @@ class NotificationsManager extends BaseObject $condition[0] .= " AND `unseen`"; } - $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'created', - 'object', 'parent-author-name', 'parent-author-link', 'parent-guid']; - $params = ['order' => ['created' => true], 'limit' => [$start, $limit]]; - $items = Item::select(local_user(), $fields, $condition, $params); + $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar', + 'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid']; + $params = ['order' => ['received' => true], 'limit' => [$start, $limit]]; + + $items = Item::selectForUser(local_user(), $fields, $condition, $params); - if (DBM::is_result($items)) { - $notifs = $this->formatNotifs(dba::inArray($items), $ident); + if (DBA::isResult($items)) { + $notifs = $this->formatNotifs(Item::inArray($items), $ident); } $arr = [ @@ -504,14 +504,15 @@ class NotificationsManager extends BaseObject /** * @brief Get home notifications * - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * @param int $start Start the query at this point - * @param int $limit Maximum number of query results + * @param int|string $seen If 0 only include notifications into the query + * which aren't marked as "seen" + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results * * @return array with - * string 'ident' => Notification identifier - * array 'notifications' => Home notifications + * string 'ident' => Notification identifier + * array 'notifications' => Home notifications + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function homeNotifs($seen = 0, $start = 0, $limit = 80) { @@ -524,13 +525,13 @@ class NotificationsManager extends BaseObject $condition['unseen'] = true; } - $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'created', - 'object', 'parent-author-name', 'parent-author-link', 'parent-guid']; - $params = ['order' => ['created' => true], 'limit' => [$start, $limit]]; - $items = Item::select(local_user(), $fields, $condition, $params); + $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar', + 'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid']; + $params = ['order' => ['received' => true], 'limit' => [$start, $limit]]; + $items = Item::selectForUser(local_user(), $fields, $condition, $params); - if (DBM::is_result($items)) { - $notifs = $this->formatNotifs(dba::inArray($items), $ident); + if (DBA::isResult($items)) { + $notifs = $this->formatNotifs(Item::inArray($items), $ident); } $arr = [ @@ -544,14 +545,16 @@ class NotificationsManager extends BaseObject /** * @brief Get introductions * - * @param bool $all If false only include introductions into the query - * which aren't marked as ignored - * @param int $start Start the query at this point - * @param int $limit Maximum number of query results + * @param bool $all If false only include introductions into the query + * which aren't marked as ignored + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results * * @return array with - * string 'ident' => Notification identifier - * array 'notifications' => Introductions + * string 'ident' => Notification identifier + * array 'notifications' => Introductions + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public function introNotifs($all = false, $start = 0, $limit = 80) { @@ -560,11 +563,11 @@ class NotificationsManager extends BaseObject $sql_extra = ""; if (!$all) { - $sql_extra = " AND `ignore` = 0 "; + $sql_extra = " AND NOT `ignore` "; } /// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact - $r = q( + $stmtNotifies = DBA::p( "SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, `fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`, `fcontact`.`addr` AS `faddr`, `fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`, @@ -575,14 +578,14 @@ class NotificationsManager extends BaseObject LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id` LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` - WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 - LIMIT %d, %d", - intval($_SESSION['uid']), - intval($start), - intval($limit) + WHERE `intro`.`uid` = ? $sql_extra AND `intro`.`blocked` = 0 + LIMIT ?, ?", + $_SESSION['uid'], + $start, + $limit ); - if (DBM::is_result($r)) { - $notifs = $this->formatIntros($r); + if (DBA::isResult($stmtNotifies)) { + $notifs = $this->formatIntros(DBA::toArray($stmtNotifies)); } $arr = [ @@ -598,17 +601,21 @@ class NotificationsManager extends BaseObject * * @param array $intros The array from the db query * @return array with the introductions + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private function formatIntros($intros) { $knowyou = ''; + $arr = []; + foreach ($intros as $it) { // There are two kind of introduction. Contacts suggested by other contacts and normal connection requests. // 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()->path) ? '/' . self::getApp()->path : '')); + $return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->getHostName() . ((self::getApp()->getURLPath()) ? '/' . self::getApp()->getURLPath() : '')); $intro = [ 'label' => 'friend_suggestion', @@ -619,7 +626,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' => (!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']), @@ -634,20 +641,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' => (!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), @@ -677,27 +688,28 @@ class NotificationsManager extends BaseObject * @param array $arr The input array with the intro data * * @return array The array with the intro data + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private function getMissingIntroData($arr) { // 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']; } }