X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=57728d32949ef64aab036fbd6f8ffd10531366f3;hb=162f754e2d6dcec931b405fef0808ff5a3d3f574;hp=f907506d5bb786789aa0a9ef899bcf32c1d45a17;hpb=04cda104caf1e3c714aec772f363135ae3f6be53;p=friendica.git
diff --git a/mod/ping.php b/mod/ping.php
index f907506d5b..57728d3294 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,6 +1,9 @@
1';
killme();
}
- $firehose = intval(get_pconfig(local_user(),'system','notify_full'));
-
-/*
-select notify.id, notify.type, iid, visible, deleted, CASE notify.iid WHEN 0 THEN 1 ELSE item.visible END as vis, CASE notify.iid WHEN 0 THEN 0 ELSE item.deleted END as del from notify left join item on item.id = notify.iid where notify.uid=1 group by notify.parent order by notify.id desc limit 10;
-*/
-
- $t = q("select count(*) as `total` from `notify` where `uid` = %d and `seen` = 0 AND `msg` != '' GROUP BY `parent`",
- intval(local_user())
- );
-
- $z = ping_get_notifications(local_user());
+ $notifs = ping_get_notifications(local_user());
$sysnotify = 0; // we will update this in a moment
-/*
- if($t && intval($t[0]['total']) > 49) {
- $z = q("select * from notify where uid = %d AND `msg` != ''
- and seen = 0 GROUP BY `parent` order by date desc limit 0, 50",
- intval(local_user())
- );
- $sysnotify = $t[0]['total'];
- }
- else {
- $z1 = q("select * from notify where uid = %d AND `msg` != ''
- and seen = 0 GROUP BY `parent` order by date desc limit 0, 50",
- intval(local_user())
- );
-
- $z2 = q("select * from notify where uid = %d AND `msg` != ''
- and seen = 1 GROUP BY `parent` order by date desc limit 0, %d",
- intval(local_user()),
- intval(50 - intval($t[0]['total']))
- );
- $z = array_merge($z1,$z2);
- $sysnotify = 0; // we will update this in a moment
- }
-*/
-
-
$tags = array();
$comments = array();
$likes = array();
@@ -67,6 +35,8 @@ select notify.id, notify.type, iid, visible, deleted, CASE notify.iid WHEN 0 THE
$home = 0;
$network = 0;
+ $groups_unseen = array();
+ $forums_unseen = array();
$r = 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`,
@@ -74,8 +44,9 @@ select notify.id, notify.type, iid, visible, deleted, CASE notify.iid WHEN 0 THE
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()), intval(local_user())
);
if(count($r)) {
@@ -118,6 +89,17 @@ select notify.id, notify.type, iid, visible, deleted, CASE notify.iid WHEN 0 THE
}
}
+ if($network) {
+ if(intval(feature_enabled(local_user(),'groups'))) {
+ // Find out how unseen network posts are spread across groups
+ $groups_unseen = groups_count_unseen();
+ }
+
+ if(intval(feature_enabled(local_user(),'forumlist_widget'))) {
+ $forums_unseen = forums_count_unseen();
+ }
+ }
+
$intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`,
`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
@@ -137,13 +119,12 @@ select notify.id, notify.type, iid, visible, deleted, CASE notify.iid WHEN 0 THE
$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
- $mails = q("SELECT *, COUNT(*) AS `total` FROM `mail`
+ $mails = q("SELECT * FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
intval(local_user()),
dbesc($myurl)
);
- if($mails)
- $mail = $mails[0]['total'];
+ $mail = count($mails);
if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
$regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
@@ -195,15 +176,40 @@ select notify.id, notify.type, iid, visible, deleted, CASE notify.iid WHEN 0 THE
}
+ /**
+ * return xml from notification array
+ *
+ * @param array $n Notification array:
+ * 'href' => notification link
+ * 'name' => subject name
+ * 'url' => subject url
+ * 'photo' => subject photo
+ * 'date' => notification date
+ * 'seen' => bool true/false
+ * 'message' => notification message. "{0}" will be replaced by subject name
+ **/
+ function xmlize($n){
+ $n['photo'] = proxy_url($n['photo'], false, PROXY_SIZE_MICRO);
+
+ $n['message'] = html_entity_decode($n['message'], ENT_COMPAT | ENT_HTML401, "UTF-8");
+ $n['name'] = html_entity_decode($n['name'], ENT_COMPAT | ENT_HTML401, "UTF-8");
- function xmlize($href, $name, $url, $photo, $date, $seen, $message){
- require_once("mod/proxy.php");
- $photo = proxy_url($photo);
- $data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
- call_hooks('ping_xmlize', $data);
- $notsxml = '%s';
+ // Are the nofications calles from the regular process or via the friendica app?
+ $regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
+
+ $a = get_app();
+
+ if ($a->is_friendica_app() OR !$regularnotifications)
+ $n['message'] = str_replace("{0}", $n['name'], $n['message']);
+
+ $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
+
+ call_hooks('ping_xmlize', $n);
+ $notsxml = '%s'."\n";
return sprintf ( $notsxml,
- xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message)
+ xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']),
+ xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)),
+ xmlify($n['message'])
);
}
@@ -213,6 +219,22 @@ select notify.id, notify.type, iid, visible, deleted, CASE notify.iid WHEN 0 THE
$home\r\n";
if ($register!=0) echo "$register";
+ if ( count($groups_unseen) ) {
+ echo '';
+ foreach ($groups_unseen as $it) {
+ echo '' . $it['count'] . "";
+ }
+ echo "";
+ }
+
+ if ( count($forums_unseen) ) {
+ echo '';
+ foreach ($forums_unseen as $it) {
+ echo '' . $it['count'] . "";
+ }
+ echo "";
+ }
+
echo "$all_events
$all_events_today
$events
@@ -220,84 +242,79 @@ select notify.id, notify.type, iid, visible, deleted, CASE notify.iid WHEN 0 THE
$birthdays
$birthdays_today\r\n";
- $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
- require_once('include/bbcode.php');
-
- if($firehose) {
- echo ' ';
- }
- else {
- if(count($z) && (! $sysnotify)) {
- foreach($z as $zz) {
- if($zz['seen'] == 0)
- $sysnotify ++;
- }
+ if(count($notifs) && (! $sysnotify)) {
+ foreach($notifs as $zz) {
+ if($zz['seen'] == 0)
+ $sysnotify ++;
}
+ }
- echo ' ';
- if(count($z)) {
- foreach($z as $zz) {
- echo xmlize($a->get_baseurl() . '/notify/view/' . $zz['id'], $zz['name'],$zz['url'],$zz['photo'],relative_date($zz['date']), ($zz['seen'] ? 'notify-seen' : 'notify-unseen'), ($zz['seen'] ? '' : '→ ') .strip_tags(bbcode($zz['msg'])));
- }
+ echo ' ';
+
+ // merge all notification types in one array
+ if ($intro>0){
+ foreach ($intros as $i) {
+ $n = array(
+ 'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
+ 'name' => $i['name'],
+ 'url' => $i['url'],
+ 'photo' => $i['photo'],
+ 'date' => $i['datetime'],
+ 'seen' => false,
+ 'message' => t("{0} wants to be your friend"),
+ );
+ $notifs[] = $n;
}
}
- if($firehose) {
- if ($intro>0){
- foreach ($intros as $i) {
- echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen',t("{0} wants to be your friend") );
- };
- }
- if ($mail>0){
- foreach ($mails as $i) {
- echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',t("{0} sent you a message") );
- };
- }
- if ($register>0){
- foreach ($regs as $i) {
- echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen',t("{0} requested registration") );
- };
+ if ($mail>0){
+ foreach ($mails as $i) {
+ $n = array(
+ 'href' => $a->get_baseurl().'/message/'.$i['id'],
+ 'name' => $i['from-name'],
+ 'url' => $i['from-url'],
+ 'photo' => $i['from-photo'],
+ 'date' => $i['created'],
+ 'seen' => false,
+ 'message' => t("{0} sent you a message"),
+ );
+ $notifs[] = $n;
}
+ }
- if (count($comments)){
- foreach ($comments as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} commented %s's post"), $i['pname'] ) );
- };
- }
- if (count($likes)){
- foreach ($likes as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} liked %s's post"), $i['pname'] ) );
- };
- }
- if (count($dislikes)){
- foreach ($dislikes as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} disliked %s's post"), $i['pname'] ) );
- };
+ if ($register>0){
+ foreach ($regs as $i) {
+ $n = array(
+ 'href' => $a->get_baseurl().'/admin/users/',
+ 'name' => $i['name'],
+ 'url' => $i['url'],
+ 'photo' => $i['micro'],
+ 'date' => $i['created'],
+ 'seen' => false,
+ 'message' => t("{0} requested registration"),
+ );
+ $notifs[] = $n;
}
- if (count($friends)){
- foreach ($friends as $i) {
- echo xmlize($a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'],$i['author-name'],$i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} is now friends with %s"), $i['fname'] ) );
- };
- }
- if (count($posts)){
- foreach ($posts as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} posted") ) );
- };
- }
- if (count($tags)){
- foreach ($tags as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} tagged %s's post with #%s"), $i['pname'], $i['tname'] ) );
- };
+ }
+ // sort notifications by $[]['date']
+ $sort_function = function($a, $b) {
+ $adate = date($a['date']);
+ $bdate = date($b['date']);
+ if ($adate == $bdate) {
+ return 0;
}
+ return ($adate < $bdate) ? 1 : -1;
+ };
+ usort($notifs, $sort_function);
- if (count($cit)){
- foreach ($cit as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',t("{0} mentioned you in a post") );
- };
+ if(count($notifs)) {
+ foreach($notifs as $n) {
+ echo xmlize($n);
}
}
+
echo " ";
}
echo " ";
@@ -328,25 +345,34 @@ function ping_get_notifications($uid) {
$offset = 0;
$seen = false;
$seensql = "NOT";
+ $order = "DESC";
$quit = false;
+ $a = get_app();
+
do {
$r = q("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
- AND $seensql `notify`.`seen` ORDER BY `notify`.`date` DESC LIMIT %d, 50",
- intval($uid), intval($offset)
+ AND NOT (`notify`.`type` IN (%d, %d))
+ AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50",
+ intval($uid),
+ intval(NOTIFY_INTRO),
+ intval(NOTIFY_MAIL),
+ intval($offset)
);
if (!$r AND !$seen) {
$seen = true;
$seensql = "";
+ $order = "DESC";
$offset = 0;
} elseif (!$r)
$quit = true;
else
$offset += 50;
+
foreach ($r AS $notification) {
if (is_null($notification["visible"]))
$notification["visible"] = true;
@@ -357,13 +383,26 @@ function ping_get_notifications($uid) {
if (is_null($notification["deleted"]))
$notification["deleted"] = 0;
+ $notification["message"] = strip_tags(bbcode($notification["msg"]));
+ $notification["name"] = strip_tags(bbcode($notification["name"]));
+
+ // Replace the name with {0} but ensure to make that only once
+ // The {0} is used later and prints the name in bold.
+
+ $pos = strpos($notification["message"],$notification['name']);
+ if ($pos !== false)
+ $notification["message"] = substr_replace($notification["message"],"{0}",$pos,strlen($notification["name"]));
+
+ $notification['href'] = $a->get_baseurl() . '/notify/view/' . $notification['id'];
+
if ($notification["visible"] AND !$notification["spam"] AND
- !$notification["deleted"] AND !is_array($result[$notification["parent"]]))
+ !$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
$result[$notification["parent"]] = $notification;
+ }
}
} while ((count($result) < 50) AND !$quit);
+
return($result);
}
-