Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 513f685b477b9cf100a12045bfe11706bdbc24df..f6c4e8f51fb128d7f3c719214e41a5d28d0eb58d 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -1,6 +1,7 @@
 <?php
 include_once("include/bbcode.php");
 include_once("include/contact_selectors.php");
+include_once("include/Scrape.php");
 
 function notifications_post(&$a) {
 
@@ -48,12 +49,12 @@ function notifications_post(&$a) {
                                        intval(local_user())
                                );
                        }
-                       goaway($a->get_baseurl(true) . '/notifications/intros');
+                       goaway('notifications/intros');
                }
                if($_POST['submit'] == t('Ignore')) {
                        $r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d",
                                intval($intro_id));
-                       goaway($a->get_baseurl(true) . '/notifications/intros');
+                       goaway('notifications/intros');
                }
        }
 }
@@ -78,37 +79,37 @@ function notifications_content(&$a) {
        $tabs = array(
                array(
                        'label' => t('System'),
-                       'url'=>$a->get_baseurl(true) . '/notifications/system',
+                       'url'=>'notifications/system',
                        'sel'=> (($a->argv[1] == 'system') ? 'active' : ''),
                        'accesskey' => 'y',
                ),
                array(
                        'label' => t('Network'),
-                       'url'=>$a->get_baseurl(true) . '/notifications/network',
+                       'url'=>'notifications/network',
                        'sel'=> (($a->argv[1] == 'network') ? 'active' : ''),
                        'accesskey' => 'w',
                ),
                array(
                        'label' => t('Personal'),
-                       'url'=>$a->get_baseurl(true) . '/notifications/personal',
+                       'url'=>'notifications/personal',
                        'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''),
                        'accesskey' => 'r',
                ),
                array(
                        'label' => t('Home'),
-                       'url' => $a->get_baseurl(true) . '/notifications/home',
+                       'url' => 'notifications/home',
                        'sel'=> (($a->argv[1] == 'home') ? 'active' : ''),
                        'accesskey' => 'h',
                ),
                array(
                        'label' => t('Introductions'),
-                       'url' => $a->get_baseurl(true) . '/notifications/intros',
+                       'url' => 'notifications/intros',
                        'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''),
                        'accesskey' => 'i',
                ),
                /*array(
                        'label' => t('Messages'),
-                       'url' => $a->get_baseurl(true) . '/message',
+                       'url' => 'message',
                        'sel'=> '',
                ),*/ /*while I can have notifications for messages, this tablist is not place for message page link */
        );
@@ -165,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'], 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), ''),
@@ -219,7 +220,14 @@ function notifications_content(&$a) {
                                if ($ret["addr"] != "")
                                        $header .= " <".$ret["addr"].">";
 
-                               $header .= " (".network_to_name($rr['gnetwork']).")";
+                               $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),
@@ -230,11 +238,11 @@ 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:'),
-                                       '$about' => proxy_parse_html(bbcode($rr['gabout'], false, false)),
+                                       '$about' => bbcode($rr['gabout'], false, false),
                                        '$about_label' => t('About:'),
                                        '$keywords' => $rr['gkeywords'],
                                        '$keywords_label' => t('Tags:'),
@@ -242,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'),
@@ -294,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'])
                                                ));
@@ -304,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'])
                                                ));
@@ -319,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'])
                                                ));
@@ -334,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'])
                                                ));
@@ -367,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' => $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'])
                                ));