harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

connection notifications

Browse Source
This commit is contained in:
friendica 2012-12-02 15:45:13 -08:00
parent 7f1a4a3060
commit 4cca8f8fa1
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mod/ping.php
View File

@ -93,14 +93,14 @@ function ping_init(&$a) {
if(argc() > 1 && (argv(1) === 'network' || argv(1) === 'home')) { if(argc() > 1 && (argv(1) === 'network' || argv(1) === 'home')) {
$result = array(); $result = array();
dbg(1);
$r = q("SELECT * FROM item $r = q("SELECT * FROM item
WHERE item_restrict = %d and ( item_flags & %d ) and uid = %d", WHERE item_restrict = %d and ( item_flags & %d ) and uid = %d",
intval(ITEM_VISIBLE), intval(ITEM_VISIBLE),
intval(ITEM_UNSEEN), intval(ITEM_UNSEEN),
intval(local_user()) intval(local_user())
); );
dbg(0);
if($r) { if($r) {
xchan_query($r); xchan_query($r);
foreach($r as $item) { foreach($r as $item) {
@ -115,6 +115,36 @@ dbg(0);
} }
if(argc() > 1 && (argv(1) === 'connect')) {
$result = array();
$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d and (abook_flags & %d) and not (abook_flags & %d)",
intval(local_user()),
intval(ABOOK_FLAG_PENDING),
intval(ABOOK_FLAG_SELF)
);
if($r) {
foreach($r as $rr) {
$result[] = array(
'notify_link' => $a->get_baseurl() . '/notify/view-intro/' . $rr['abook_id'],
'name' => $rr['xchan_name'],
'url' => $rr['xchan_url'],
'photo' => $rr['xchan_photo_s'],
'when' => relative_date($rr['abook_created']),
'class' => ('notify-unseen'),
'message' => strip_tags(sprintf( t("Connection request from %s"), $rr['xchan_name']))
);
}
}
logger('ping: ' . print_r($result,true));
echo json_encode(array( argv(1) => $result));
killme();
}
// Normal ping - just the counts // Normal ping - just the counts

2
version.inc
View File

@ -1 +1 @@
2012-12-01.156 2012-12-02.157