/**
* @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 'mod/proxy.php';
require_once 'include/enotify.php';
$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)) {
+ if (DBM::is_result($items)) {
+ $items_unseen = Item::inArray($items);
$arr = ['items' => $items_unseen];
- call_hooks('network_ping', $arr);
+ Addon::callHooks('network_ping', $arr);
foreach ($items_unseen as $item) {
if ($item['wall']) {
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);
$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') {
} 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 ++;
if (DBM::is_result($intros)) {
foreach ($intros as $intro) {
$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 = [
+ '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 = [
+ '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;
}
$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[] = [
'id' => $notif['id'],
'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)
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))
$notification["visible"] = true;
}
- if (is_null($notification["spam"])) {
- $notification["spam"] = 0;
- }
-
if (is_null($notification["deleted"])) {
$notification["deleted"] = 0;
}
$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",
$notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"];
if ($notification["visible"]
- && !$notification["spam"]
&& !$notification["deleted"]
- && !(x($result, $notification["parent"]) && is_array($result[$notification["parent"]]))
+ && !(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')) {
$forums = [];
if (count($forums_unseen)) {
foreach ($forums_unseen as $key => $item) {
- $forums[$count . ':forum'] = $item['count'];
- $forums[$count . ':@attributes'] = ['id' => $item['id']];
+ $forums[$key . ':forum'] = $item['count'];
+ $forums[$key . ':@attributes'] = ['id' => $item['id']];
}
$data['forums'] = $forums;
}
projects / friendica.git / blobdiff