X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FNotificationsManager.php;h=d582f21596688c16145ee28ee9cc3ec5c2a79de6;hb=83f49fcf15c29263f1448b728d60245b90f847fa;hp=734e4eb03095acfa3c8bd2e477444275fc8b2d07;hpb=e06fc2aa6900d8cf5ae4e8d5cf52f9262bf7ada7;p=friendica.git diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index 734e4eb030..d582f21596 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -9,7 +9,6 @@ namespace Friendica\Core; use Friendica\BaseObject; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Protocol; use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Item; @@ -18,8 +17,6 @@ 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 @@ -37,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) { @@ -62,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 = "") { @@ -110,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) { @@ -130,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) { @@ -148,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) { @@ -162,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', ], @@ -212,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)) { @@ -342,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; @@ -381,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) { @@ -422,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) { @@ -464,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) { @@ -509,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) { @@ -549,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) { @@ -603,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', @@ -624,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')) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::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']), @@ -639,6 +670,10 @@ 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'] === Protocol::DIASPORA) { $it['glocation'] = ""; @@ -652,7 +687,7 @@ class NotificationsManager extends BaseObject 'uid' => $_SESSION['uid'], 'intro_id' => $it['intro_id'], 'contact_id' => $it['contact-id'], - 'photo' => ((x($it, 'photo')) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::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), @@ -682,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']; } }