diff options
Diffstat (limited to 'mod')
| -rwxr-xr-x | mod/notifications.php | 35 | ||||
| -rw-r--r-- | mod/ping.php | 25 |
2 files changed, 60 insertions, 0 deletions
diff --git a/mod/notifications.php b/mod/notifications.php index 635639d89..5831c1b7a 100755 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -68,6 +68,11 @@ function notifications_content(&$a) { $o = ''; $tabs = array( array( + 'label' => t('System'), + 'url'=>$a->get_baseurl() . '/notifications/system', + 'sel'=> (($a->argv[1] == 'system') ? 'active' : ''), + ), + array( 'label' => t('Network'), 'url'=>$a->get_baseurl() . '/notifications/network', 'sel'=> (($a->argv[1] == 'network') ? 'active' : ''), @@ -295,6 +300,36 @@ function notifications_content(&$a) { '$notif_content' => $notif_content, )); + } else if (($a->argc > 1) && ($a->argv[1] == 'system')) { + + $notif_tpl = get_markup_template('notifications.tpl'); + + $not_tpl = get_markup_template('notify.tpl'); + require_once('include/bbcode.php'); + + $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc", + intval(local_user()) + ); + + if (count($r) > 0) { + foreach ($r as $it) { + $notif_content .= replace_macros($not_tpl,array( + '$item_link' => $a->get_baseurl().'/notify/view/'. $it['id'], + '$item_image' => $it['photo'], + '$item_text' => strip_tags(bbcode($it['msg'])), + '$item_when' => relative_date($it['date']) + )); + } + } else { + $notif_content .= t('No more system notifications.'); + } + + $o .= replace_macros($notif_tpl,array( + '$notif_header' => t('System'), + '$tabs' => $tabs, + '$notif_content' => $notif_content, + )); + } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) { $notif_tpl = get_markup_template('notifications.tpl'); diff --git a/mod/ping.php b/mod/ping.php index 9c2e385d6..2898042a3 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -12,6 +12,13 @@ function ping_init(&$a) { $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; if(local_user()){ + $z = q("select * from notify where seen = 0 and uid = %d + order by date desc", + intval(local_user()) + ); + + + $tags = array(); $comments = array(); $likes = array(); @@ -142,6 +149,22 @@ function ping_init(&$a) { $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags); echo ' <notif count="'.$tot.'">'; + + require_once('include/bbcode.php'); + + if(count($z)) { + foreach($z as $zz) { + echo xmlize($a->get_baseurl() . '/notify/' . $zz['id'], $zz['name'],$zz['url'],$zz['photo'],relative_date($zz['date']), bbcode($zz['msg'])); + + } + } + + + + + +/* + 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']), t("{0} wants to be your friend") ); @@ -195,6 +218,8 @@ function ping_init(&$a) { }; } +*/ + echo " </notif>"; } echo " <sysmsgs>"; |