From f1af2c224f4f090c670c1e71ce89d651ff1441c7 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 30 Nov 2011 22:26:02 -0800 Subject: personal notifications --- mod/notifications.php | 109 ++++++++++++++++++++++++++++++++- view/notifications_comments_item.tpl | 2 +- view/notifications_dislikes_item.tpl | 2 +- view/notifications_friends_item.tpl | 2 +- view/notifications_likes_item.tpl | 2 +- view/notifications_network_item.tpl | 2 +- view/notifications_posts_item.tpl | 2 +- view/theme/duepuntozero/group_side.tpl | 4 +- 8 files changed, 114 insertions(+), 11 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index 3fee2b140..385f9d719 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -72,6 +72,11 @@ function notifications_content(&$a) { 'url'=>$a->get_baseurl() . '/notifications/network', 'sel'=> (($a->argv[1] == 'network') ? 'active' : ''), ), + array( + 'label' => t('Personal'), + 'url'=>$a->get_baseurl() . '/notifications/personal', + 'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''), + ), array( 'label' => t('Home'), 'url' => $a->get_baseurl() . '/notifications/home', @@ -191,7 +196,7 @@ function notifications_content(&$a) { } } else - info( t('No notifications.') . EOL); + info( t('No introductions.') . EOL); $o .= replace_macros($notif_tpl,array( '$notif_header' => t('Notifications'), @@ -276,7 +281,7 @@ function notifications_content(&$a) { } else { - $notif_content = t('Nothing new!'); + $notif_content = t('No more network notifications.'); } $o .= replace_macros($notif_tpl,array( @@ -285,6 +290,104 @@ function notifications_content(&$a) { '$notif_content' => $notif_content, )); + } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) { + + $notif_tpl = get_markup_template('notifications.tpl'); + + $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; + $myurl = substr($myurl,strpos($myurl,'://')+3); + $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); + $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' ) ", + dbesc($myurl . '$'), + dbesc($myurl . '\\]') + ); + + + $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, + `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` + FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 + $sql_extra + AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" , + intval(local_user()) + ); + + $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); + $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); + $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); + $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); + $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); + + $notif_content = ''; + + if (count($r) > 0) { + + foreach ($r as $it) { + switch($it['verb']){ + case ACTIVITY_LIKE: + $notif_content .= replace_macros($tpl_item_likes,array( + '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_image' => $it['author-avatar'], + '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + break; + + case ACTIVITY_DISLIKE: + $notif_content .= replace_macros($tpl_item_dislikes,array( + '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_image' => $it['author-avatar'], + '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + break; + + case ACTIVITY_FRIEND: + + $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $obj = parse_xml_string($xmlhead.$it['object']); + $it['fname'] = $obj->title; + + $notif_content .= replace_macros($tpl_item_friends,array( + '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_image' => $it['author-avatar'], + '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), + '$item_when' => relative_date($it['created']) + )); + break; + + default: + $item_text = (($it['id'] == $it['parent']) + ? sprintf( t("%s created a new post"), $it['author-name']) + : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); + $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); + + $notif_content .= replace_macros($tpl,array( + '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_image' => $it['author-avatar'], + '$item_text' => $item_text, + '$item_when' => relative_date($it['created']) + )); + } + } + + } else { + + $notif_content = t('No more personal notifications.'); + } + + $o .= replace_macros($notif_tpl,array( + '$notif_header' => t('Notifications'), + '$tabs' => $tabs, + '$notif_content' => $notif_content, + )); + + + + + + } else if (($a->argc > 1) && ($a->argv[1] == 'home')) { $notif_tpl = get_markup_template('notifications.tpl'); @@ -352,7 +455,7 @@ function notifications_content(&$a) { } } else { - $notif_content = t('Nothing new!'); + $notif_content = t('No more home notifications.'); } $o .= replace_macros($notif_tpl,array( diff --git a/view/notifications_comments_item.tpl b/view/notifications_comments_item.tpl index 96327b2d8..73cc9f948 100644 --- a/view/notifications_comments_item.tpl +++ b/view/notifications_comments_item.tpl @@ -1,3 +1,3 @@
- $item_text $item_when + $item_text $item_when
\ No newline at end of file diff --git a/view/notifications_dislikes_item.tpl b/view/notifications_dislikes_item.tpl index 96327b2d8..73cc9f948 100644 --- a/view/notifications_dislikes_item.tpl +++ b/view/notifications_dislikes_item.tpl @@ -1,3 +1,3 @@
- $item_text $item_when + $item_text $item_when
\ No newline at end of file diff --git a/view/notifications_friends_item.tpl b/view/notifications_friends_item.tpl index 96327b2d8..73cc9f948 100644 --- a/view/notifications_friends_item.tpl +++ b/view/notifications_friends_item.tpl @@ -1,3 +1,3 @@
- $item_text $item_when + $item_text $item_when
\ No newline at end of file diff --git a/view/notifications_likes_item.tpl b/view/notifications_likes_item.tpl index 96327b2d8..389144d9b 100644 --- a/view/notifications_likes_item.tpl +++ b/view/notifications_likes_item.tpl @@ -1,3 +1,3 @@
- $item_text $item_when + $item_text $item_when
\ No newline at end of file diff --git a/view/notifications_network_item.tpl b/view/notifications_network_item.tpl index f398f1210..bd86548fc 100644 --- a/view/notifications_network_item.tpl +++ b/view/notifications_network_item.tpl @@ -1,3 +1,3 @@
- {$item_text} {$item_when} + {$item_text} {$item_when}
\ No newline at end of file diff --git a/view/notifications_posts_item.tpl b/view/notifications_posts_item.tpl index 96327b2d8..73cc9f948 100644 --- a/view/notifications_posts_item.tpl +++ b/view/notifications_posts_item.tpl @@ -1,3 +1,3 @@
- $item_text $item_when + $item_text $item_when
\ No newline at end of file diff --git a/view/theme/duepuntozero/group_side.tpl b/view/theme/duepuntozero/group_side.tpl index a1fc70a22..8c4464560 100644 --- a/view/theme/duepuntozero/group_side.tpl +++ b/view/theme/duepuntozero/group_side.tpl @@ -13,9 +13,9 @@ /> {{ endif }} {{ if $group.edit }} - + {{ endif }} - $group.text + $group.text {{ endfor }} -- cgit v1.2.3