Merge pull request #2172 from tobiasd/20151212-frosticons

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 95ebff96f3669564055688c05840bb2901d3d9b5..a267b7c95826921e75504b2a8cb77e5499ad6a8b 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -166,7 +166,7 @@ function notifications_content(&$a) {
                                                '$intro_id' => $rr['intro_id'],
                                                '$madeby' => sprintf( t('suggested by %s'),$rr['name']),
                                                '$contact_id' => $rr['contact-id'],
-                                               '$photo' => ((x($rr,'fphoto')) ? proxy_url($rr['fphoto']) : "images/person-175.jpg"),
+                                               '$photo' => ((x($rr,'fphoto')) ? proxy_url($rr['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
                                                '$fullname' => $rr['fname'],
                                                '$url' => zrl($rr['furl']),
                                                '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
@@ -222,6 +222,13 @@ function notifications_content(&$a) {
 
                                $header .= " (".network_to_name($rr['gnetwork'], $rr['url']).")";
 
+                               // Don't show these data until you are connected. Diaspora is doing the same.
+                               if($rr['gnetwork'] === NETWORK_DIASPORA) {
+                                       $rr['glocation'] = "";
+                                       $rr['gabout'] = "";
+                                       $rr['ggender'] = "";
+                               }
+
                                $notif_content .= replace_macros($tpl, array(
                                        '$header' => htmlentities($header),
                                        '$str_notifytype' => t('Notification type: '),
@@ -231,7 +238,7 @@ function notifications_content(&$a) {
                                        '$uid' => $_SESSION['uid'],
                                        '$intro_id' => $rr['intro_id'],
                                        '$contact_id' => $rr['contact-id'],
-                                       '$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo']) : "images/person-175.jpg"),
+                                       '$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
                                        '$fullname' => $rr['name'],
                                        '$location' => bbcode($rr['glocation'], false, false),
                                        '$location_label' => t('Location:'),
@@ -243,7 +250,8 @@ function notifications_content(&$a) {
                                        '$gender_label' => t('Gender:'),
                                        '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
                                        '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
-                                       '$url' => zrl($rr['url']),
+                                       '$url' => $rr['url'],
+                                       '$zrl' => zrl($rr['url']),
                                        '$url_label' => t('Profile URL'),
                                        '$knowyou' => $knowyou,
                                        '$approve' => t('Approve'),
@@ -295,7 +303,7 @@ function notifications_content(&$a) {
                                                $notif_content .= replace_macros($tpl_item_likes,array(
                                                        //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'],
-                                                       '$item_image' => $it['author-avatar'],
+                                                       '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
                                                ));
@@ -305,7 +313,7 @@ function notifications_content(&$a) {
                                                $notif_content .= replace_macros($tpl_item_dislikes,array(
                                                        //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'],
-                                                       '$item_image' => $it['author-avatar'],
+                                                       '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
                                                ));
@@ -320,7 +328,7 @@ function notifications_content(&$a) {
                                                $notif_content .= replace_macros($tpl_item_friends,array(
                                                        //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'],
-                                                       '$item_image' => $it['author-avatar'],
+                                                       '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
                                                        '$item_when' => relative_date($it['created'])
                                                ));
@@ -335,7 +343,7 @@ function notifications_content(&$a) {
                                                $notif_content .= replace_macros($tpl,array(
                                                        //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'],
-                                                       '$item_image' => $it['author-avatar'],
+                                                       '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        '$item_text' => $item_text,
                                                        '$item_when' => relative_date($it['created'])
                                                ));
@@ -368,7 +376,7 @@ function notifications_content(&$a) {
                        foreach ($r as $it) {
                                $notif_content .= replace_macros($not_tpl,array(
                                        '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
-                                       '$item_image' => proxy_url($it['photo']),
+                                       '$item_image' => proxy_url($it['photo'], false, PROXY_SIZE_MICRO),
                                        '$item_text' => strip_tags(bbcode($it['msg'])),
                                        '$item_when' => relative_date($it['date'])
                                ));