clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4 from fabrixxm/master 

ping: fix total count and comment/post
This commit is contained in:
fabrixxm 2011-11-14 03:10:51 -08:00
parent c659512f32 4c2680ca6f
commit 7b48b33b49
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mod/ping.php
View File

@ -35,9 +35,6 @@ function ping_init(&$a) {
case ACTIVITY_DISLIKE: case ACTIVITY_DISLIKE:
$dislikes[] = $it; $dislikes[] = $it;
break; break;
case ACTIVITY_POST;
$posts[] = $it;
break;
case ACTIVITY_FRIEND: case ACTIVITY_FRIEND:
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
$obj = parse_xml_string($xmlhead.$it['object']); $obj = parse_xml_string($xmlhead.$it['object']);
@ -45,11 +42,14 @@ function ping_init(&$a) {
$friends[] = $it; $friends[] = $it;
break; break;
default: default:
if ($it['parent']!=$it['id']) $comments[] = $it; if ($it['parent']!=$it['id']) {
$comments[] = $it;
} else {
$posts[] = $it;
}
} }
} }
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
@ -129,7 +129,7 @@ function ping_init(&$a) {
<home>$home</home>"; <home>$home</home>";
if ($register!=0) echo "<register>$register</register>"; if ($register!=0) echo "<register>$register</register>";
$tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends); $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts);
echo ' <notif count="'.$tot.'">'; echo ' <notif count="'.$tot.'">';
if ($intro>0){ if ($intro>0){