X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FNotificationsManager.php;h=36e0fd29ed8c40c2bfeb4c5b2bab2c65dc795abf;hb=cfa68c52b9117616fa95a4639ad74e7d220d193d;hp=e3f3da49830036d7beb9fc260891421212eac770;hpb=4fb2547df87825c136d3ee080bc6960f5c957c65;p=friendica.git diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index e3f3da4983..36e0fd29ed 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -1,24 +1,22 @@ $value) { $filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value)); @@ -75,7 +73,7 @@ class NotificationsManager extends BaseObject } $aOrder = explode(" ", $order); - $asOrder = array(); + $asOrder = []; foreach ($aOrder as $o) { $dir = "asc"; if ($o[0] === "-") { @@ -98,7 +96,7 @@ class NotificationsManager extends BaseObject intval(local_user()) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { return $this->_set_extra($r); } @@ -118,7 +116,7 @@ class NotificationsManager extends BaseObject intval($id), intval(local_user()) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { return $this->_set_extra($r)[0]; } return null; @@ -134,7 +132,7 @@ class NotificationsManager extends BaseObject 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", + "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']), @@ -165,43 +163,43 @@ class NotificationsManager extends BaseObject */ public function getTabs() { - $tabs = array( - array( - 'label' => t('System'), + $tabs = [ + [ + 'label' => L10n::t('System'), 'url' => 'notifications/system', 'sel' => ((self::getApp()->argv[1] == 'system') ? 'active' : ''), 'id' => 'system-tab', 'accesskey' => 'y', - ), - array( - 'label' => t('Network'), + ], + [ + 'label' => L10n::t('Network'), 'url' => 'notifications/network', 'sel' => ((self::getApp()->argv[1] == 'network') ? 'active' : ''), 'id' => 'network-tab', 'accesskey' => 'w', - ), - array( - 'label' => t('Personal'), + ], + [ + 'label' => L10n::t('Personal'), 'url' => 'notifications/personal', 'sel' => ((self::getApp()->argv[1] == 'personal') ? 'active' : ''), 'id' => 'personal-tab', 'accesskey' => 'r', - ), - array( - 'label' => t('Home'), + ], + [ + 'label' => L10n::t('Home'), 'url' => 'notifications/home', 'sel' => ((self::getApp()->argv[1] == 'home') ? 'active' : ''), 'id' => 'home-tab', 'accesskey' => 'h', - ), - array( - 'label' => t('Introductions'), + ], + [ + 'label' => L10n::t('Introductions'), 'url' => 'notifications/intros', 'sel' => ((self::getApp()->argv[1] == 'intros') ? 'active' : ''), 'id' => 'intro-tab', 'accesskey' => 'i', - ), - ); + ], + ]; return $tabs; } @@ -221,12 +219,12 @@ class NotificationsManager extends BaseObject * string 'ago' => T relative date of the notification * bool 'seen' => Is the notification marked as "seen" */ - private function formatNotifs($notifs, $ident = "") + private function formatNotifs(array $notifs, $ident = "") { - $notif = array(); - $arr = array(); + $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]. @@ -235,6 +233,11 @@ 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'] == NETWORK_FEED) { + $it['author-avatar'] = $it['contact-avatar']; + } + // Depending on the identifier of the notification we need to use different defaults switch ($ident) { case 'system': @@ -242,119 +245,119 @@ class NotificationsManager extends BaseObject $default_item_link = System::baseUrl(true) . '/notify/view/' . $it['id']; $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); $default_item_url = $it['url']; - $default_item_text = strip_tags(bbcode($it['msg'])); - $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['date'], 'r'); - $default_item_ago = relative_date($it['date']); + $default_item_text = strip_tags(BBCode::convert($it['msg'])); + $default_item_when = DateTimeFormat::local($it['date'], 'r'); + $default_item_ago = Temporal::getRelativeDate($it['date']); break; case 'home': $default_item_label = 'comment'; - $default_item_link = System::baseUrl(true) . '/display/' . $it['pguid']; + $default_item_link = System::baseUrl(true) . '/display/' . $it['parent-guid']; $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); $default_item_url = $it['author-link']; - $default_item_text = sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']); - $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r'); - $default_item_ago = relative_date($it['created']); + $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'); + $default_item_ago = Temporal::getRelativeDate($it['created']); break; default: $default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment'); - $default_item_link = System::baseUrl(true) . '/display/' . $it['pguid']; + $default_item_link = System::baseUrl(true) . '/display/' . $it['parent-guid']; $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); $default_item_url = $it['author-link']; $default_item_text = (($it['id'] == $it['parent']) - ? sprintf(t("%s created a new post"), $it['author-name']) - : sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname'])); - $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r'); - $default_item_ago = relative_date($it['created']); + ? L10n::t("%s created a new post", $it['author-name']) + : L10n::t("%s commented on %s's post", $it['author-name'], $it['parent-author-name'])); + $default_item_when = DateTimeFormat::local($it['created'], 'r'); + $default_item_ago = Temporal::getRelativeDate($it['created']); } // Transform the different types of notification in an usable array switch ($it['verb']) { case ACTIVITY_LIKE: - $notif = array( + $notif = [ 'label' => 'like', - 'link' => System::baseUrl(true) . '/display/' . $it['pguid'], + 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'url' => $it['author-link'], - 'text' => sprintf(t("%s liked %s's post"), $it['author-name'], $it['pname']), + 'text' => L10n::t("%s liked %s's post", $it['author-name'], $it['parent-author-name']), 'when' => $default_item_when, 'ago' => $default_item_ago, 'seen' => $it['seen'] - ); + ]; break; case ACTIVITY_DISLIKE: - $notif = array( + $notif = [ 'label' => 'dislike', - 'link' => System::baseUrl(true) . '/display/' . $it['pguid'], + 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'url' => $it['author-link'], - 'text' => sprintf(t("%s disliked %s's post"), $it['author-name'], $it['pname']), + 'text' => L10n::t("%s disliked %s's post", $it['author-name'], $it['parent-author-name']), 'when' => $default_item_when, 'ago' => $default_item_ago, 'seen' => $it['seen'] - ); + ]; break; case ACTIVITY_ATTEND: - $notif = array( + $notif = [ 'label' => 'attend', - 'link' => System::baseUrl(true) . '/display/' . $it['pguid'], + 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'url' => $it['author-link'], - 'text' => sprintf(t("%s is attending %s's event"), $it['author-name'], $it['pname']), + 'text' => L10n::t("%s is attending %s's event", $it['author-name'], $it['parent-author-name']), 'when' => $default_item_when, 'ago' => $default_item_ago, 'seen' => $it['seen'] - ); + ]; break; case ACTIVITY_ATTENDNO: - $notif = array( + $notif = [ 'label' => 'attendno', - 'link' => System::baseUrl(true) . '/display/' . $it['pguid'], + 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'url' => $it['author-link'], - 'text' => sprintf(t("%s is not attending %s's event"), $it['author-name'], $it['pname']), + 'text' => L10n::t("%s is not attending %s's event", $it['author-name'], $it['parent-author-name']), 'when' => $default_item_when, 'ago' => $default_item_ago, 'seen' => $it['seen'] - ); + ]; break; case ACTIVITY_ATTENDMAYBE: - $notif = array( + $notif = [ 'label' => 'attendmaybe', - 'link' => System::baseUrl(true) . '/display/' . $it['pguid'], + 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'url' => $it['author-link'], - 'text' => sprintf(t("%s may attend %s's event"), $it['author-name'], $it['pname']), + 'text' => L10n::t("%s may attend %s's event", $it['author-name'], $it['parent-author-name']), 'when' => $default_item_when, 'ago' => $default_item_ago, 'seen' => $it['seen'] - ); + ]; break; case ACTIVITY_FRIEND: $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; - $obj = parse_xml_string($xmlhead . $it['object']); + $obj = XML::parseString($xmlhead . $it['object']); $it['fname'] = $obj->title; - $notif = array( + $notif = [ 'label' => 'friend', - 'link' => System::baseUrl(true) . '/display/' . $it['pguid'], + 'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'], 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'url' => $it['author-link'], - 'text' => sprintf(t("%s is now friends with %s"), $it['author-name'], $it['fname']), + 'text' => L10n::t("%s is now friends with %s", $it['author-name'], $it['fname']), 'when' => $default_item_when, 'ago' => $default_item_ago, 'seen' => $it['seen'] - ); + ]; break; default: - $notif = array( + $notif = [ 'label' => $default_item_label, 'link' => $default_item_link, 'image' => $default_item_image, @@ -363,7 +366,7 @@ class NotificationsManager extends BaseObject 'when' => $default_item_when, 'ago' => $default_item_ago, 'seen' => $it['seen'] - ); + ]; } $arr[] = $notif; @@ -373,36 +376,6 @@ class NotificationsManager extends BaseObject return $arr; } - /** - * @brief Total number of network notifications - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * - * @return int Number of network notifications - */ - private function networkTotal($seen = 0) - { - $sql_seen = ""; - - if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; - } - - $r = q( - "SELECT COUNT(*) AS `total` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 - $sql_seen", - intval(local_user()) - ); - if (DBM::is_result($r)) { - return $r[0]['total']; - } - - return 0; - } - /** * @brief Get network notifications * @@ -413,72 +386,37 @@ class NotificationsManager extends BaseObject * * @return array with * string 'ident' => Notification identifier - * int 'total' => Total number of available network notifications * array 'notifications' => Network notifications */ public function networkNotifs($seen = 0, $start = 0, $limit = 80) { $ident = 'network'; - $total = $this->networkTotal($seen); - $notifs = array(); - $sql_seen = ""; + $notifs = []; + + $condition = ['wall' => false, 'uid' => local_user()]; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $condition['unseen'] = true; } - $r = q( - "SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, - `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 - $sql_seen - ORDER BY `item`.`created` DESC LIMIT %d, %d ", - intval(local_user()), - intval($start), - intval($limit) - ); - if (DBM::is_result($r)) { - $notifs = $this->formatNotifs($r, $ident); + $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' => ['created' => true], 'limit' => [$start, $limit]]; + + $items = Item::selectForUser(local_user(), $fields, $condition, $params); + + if (DBA::isResult($items)) { + $notifs = $this->formatNotifs(Item::inArray($items), $ident); } $arr = [ 'notifications' => $notifs, 'ident' => $ident, - 'total' => $total, ]; return $arr; } - /** - * @brief Total number of system notifications - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * - * @return int Number of system notifications - */ - private function systemTotal($seen = 0) - { - $sql_seen = ""; - - if ($seen === 0) { - $sql_seen = " AND `seen` = 0 "; - } - - $r = q( - "SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen", - intval(local_user()) - ); - if (DBM::is_result($r)) { - return $r[0]['total']; - } - - return 0; - } - /** * @brief Get system notifications * @@ -489,93 +427,38 @@ class NotificationsManager extends BaseObject * * @return array with * string 'ident' => Notification identifier - * int 'total' => Total number of available system notifications * array 'notifications' => System notifications */ public function systemNotifs($seen = 0, $start = 0, $limit = 80) { $ident = 'system'; - $total = $this->systemTotal($seen); - $notifs = array(); + $notifs = []; $sql_seen = ""; if ($seen === 0) { - $sql_seen = " AND `seen` = 0 "; + $sql_seen = " AND NOT `seen` "; } $r = q( - "SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify` + "SELECT `id`, `url`, `photo`, `msg`, `date`, `seen`, `verb` 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)) { + + if (DBA::isResult($r)) { $notifs = $this->formatNotifs($r, $ident); } $arr = [ 'notifications' => $notifs, 'ident' => $ident, - 'total' => $total, ]; return $arr; } - /** - * @brief Additional SQL query string for the personal notifications - * - * @return string The additional SQL query - */ - private function personalSqlExtra() - { - $myurl = System::baseUrl(true) . '/profile/' . self::getApp()->user['nickname']; - $myurl = substr($myurl, strpos($myurl, '://') + 3); - $myurl = str_replace(array('www.', '.'), array('', '\\.'), $myurl); - $diasp_url = str_replace('/profile/', '/u/', $myurl); - $sql_extra = sprintf( - " AND ( `item`.`author-link` regexp '%s' OR `item`.`tag` regexp '%s' OR `item`.`tag` regexp '%s' ) ", - dbesc($myurl . '$'), - dbesc($myurl . '\\]'), - dbesc($diasp_url . '\\]') - ); - - return $sql_extra; - } - - /** - * @brief Total number of personal notifications - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * - * @return int Number of personal notifications - */ - private function personalTotal($seen = 0) - { - $sql_seen = ""; - $sql_extra = $this->personalSqlExtra(); - - if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; - } - - $r = q( - "SELECT COUNT(*) AS `total` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 - $sql_extra - $sql_seen - AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ", - intval(local_user()) - ); - if (DBM::is_result($r)) { - return $r[0]['total']; - } - - return 0; - } - /** * @brief Get personal notifications * @@ -586,77 +469,41 @@ class NotificationsManager extends BaseObject * * @return array with * string 'ident' => Notification identifier - * int 'total' => Total number of available personal notifications * array 'notifications' => Personal notifications */ public function personalNotifs($seen = 0, $start = 0, $limit = 80) { $ident = 'personal'; - $total = $this->personalTotal($seen); - $sql_extra = $this->personalSqlExtra(); - $notifs = array(); - $sql_seen = ""; + $notifs = []; + + $myurl = str_replace('http://', '', self::getApp()->contact['nurl']); + $diasp_url = str_replace('/profile/', '/u/', $myurl); + + $condition = ["NOT `wall` AND `uid` = ? AND (`item`.`author-id` = ? OR `item`.`tag` REGEXP ? OR `item`.`tag` REGEXP ?)", + local_user(), public_contact(), $myurl . '\\]', $diasp_url . '\\]']; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $condition[0] .= " AND `unseen`"; } - $r = q( - "SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, - `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 - $sql_extra - $sql_seen - AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 - ORDER BY `item`.`created` DESC LIMIT %d, %d ", - intval(local_user()), - intval($start), - intval($limit) - ); - if (DBM::is_result($r)) { - $notifs = $this->formatNotifs($r, $ident); + $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' => ['created' => true], 'limit' => [$start, $limit]]; + + $items = Item::selectForUser(local_user(), $fields, $condition, $params); + + if (DBA::isResult($items)) { + $notifs = $this->formatNotifs(Item::inArray($items), $ident); } - $arr = array( + $arr = [ 'notifications' => $notifs, 'ident' => $ident, - 'total' => $total, - ); + ]; return $arr; } - /** - * @brief Total number of home notifications - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * - * @return int Number of home notifications - */ - private function homeTotal($seen = 0) - { - $sql_seen = ""; - - if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; - } - - $r = q( - "SELECT COUNT(*) AS `total` FROM `item` - WHERE `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 - $sql_seen", - intval(local_user()) - ); - if (DBM::is_result($r)) { - return $r[0]['total']; - } - - return 0; - } - /** * @brief Get home notifications * @@ -667,74 +514,36 @@ class NotificationsManager extends BaseObject * * @return array with * string 'ident' => Notification identifier - * int 'total' => Total number of available home notifications * array 'notifications' => Home notifications */ public function homeNotifs($seen = 0, $start = 0, $limit = 80) { $ident = 'home'; - $total = $this->homeTotal($seen); - $notifs = array(); - $sql_seen = ""; + $notifs = []; + + $condition = ['wall' => true, 'uid' => local_user()]; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $condition['unseen'] = true; } - $r = q( - "SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, - `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 - $sql_seen - ORDER BY `item`.`created` DESC LIMIT %d, %d ", - intval(local_user()), - intval($start), - intval($limit) - ); - if (DBM::is_result($r)) { - $notifs = $this->formatNotifs($r, $ident); + $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' => ['created' => true], 'limit' => [$start, $limit]]; + $items = Item::selectForUser(local_user(), $fields, $condition, $params); + + if (DBA::isResult($items)) { + $notifs = $this->formatNotifs(Item::inArray($items), $ident); } $arr = [ 'notifications' => $notifs, 'ident' => $ident, - 'total' => $total, ]; return $arr; } - /** - * @brief Total number of introductions - * @param bool $all If false only include introductions into the query - * which aren't marked as ignored - * - * @return int Number of introductions - */ - private function introTotal($all = false) - { - $sql_extra = ""; - - if (!$all) { - $sql_extra = " AND `ignore` = 0 "; - } - - $r = q( - "SELECT COUNT(*) AS `total` FROM `intro` - WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ", - intval($_SESSION['uid']) - ); - - if (DBM::is_result($r)) { - return $r[0]['total']; - } - - return 0; - } - /** * @brief Get introductions * @@ -745,14 +554,12 @@ class NotificationsManager extends BaseObject * * @return array with * string 'ident' => Notification identifier - * int 'total' => Total number of available introductions * array 'notifications' => Introductions */ public function introNotifs($all = false, $start = 0, $limit = 80) { $ident = 'introductions'; - $total = $this->introTotal($all); - $notifs = array(); + $notifs = []; $sql_extra = ""; if (!$all) { @@ -762,7 +569,7 @@ class NotificationsManager extends BaseObject /// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact $r = q( "SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, - `fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`, + `fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`, `fcontact`.`addr` AS `faddr`, `fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`, `gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`, `gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`, @@ -777,13 +584,12 @@ class NotificationsManager extends BaseObject intval($start), intval($limit) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $notifs = $this->formatIntros($r); } $arr = [ 'ident' => $ident, - 'total' => $total, 'notifications' => $notifs, ]; @@ -805,23 +611,27 @@ 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()->path) ? '/' . self::getApp()->path : '')); + $return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->get_hostname() . ((self::getApp()->urlpath) ? '/' . self::getApp()->urlpath : '')); - $intro = array( + $intro = [ 'label' => 'friend_suggestion', - 'notify_type' => t('Friend Suggestion'), + 'notify_type' => L10n::t('Friend Suggestion'), 'intro_id' => $it['intro_id'], 'madeby' => $it['name'], + 'madeby_url' => $it['url'], + '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"), 'name' => $it['fname'], - 'url' => Profile::zrl($it['furl']), + 'url' => $it['furl'], + 'zrl' => Contact::magicLink($it['furl']), 'hidden' => $it['hidden'] == 1, 'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0), 'knowyou' => $knowyou, 'note' => $it['note'], 'request' => $it['frequest'] . '?addr=' . $return_addr, - ); + ]; // Normal connection requests } else { @@ -833,28 +643,28 @@ class NotificationsManager extends BaseObject $it['gabout'] = ""; $it['ggender'] = ""; } - $intro = array( + $intro = [ 'label' => (($it['network'] !== NETWORK_OSTATUS) ? 'friend_request' : 'follower'), - 'notify_type' => (($it['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')), + 'notify_type' => (($it['network'] !== NETWORK_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"), 'name' => $it['name'], - 'location' => bbcode($it['glocation'], false, false), - 'about' => bbcode($it['gabout'], false, false), + 'location' => BBCode::convert($it['glocation'], false), + 'about' => BBCode::convert($it['gabout'], false), 'keywords' => $it['gkeywords'], 'gender' => $it['ggender'], 'hidden' => $it['hidden'] == 1, 'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0), 'url' => $it['url'], - 'zrl' => Profile::zrl($it['url']), + 'zrl' => Contact::magicLink($it['url']), 'addr' => $it['gaddr'], 'network' => $it['gnetwork'], 'knowyou' => $it['knowyou'], 'note' => $it['note'], - ); + ]; } $arr[] = $intro;