From 8a2d1fe301d22e0ccb2dce80e72c38d7ce4e976c Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 4 Oct 2015 22:24:58 +0200 Subject: [PATCH] Show RedMatrix and use the proxy for the profile pictures --- mod/follow.php | 4 ++-- mod/notifications.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/follow.php b/mod/follow.php index 8affa11b56..2c8452b1bf 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -72,11 +72,11 @@ function follow_content(&$a) { if ($ret["addr"] != "") $header .= " <".$ret["addr"].">"; - $header .= " (".network_to_name($ret['network']).")"; + $header .= " (".network_to_name($ret['network'], $ret['url']).")"; $o = replace_macros($tpl,array( '$header' => htmlentities($header), - '$photo' => $ret["photo"], + '$photo' => proxy_url($ret["photo"]), '$desc' => "", '$pls_answer' => t('Please answer the following:'), '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))), diff --git a/mod/notifications.php b/mod/notifications.php index bcda5ba343..69ab592afe 100644 --- 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')) ? $rr['fphoto'] : "images/person-175.jpg"), + '$photo' => ((x($rr,'fphoto')) ? proxy_url($rr['fphoto']) : "images/person-175.jpg"), '$fullname' => $rr['fname'], '$url' => zrl($rr['furl']), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), @@ -220,7 +220,7 @@ function notifications_content(&$a) { if ($ret["addr"] != "") $header .= " <".$ret["addr"].">"; - $header .= " (".network_to_name($rr['gnetwork']).")"; + $header .= " (".network_to_name($rr['gnetwork'], $rr['url']).")"; $notif_content .= replace_macros($tpl, array( '$header' => htmlentities($header), @@ -368,7 +368,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' => $it['photo'], + '$item_image' => proxy_url($it['photo']), '$item_text' => strip_tags(bbcode($it['msg'])), '$item_when' => relative_date($it['date']) )); -- 2.39.5