X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FNotificationsManager.php;h=8a1c1569ee3fe9ccaebaf294291f3607f4626304;hb=b8186ba98bfdd8a366d7ee2a491df040bb5a70c2;hp=318d5a8e809fedc9f39a7fe31c069fcdac499cab;hpb=d9e9cbe7534ec05a131ac250ef9912cdaf7078ee;p=friendica.git diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index 318d5a8e80..8a1c1569ee 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -6,31 +6,27 @@ */ namespace Friendica\Core; -use Friendica\Core\Pconfig; +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\Model\Contact; +use Friendica\Model\Profile; +use Friendica\Util\DateTimeFormat; +use Friendica\Util\Temporal; +use Friendica\Util\XML; -require_once 'include/html2plain.php'; -require_once 'include/datetime.php'; -require_once 'include/bbcode.php'; -require_once 'include/Contact.php'; +require_once 'include/dba.php'; /** * @brief Methods for read and write notifications from/to database * or for formatting notifications */ -class NotificationsManager +class NotificationsManager extends BaseObject { - private $a; - - /** - * Constructor - */ - public function __construct() - { - $this->a = get_app(); - } - /** * @brief set some extra note properties * @@ -45,20 +41,19 @@ class NotificationsManager */ private function _set_extra($notes) { - $rets = array(); + $rets = []; foreach ($notes as $n) { - $local_time = datetime_convert('UTC', date_default_timezone_get(), $n['date']); + $local_time = DateTimeFormat::local($n['date']); $n['timestamp'] = strtotime($local_time); - $n['date_rel'] = relative_date($n['date']); - $n['msg_html'] = bbcode($n['msg'], false, false, false, false); - $n['msg_plain'] = explode("\n", trim(html2plain($n['msg_html'], 0)))[0]; + $n['date_rel'] = Temporal::getRelativeDate($n['date']); + $n['msg_html'] = BBCode::convert($n['msg'], false); + $n['msg_plain'] = explode("\n", trim(HTML::toPlaintext($n['msg_html'], 0)))[0]; $rets[] = $n; } return $rets; } - /** * @brief Get all notifications for local_user() * @@ -69,26 +64,26 @@ class NotificationsManager * * @return array of results or false on errors */ - public function getAll($filter = array(), $order = "-date", $limit = "") + public function getAll($filter = [], $order = "-date", $limit = "") { - $filter_str = array(); + $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); + if (count($filter_str) > 0) { + $filter_sql = "AND " . implode(" AND ", $filter_str); } $aOrder = explode(" ", $order); - $asOrder = array(); + $asOrder = []; foreach ($aOrder as $o) { $dir = "asc"; - if ($o[0]==="-") { + if ($o[0] === "-") { $dir = "desc"; $o = substr($o, 1); } - if ($o[0]==="+") { + if ($o[0] === "+") { $dir = "asc"; $o = substr($o, 1); } @@ -97,12 +92,12 @@ class NotificationsManager $order_sql = implode(", ", $asOrder); if ($limit != "") { - $limit = " LIMIT ".$limit; + $limit = " LIMIT " . $limit; } - $r = q( - "SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit", - intval(local_user()) - ); + $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); @@ -140,7 +135,7 @@ class NotificationsManager 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']), @@ -171,43 +166,43 @@ class NotificationsManager */ public function getTabs() { - $tabs = array( - array( - 'label' => t('System'), - 'url'=>'notifications/system', - 'sel'=> (($this->a->argv[1] == 'system') ? 'active' : ''), - 'id' => 'system-tab', + $tabs = [ + [ + 'label' => L10n::t('System'), + 'url' => 'notifications/system', + 'sel' => ((self::getApp()->argv[1] == 'system') ? 'active' : ''), + 'id' => 'system-tab', 'accesskey' => 'y', - ), - array( - 'label' => t('Network'), - 'url'=>'notifications/network', - 'sel'=> (($this->a->argv[1] == 'network') ? 'active' : ''), - 'id' => 'network-tab', + ], + [ + 'label' => L10n::t('Network'), + 'url' => 'notifications/network', + 'sel' => ((self::getApp()->argv[1] == 'network') ? 'active' : ''), + 'id' => 'network-tab', 'accesskey' => 'w', - ), - array( - 'label' => t('Personal'), - 'url'=>'notifications/personal', - 'sel'=> (($this->a->argv[1] == 'personal') ? 'active' : ''), - 'id' => 'personal-tab', + ], + [ + 'label' => L10n::t('Personal'), + 'url' => 'notifications/personal', + 'sel' => ((self::getApp()->argv[1] == 'personal') ? 'active' : ''), + 'id' => 'personal-tab', 'accesskey' => 'r', - ), - array( - 'label' => t('Home'), - 'url' => 'notifications/home', - 'sel'=> (($this->a->argv[1] == 'home') ? 'active' : ''), - 'id' => 'home-tab', + ], + [ + 'label' => L10n::t('Home'), + 'url' => 'notifications/home', + 'sel' => ((self::getApp()->argv[1] == 'home') ? 'active' : ''), + 'id' => 'home-tab', 'accesskey' => 'h', - ), - array( - 'label' => t('Introductions'), - 'url' => 'notifications/intros', - 'sel'=> (($this->a->argv[1] == 'intros') ? 'active' : ''), - 'id' => 'intro-tab', + ], + [ + 'label' => L10n::t('Introductions'), + 'url' => 'notifications/intros', + 'sel' => ((self::getApp()->argv[1] == 'intros') ? 'active' : ''), + 'id' => 'intro-tab', 'accesskey' => 'i', - ), - ); + ], + ]; return $tabs; } @@ -218,19 +213,19 @@ class NotificationsManager * @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" */ private function formatNotifs($notifs, $ident = "") { - $notif = array(); - $arr = array(); + $notif = []; + $arr = []; if (DBM::is_result($notifs)) { foreach ($notifs as $it) { @@ -245,122 +240,122 @@ class NotificationsManager switch ($ident) { case 'system': $default_item_label = 'notify'; - $default_item_link = System::baseUrl(true).'/notify/view/'. $it['id']; + $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['pguid']; $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['pname']); + $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['pguid']; $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['pname'])); + $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['pguid'], '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['pname']), '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['pguid'], '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['pname']), '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['pguid'], '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['pname']), '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['pguid'], '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['pname']), '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['pguid'], '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['pname']), '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']); + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; + $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['pguid'], '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, @@ -369,7 +364,7 @@ class NotificationsManager 'when' => $default_item_when, 'ago' => $default_item_ago, 'seen' => $it['seen'] - ); + ]; } $arr[] = $notif; @@ -382,27 +377,28 @@ class NotificationsManager /** * @brief Total number of network notifications * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" + * which aren't marked as "seen" * * @return int Number of network notifications */ private function networkTotal($seen = 0) { $sql_seen = ""; + $index_hint = ""; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } $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 + FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` AND `pitem`.`parent` != 0 AND + NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall` $sql_seen", intval(local_user()) ); - if (DBM::is_result($r)) { return $r[0]['total']; } @@ -414,50 +410,50 @@ class NotificationsManager * @brief Get network notifications * * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" + * 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 - * int 'total' => Total number of available network notifications - * array 'notifications' => Network notifications + * 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(); + $notifs = []; $sql_seen = ""; + $index_hint = ""; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } - $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 + FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` AND `pitem`.`parent` != 0 AND + NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall` $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); } - $arr = array ( + $arr = [ 'notifications' => $notifs, 'ident' => $ident, 'total' => $total, - ); + ]; return $arr; } @@ -465,7 +461,7 @@ class NotificationsManager /** * @brief Total number of system notifications * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" + * which aren't marked as "seen" * * @return int Number of system notifications */ @@ -474,14 +470,13 @@ class NotificationsManager $sql_seen = ""; if ($seen === 0) { - $sql_seen = " AND `seen` = 0 "; + $sql_seen = " AND NOT `seen` "; } $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']; } @@ -493,24 +488,24 @@ class NotificationsManager * @brief Get system notifications * * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" + * 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 - * int 'total' => Total number of available system notifications - * array 'notifications' => System notifications + * 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( @@ -520,33 +515,32 @@ class NotificationsManager intval($start), intval($limit) ); - if (DBM::is_result($r)) { $notifs = $this->formatNotifs($r, $ident); } - $arr = array ( + $arr = [ 'notifications' => $notifs, 'ident' => $ident, 'total' => $total, - ); + ]; return $arr; } /** - * @brief Addional SQL query string for the personal notifications + * @brief Additional SQL query string for the personal notifications * - * @return string The additional sql query + * @return string The additional SQL query */ private function personalSqlExtra() { - $myurl = System::baseUrl(true) . '/profile/'. $this->a->user['nickname']; + $myurl = System::baseUrl(true) . '/profile/' . self::getApp()->user['nickname']; $myurl = substr($myurl, strpos($myurl, '://') + 3); - $myurl = str_replace(array('www.','.'), array('','\\.'), $myurl); + $myurl = str_replace(['www.', '.'], ['', '\\.'], $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' ) ", + " AND (`item`.`author-link` REGEXP '%s' OR `item`.`tag` REGEXP '%s' OR `item`.`tag` REGEXP '%s') ", dbesc($myurl . '$'), dbesc($myurl . '\\]'), dbesc($diasp_url . '\\]') @@ -558,29 +552,30 @@ class NotificationsManager /** * @brief Total number of personal notifications * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" + * which aren't marked as "seen" * * @return int Number of personal notifications */ private function personalTotal($seen = 0) { $sql_seen = ""; + $index_hint = ""; $sql_extra = $this->personalSqlExtra(); if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } $r = q( "SELECT COUNT(*) AS `total` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 + FROM `item` $index_hint + WHERE `item`.`visible` $sql_extra $sql_seen - AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ", + AND NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall`", intval(local_user()) ); - if (DBM::is_result($r)) { return $r[0]['total']; } @@ -592,51 +587,52 @@ class NotificationsManager * @brief Get personal notifications * * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" + * 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 - * int 'total' => Total number of available personal notifications - * array 'notifications' => Personal notifications + * 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(); + $notifs = []; $sql_seen = ""; + $index_hint = ""; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } $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 + FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` $sql_extra $sql_seen - AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 + AND NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall` 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); } - $arr = array ( + $arr = [ 'notifications' => $notifs, 'ident' => $ident, 'total' => $total, - ); + ]; return $arr; } @@ -644,26 +640,27 @@ class NotificationsManager /** * @brief Total number of home notifications * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" + * which aren't marked as "seen" * * @return int Number of home notifications */ private function homeTotal($seen = 0) { $sql_seen = ""; + $index_hint = ""; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } $r = q( - "SELECT COUNT(*) AS `total` FROM `item` + "SELECT COUNT(*) AS `total` FROM `item` $index_hint 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']; } @@ -675,49 +672,50 @@ class NotificationsManager * @brief Get home notifications * * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" + * 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 - * int 'total' => Total number of available home notifications - * array 'notifications' => Home notifications + * 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(); + $notifs = []; $sql_seen = ""; + $index_hint = ""; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } $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 + FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` AND + NOT `item`.`deleted` AND `item`.`uid` = %d AND `item`.`wall` $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); } - $arr = array ( + $arr = [ 'notifications' => $notifs, 'ident' => $ident, 'total' => $total, - ); + ]; return $arr; } @@ -725,7 +723,7 @@ class NotificationsManager /** * @brief Total number of introductions * @param bool $all If false only include introductions into the query - * which aren't marked as ignored + * which aren't marked as ignored * * @return int Number of introductions */ @@ -754,7 +752,7 @@ class NotificationsManager * @brief Get introductions * * @param bool $all If false only include introductions into the query - * which aren't marked as ignored + * which aren't marked as ignored * @param int $start Start the query at this point * @param int $limit Maximum number of query results * @@ -766,18 +764,18 @@ class NotificationsManager public function introNotifs($all = false, $start = 0, $limit = 80) { $ident = 'introductions'; - $total = $this->introTotal($seen); - $notifs = array(); + $total = $this->introTotal($all); + $notifs = []; $sql_extra = ""; if (!$all) { $sql_extra = " AND `ignore` = 0 "; } - /// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact + /// @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`, @@ -792,16 +790,15 @@ class NotificationsManager intval($start), intval($limit) ); - if (DBM::is_result($r)) { $notifs = $this->formatIntros($r); } - $arr = array ( + $arr = [ 'ident' => $ident, 'total' => $total, 'notifications' => $notifs, - ); + ]; return $arr; } @@ -819,27 +816,29 @@ class NotificationsManager 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($this->a->user['nickname'] . '@' . $this->a->get_hostname() . (($this->a->path) ? '/' . $this->a->path : '')); + $return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->get_hostname() . ((self::getApp()->path) ? '/' . self::getApp()->path : '')); - $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' => 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 { @@ -851,28 +850,28 @@ class NotificationsManager $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' => zrl($it['url']), + 'zrl' => Contact::magicLink($it['url']), 'addr' => $it['gaddr'], 'network' => $it['gnetwork'], 'knowyou' => $it['knowyou'], 'note' => $it['note'], - ); + ]; } $arr[] = $intro; @@ -903,7 +902,7 @@ class NotificationsManager // If the network and addr is still not available // get the missing data data from other sources if ($arr['gnetwork'] == "" || $arr['gaddr'] == "") { - $ret = get_contact_details_by_url($arr['url']); + $ret = Contact::getDetailsByURL($arr['url']); if ($arr['gnetwork'] == "" && $ret['network'] != "") { $arr['gnetwork'] = $ret['network'];