X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCore%2FNotificationsManager.php;h=d582f21596688c16145ee28ee9cc3ec5c2a79de6;hb=4bad2645e5276431fcb70e01f4f3341740a6b89b;hp=da0e55a5f6cc0cff373cebf0994ba704a3ca1d76;hpb=413424064c30c3b799f03ed728ab0a3f8f5eb424;p=friendica.git diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index da0e55a5f6..d582f21596 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -13,11 +13,10 @@ 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; -require_once 'include/dba.php'; - /** * @brief Methods for read and write notifications from/to database * or for formatting notifications @@ -35,6 +34,7 @@ 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) { @@ -60,6 +60,7 @@ class NotificationsManager extends BaseObject * @param string $limit optional Query limits * * @return array of results or false on errors + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function getAll($filter = [], $order = "-date", $limit = "") { @@ -108,6 +109,7 @@ 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) { @@ -128,6 +130,7 @@ 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) { @@ -146,6 +149,7 @@ 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) { @@ -160,42 +164,45 @@ class NotificationsManager extends BaseObject * @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', ], @@ -210,18 +217,18 @@ 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(array $notifs, $ident = "") { - $notif = []; $arr = []; if (DBA::isResult($notifs)) { @@ -234,7 +241,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 +250,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 +260,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 +270,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 +285,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 +298,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 +311,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 +324,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 +337,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 +347,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 +370,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 +402,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) { @@ -420,14 +444,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) { @@ -462,14 +487,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) { @@ -507,14 +533,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) { @@ -547,14 +574,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) { @@ -601,17 +630,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()->urlpath) ? '/' . self::getApp()->urlpath : '')); + $return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->getHostName() . ((self::getApp()->getURLPath()) ? '/' . self::getApp()->getURLPath() : '')); $intro = [ 'label' => 'friend_suggestion', @@ -622,7 +655,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']), @@ -637,20 +670,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), @@ -680,27 +717,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']; } }