X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=9338b8b686af87b99bd230b8158b05f6338d9813;hb=74883adfd186967cdd41037d76dd2684de273cb8;hp=791ceed3519a6dc12d588a270f395431f5fb55fb;hpb=a58be379300229b72aae193b6d7cac7287922c27;p=friendica.git
diff --git a/mod/ping.php b/mod/ping.php
index 791ceed351..9338b8b686 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,6 +1,8 @@
$r);
call_hooks('network_ping', $arr);
@@ -84,6 +91,17 @@ function ping_init(&$a) {
}
}
+ 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 = ForumManager::count_unseen_items();
+ }
+ }
+
$intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`,
`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
@@ -100,8 +118,6 @@ function ping_init(&$a) {
$intro = count($intros1) + count($intros2);
$intros = $intros1+$intros2;
-
-
$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
$mails = q("SELECT * FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@@ -134,7 +150,7 @@ function ping_init(&$a) {
dbesc(datetime_convert('UTC','UTC','now'))
);
- if($ev && count($ev)) {
+ if(dba::is_result($ev)) {
$all_events = intval($ev[0]['total']);
if($all_events) {
@@ -186,12 +202,12 @@ function ping_init(&$a) {
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']);
-
+ $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
+
call_hooks('ping_xmlize', $n);
- $notsxml = '%s'."\n";
- return sprintf ( $notsxml,
- xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']),
+ $notsxml = '%s'."\n";
+ return sprintf ( $notsxml, intval($n['id']),
+ xmlify($n['href']), xmlify(xmlify($n['name'])), xmlify($n['url']), xmlify($n['photo']),
xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)),
xmlify($n['message'])
);
@@ -203,6 +219,24 @@ function ping_init(&$a) {
$home\r\n";
if ($register!=0) echo "$register";
+ if ( dba::is_result($groups_unseen) ) {
+ echo '';
+ foreach ($groups_unseen as $it)
+ if ($it['count'] > 0)
+ echo ''.$it['count']."";
+
+ echo "";
+ }
+
+ if ( dba::is_result($forums_unseen) ) {
+ echo '';
+ foreach ($forums_unseen as $it)
+ if ($it['count'] > 0)
+ echo ''.$it['count']."";
+
+ echo "";
+ }
+
echo "$all_events
$all_events_today
$events
@@ -211,8 +245,8 @@ function ping_init(&$a) {
$birthdays_today\r\n";
- if(count($notifs) && (! $sysnotify)) {
- foreach($notifs as $zz) {
+ if (dba::is_result($notifs) && (! $sysnotify)) {
+ foreach ($notifs as $zz) {
if($zz['seen'] == 0)
$sysnotify ++;
}
@@ -221,50 +255,51 @@ function ping_init(&$a) {
echo ' ';
// merge all notification types in one array
- if ($intro>0){
+ if ( dba::is_result($intros) ) {
foreach ($intros as $i) {
$n = array(
'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
'name' => $i['name'],
- 'url' => $i['url'],
+ 'url' => $i['url'],
'photo' => $i['photo'],
'date' => $i['datetime'],
'seen' => false,
- 'message' => t("{0} wants to be your friend"),
+ 'message' => t("{0} wants to be your friend"),
);
$notifs[] = $n;
}
}
-
- if ($mail>0){
+
+ if ( dba::is_result($mails) ) {
foreach ($mails as $i) {
$n = array(
'href' => $a->get_baseurl().'/message/'.$i['id'],
'name' => $i['from-name'],
- 'url' => $i['from-url'],
+ 'url' => $i['from-url'],
'photo' => $i['from-photo'],
'date' => $i['created'],
'seen' => false,
- 'message' => t("{0} sent you a message"),
+ 'message' => t("{0} sent you a message"),
);
$notifs[] = $n;
}
}
-
- if ($register>0){
+
+ if ( dba::is_result($regs) ) {
foreach ($regs as $i) {
$n = array(
'href' => $a->get_baseurl().'/admin/users/',
'name' => $i['name'],
- 'url' => $i['url'],
+ 'url' => $i['url'],
'photo' => $i['micro'],
'date' => $i['created'],
'seen' => false,
- 'message' => t("{0} requested registration"),
+ 'message' => t("{0} requested registration"),
);
$notifs[] = $n;
}
}
+
// sort notifications by $[]['date']
$sort_function = function($a, $b) {
$adate = date($a['date']);
@@ -276,7 +311,7 @@ function ping_init(&$a) {
};
usort($notifs, $sort_function);
- if(count($notifs)) {
+ if( dba::is_result($notifs) ) {
foreach($notifs as $n) {
echo xmlize($n);
}
@@ -339,7 +374,7 @@ function ping_get_notifications($uid) {
$quit = true;
else
$offset += 50;
-
+
foreach ($r AS $notification) {
if (is_null($notification["visible"]))
@@ -357,12 +392,16 @@ function ping_get_notifications($uid) {
// 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 ($notification['name'] != "")
+ $pos = strpos($notification["message"],$notification['name']);
+ else
+ $pos = false;
+
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"]])) {
$result[$notification["parent"]] = $notification;
@@ -371,6 +410,6 @@ function ping_get_notifications($uid) {
} while ((count($result) < 50) AND !$quit);
-
+
return($result);
}