X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=196758b0dfbc007ba6d14057629a0d534a445572;hb=80ac7da01d3dedf92e3673b4b97d37287bb16488;hp=59f6589eb23989b9350ad7be19e2517f94fb6050;hpb=abdecd2b2fd61859070404c39b2cce304a27d175;p=friendica.git diff --git a/mod/ping.php b/mod/ping.php index 59f6589eb2..196758b0df 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -2,20 +2,24 @@ /** * @file include/ping.php */ + use Friendica\App; use Friendica\Content\Feature; use Friendica\Content\ForumManager; +use Friendica\Content\Text\BBCode; +use Friendica\Core\Addon; use Friendica\Core\Cache; -use Friendica\Core\System; +use Friendica\Core\L10n; use Friendica\Core\PConfig; +use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Model\Contact; use Friendica\Model\Group; +use Friendica\Model\Item; +use Friendica\Util\DateTimeFormat; +use Friendica\Util\Temporal; use Friendica\Util\XML; -require_once 'include/datetime.php'; -require_once 'include/bbcode.php'; -require_once 'include/group.php'; require_once 'mod/proxy.php'; require_once 'include/enotify.php'; @@ -61,15 +65,15 @@ function ping_init(App $a) $format = 'json'; } - $tags = array(); - $comments = array(); - $likes = array(); - $dislikes = array(); - $friends = array(); - $posts = array(); - $regs = array(); - $mails = array(); - $notifications = array(); + $tags = []; + $comments = []; + $likes = []; + $dislikes = []; + $friends = []; + $posts = []; + $regs = []; + $mails = []; + $notifications = []; $intro_count = 0; $mail_count = 0; @@ -77,8 +81,8 @@ function ping_init(App $a) $network_count = 0; $register_count = 0; $sysnotify_count = 0; - $groups_unseen = array(); - $forums_unseen = array(); + $groups_unseen = []; + $forums_unseen = []; $all_events = 0; $all_events_today = 0; @@ -87,7 +91,7 @@ function ping_init(App $a) $birthdays = 0; $birthdays_today = 0; - $data = array(); + $data = []; $data['intro'] = $intro_count; $data['mail'] = $mail_count; $data['net'] = $network_count; @@ -104,7 +108,7 @@ function ping_init(App $a) if (local_user()) { // Different login session than the page that is calling us. if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) { - $data = array('result' => array('invalid' => 1)); + $data = ['result' => ['invalid' => 1]]; if ($format == 'json') { if (isset($_GET['callback'])) { @@ -124,22 +128,16 @@ function ping_init(App $a) $notifs = ping_get_notifications(local_user()); - $items_unseen = q( - "SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`, - `item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, - `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id` = `item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0 - AND `item`.`contact-id` != %d - ORDER BY `item`.`created` DESC", - intval(local_user()), - intval(local_user()) - ); + $condition = ["`unseen` AND `uid` = ? AND `contact-id` != ?", local_user(), local_user()]; + $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar', + 'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid', 'wall']; + $params = ['order' => ['created' => true]]; + $items = Item::selectForUser(local_user(), $fields, $condition, $params); - if (DBM::is_result($items_unseen)) { - $arr = array('items' => $items_unseen); - call_hooks('network_ping', $arr); + if (DBM::is_result($items)) { + $items_unseen = Item::inArray($items); + $arr = ['items' => $items_unseen]; + Addon::callHooks('network_ping', $arr); foreach ($items_unseen as $item) { if ($item['wall']) { @@ -165,8 +163,8 @@ function ping_init(App $a) if (intval(Feature::isEnabled(local_user(), 'forumlist_widget'))) { $forum_counts = ForumManager::countUnseenItems(); - if (DBM::is_result($forums_counts)) { - foreach ($forums_counts as $forum_count) { + if (DBM::is_result($forum_counts)) { + foreach ($forum_counts as $forum_count) { if ($forum_count['count'] > 0) { $forums_unseen[] = $forum_count; } @@ -222,8 +220,8 @@ function ping_init(App $a) WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0 ORDER BY `start` ASC ", intval(local_user()), - dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')), - dbesc(datetime_convert('UTC', 'UTC', 'now')) + dbesc(DateTimeFormat::utc('now + 7 days')), + dbesc(DateTimeFormat::utcNow()) ); if (DBM::is_result($ev)) { Cache::set($cachekey, $ev, CACHE_HOUR); @@ -234,7 +232,7 @@ function ping_init(App $a) $all_events = count($ev); if ($all_events) { - $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d'); + $str_now = DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d'); foreach ($ev as $x) { $bd = false; if ($x['type'] === 'birthday') { @@ -243,7 +241,7 @@ function ping_init(App $a) } else { $events ++; } - if (datetime_convert('UTC', ((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'], 'Y-m-d') === $str_now) { + if (DateTimeFormat::convert($x['start'], ((intval($x['adjust'])) ? $a->timezone : 'UTC'), 'UTC', 'Y-m-d') === $str_now) { $all_events_today ++; if ($bd) { $birthdays_today ++; @@ -279,45 +277,48 @@ function ping_init(App $a) // merge all notification types in one array if (DBM::is_result($intros)) { foreach ($intros as $intro) { - $notif = array( + $notif = [ + 'id' => 0, 'href' => System::baseUrl() . '/notifications/intros/' . $intro['id'], 'name' => $intro['name'], 'url' => $intro['url'], 'photo' => $intro['photo'], 'date' => $intro['datetime'], 'seen' => false, - 'message' => t('{0} wants to be your friend'), - ); + 'message' => L10n::t('{0} wants to be your friend'), + ]; $notifs[] = $notif; } } if (DBM::is_result($mails)) { foreach ($mails as $mail) { - $notif = array( + $notif = [ + 'id' => 0, 'href' => System::baseUrl() . '/message/' . $mail['id'], 'name' => $mail['from-name'], 'url' => $mail['from-url'], 'photo' => $mail['from-photo'], 'date' => $mail['created'], 'seen' => false, - 'message' => t('{0} sent you a message'), - ); + 'message' => L10n::t('{0} sent you a message'), + ]; $notifs[] = $notif; } } if (DBM::is_result($regs)) { foreach ($regs as $reg) { - $notif = array( + $notif = [ + 'id' => 0, 'href' => System::baseUrl() . '/admin/users/', 'name' => $reg['name'], 'url' => $reg['url'], 'photo' => $reg['micro'], 'date' => $reg['created'], 'seen' => false, - 'message' => t('{0} requested registration'), - ); + 'message' => L10n::t('{0} requested registration'), + ]; $notifs[] = $notif; } } @@ -359,25 +360,25 @@ function ping_init(App $a) $notif['photo'] = proxy_url($notif['photo'], false, PROXY_SIZE_MICRO); } - $local_time = datetime_convert('UTC', date_default_timezone_get(), $notif['date']); + $local_time = DateTimeFormat::local($notif['date']); - $notifications[] = array( + $notifications[] = [ 'id' => $notif['id'], 'href' => $notif['href'], 'name' => $notif['name'], 'url' => $notif['url'], 'photo' => $notif['photo'], - 'date' => relative_date($notif['date']), + 'date' => Temporal::getRelativeDate($notif['date']), 'message' => $notif['message'], 'seen' => $notif['seen'], 'timestamp' => strtotime($local_time) - ); + ]; } } } - $sysmsgs = array(); - $sysmsgs_info = array(); + $sysmsgs = []; + $sysmsgs_info = []; if (x($_SESSION, 'sysmsg')) { $sysmsgs = $_SESSION['sysmsg']; @@ -394,12 +395,12 @@ function ping_init(App $a) $data['forums'] = $forums_unseen; $data['notify'] = $sysnotify_count + $intro_count + $mail_count + $register_count; $data['notifications'] = $notifications; - $data['sysmsgs'] = array( + $data['sysmsgs'] = [ 'notice' => $sysmsgs, 'info' => $sysmsgs_info - ); + ]; - $json_payload = json_encode(array("result" => $data)); + $json_payload = json_encode(["result" => $data]); if (isset($_GET['callback'])) { // JSONP support @@ -414,7 +415,7 @@ function ping_init(App $a) $data = ping_format_xml_data($data, $sysnotify_count, $notifications, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen); header("Content-type: text/xml"); - echo XML::fromArray(array("result" => $data), $xml); + echo XML::fromArray(["result" => $data], $xml); } killme(); @@ -428,7 +429,7 @@ function ping_init(App $a) */ function ping_get_notifications($uid) { - $result = array(); + $result = []; $offset = 0; $seen = false; $seensql = "NOT"; @@ -439,7 +440,7 @@ function ping_get_notifications($uid) do { $r = q( - "SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted` + "SELECT `notify`.*, `item`.`visible`, `item`.`deleted` FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid` WHERE `notify`.`uid` = %d AND `notify`.`msg` != '' AND NOT (`notify`.`type` IN (%d, %d)) @@ -466,10 +467,6 @@ function ping_get_notifications($uid) $notification["visible"] = true; } - if (is_null($notification["spam"])) { - $notification["spam"] = 0; - } - if (is_null($notification["deleted"])) { $notification["deleted"] = 0; } @@ -478,8 +475,8 @@ function ping_get_notifications($uid) $notification["name"] = $notification["name_cache"]; $notification["message"] = $notification["msg_cache"]; } else { - $notification["name"] = strip_tags(bbcode($notification["name"])); - $notification["message"] = format_notification_message($notification["name"], strip_tags(bbcode($notification["msg"]))); + $notification["name"] = strip_tags(BBCode::convert($notification["name"])); + $notification["message"] = format_notification_message($notification["name"], strip_tags(BBCode::convert($notification["msg"]))); q( "UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d", @@ -491,8 +488,9 @@ function ping_get_notifications($uid) $notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"]; - if ($notification["visible"] && !$notification["spam"] - && !$notification["deleted"] && !is_array($result[$notification["parent"]]) + if ($notification["visible"] + && !$notification["deleted"] + && !(x($result, $notification["parent"]) && !empty($result[$notification["parent"]])) ) { // Should we condense the notifications or show them all? if (PConfig::get(local_user(), 'system', 'detailed_notif')) { @@ -522,11 +520,11 @@ function ping_get_notifications($uid) */ function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen) { - $notifications = array(); + $notifications = []; foreach ($notifs as $key => $notif) { $notifications[$key . ':note'] = $notif['message']; - $notifications[$key . ':@attributes'] = array( + $notifications[$key . ':@attributes'] = [ 'id' => $notif['id'], 'href' => $notif['href'], 'name' => $notif['name'], @@ -535,10 +533,10 @@ function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_inf 'date' => $notif['date'], 'seen' => $notif['seen'], 'timestamp' => $notif['timestamp'] - ); + ]; } - $sysmsg = array(); + $sysmsg = []; foreach ($sysmsgs as $key => $m) { $sysmsg[$key . ':notice'] = $m; } @@ -547,27 +545,27 @@ function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_inf } $data['notif'] = $notifications; - $data['@attributes'] = array('count' => $sysnotify_count + $data['intro'] + $data['mail'] + $data['register']); + $data['@attributes'] = ['count' => $sysnotify_count + $data['intro'] + $data['mail'] + $data['register']]; $data['sysmsgs'] = $sysmsg; if ($data['register'] == 0) { unset($data['register']); } - $groups = array(); + $groups = []; if (count($groups_unseen)) { foreach ($groups_unseen as $key => $item) { $groups[$key . ':group'] = $item['count']; - $groups[$key . ':@attributes'] = array('id' => $item['id']); + $groups[$key . ':@attributes'] = ['id' => $item['id']]; } $data['groups'] = $groups; } - $forums = array(); + $forums = []; if (count($forums_unseen)) { foreach ($forums_unseen as $key => $item) { - $forums[$count . ':forum'] = $item['count']; - $forums[$count . ':@attributes'] = array('id' => $item['id']); + $forums[$key . ':forum'] = $item['count']; + $forums[$key . ':@attributes'] = ['id' => $item['id']]; } $data['forums'] = $forums; }