diff options
| author | friendica <info@friendica.com> | 2013-01-08 11:59:29 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-01-08 11:59:29 -0800 |
| commit | a96d3ac66f50615ffc0ba764fdeba14cdae00c86 (patch) | |
| tree | 3d10d634839c9d5628d4df8abe1e1881d9211a93 /mod/ping.php | |
| parent | 3b213c5fc76d7392f1fd825b9db4fb4dfb8b9940 (diff) | |
| download | volse-hubzilla-a96d3ac66f50615ffc0ba764fdeba14cdae00c86.tar.gz volse-hubzilla-a96d3ac66f50615ffc0ba764fdeba14cdae00c86.tar.bz2 volse-hubzilla-a96d3ac66f50615ffc0ba764fdeba14cdae00c86.zip | |
The rest of the front end for the new notifications - now only missing "mark all seen" for some types, ajax loader for a couple of types, and perhaps a birthday cake icon if any birthdays today, a bit of css cleanup of duplicated or obsolete stuff
Diffstat (limited to 'mod/ping.php')
| -rw-r--r-- | mod/ping.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/ping.php b/mod/ping.php index dd6153963..3c3cef325 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -95,7 +95,7 @@ function ping_init(&$a) { $channel = $a->get_channel(); $t = q("select mail.*, xchan.* from mail left join xchan on xchan_hash = from_xchan - where channel_id = %d and ( mail_flags & %d ) and not (mail_flags & %d ) + where channel_id = %d and not ( mail_flags & %d ) and not (mail_flags & %d ) and from_xchan != '%s' order by created desc limit 0,50", intval(local_user()), intval(MAIL_SEEN), @@ -146,7 +146,7 @@ function ping_init(&$a) { } } logger('ping: ' . print_r($result,true)); - echo json_encode(array( argv(1) => $result)); + echo json_encode(array('notify' => $result)); killme(); } |