Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in...

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 5296011bb37e080a220f4eb024455b79115ac13c..558942063f9382e7e95c66b3749625b910510eb7 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -369,8 +369,8 @@ function visible_activity($item) {
 if(!function_exists('conversation')) {
 function conversation(&$a, $items, $mode, $update, $preview = false) {
 
-
        require_once('include/bbcode.php');
+       require_once('mod/proxy.php');
 
        $ssl_state = ((local_user()) ? true : false);
 
@@ -378,6 +378,18 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
        $page_writeable = false;
        $live_update_div = '';
 
+       $arr_blocked = null;
+
+       if(local_user()) {
+               $str_blocked = get_pconfig(local_user(),'system','blocked');
+               if($str_blocked) {
+                       $arr_blocked = explode(',',$str_blocked);
+                       for($x = 0; $x < count($arr_blocked); $x ++)
+                               $arr_blocked[$x] = trim($arr_blocked[$x]);
+               }
+
+       }
+
        $previewing = (($preview) ? ' preview ' : '');
 
        if($mode === 'network') {
@@ -476,7 +488,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
        $alike = array();
        $dlike = array();
 
-
        // array with html for each thread (parent+comments)
        $threads = array();
        $threadsid = -1;
@@ -494,6 +505,20 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                        $tpl = 'search_item.tpl';
 
                        foreach($items as $item) {
+
+                               if($arr_blocked) {
+                                       $blocked = false;
+                                       foreach($arr_blocked as $b) {
+                                               if($b && link_compare($item['author-link'],$b)) {
+                                                       $blocked = true;
+                                                       break;
+                                               }
+                                       }
+                                       if($blocked)
+                                               continue;
+                               }
+
+
                                $threadsid++;
 
                                $comment     = '';
@@ -524,7 +549,26 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                $tags=array();
                                $hashtags = array();
                                $mentions = array();
-                               foreach(explode(',',$item['tag']) as $tag){
+
+                               $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
+                                               intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
+
+                               foreach($taglist as $tag) {
+
+                                       if ($tag["url"] == "")
+                                               $tag["url"] = $searchpath.strtolower($tag["term"]);
+
+                                       if ($tag["type"] == TERM_HASHTAG) {
+                                               $hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
+                                               $prefix = "#";
+                                       } elseif ($tag["type"] == TERM_MENTION) {
+                                               $mentions[] = "@<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
+                                               $prefix = "@";
+                                       }
+                                       $tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
+                               }
+
+                               /*foreach(explode(',',$item['tag']) as $tag){
                                        $tag = trim($tag);
                                        if ($tag!="") {
                                                $t = bbcode($tag);
@@ -534,7 +578,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                                elseif($t[0] == '@')
                                                        $mentions[] = $t;
                                        }
-                               }
+                               }*/
 
                                $sp = false;
                                $profile_link = best_link_url($item,$sp);
@@ -577,7 +621,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                $likebuttons = false;
                                $shareable = false;
 
-                               $body = prepare_body($item,true);
+                               $body = prepare_body($item,true, $preview);
 
 
                                list($categories, $folders) = get_cats_and_terms($item);
@@ -606,13 +650,14 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                $tmp_item = array(
                                        'template' => $tpl,
                                        'id' => (($preview) ? 'P0' : $item['item_id']),
+                                       'network' => $item['item_network'],
                                        'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
                                        'profile_url' => $profile_link,
                                        'item_photo_menu' => item_photo_menu($item),
                                        'name' => $profile_name_e,
                                        'sparkle' => $sparkle,
                                        'lock' => $lock,
-                                       'thumb' => $profile_avatar,
+                                       'thumb' => proxy_url($profile_avatar),
                                        'title' => $item['title_e'],
                                        'body' => $body_e,
                                        'tags' => $tags_e,
@@ -631,7 +676,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        'indent' => '',
                                        'owner_name' => $owner_name_e,
                                        'owner_url' => $owner_url,
-                                       'owner_photo' => $owner_photo,
+                                       'owner_photo' => proxy_url($owner_photo),
                                        'plink' => get_plink($item),
                                        'edpost' => false,
                                        'isstarred' => $isstarred,
@@ -641,7 +686,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        'like' => '',
                                        'dislike' => '',
                                        'comment' => '',
-                                       'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
+                                       //'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
+                                       'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/'.$item['guid'], 'title'=> t('View in context'))),
                                        'previewing' => $previewing,
                                        'wait' => t('Please wait'),
                                        'thread_level' => 1,
@@ -651,10 +697,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                call_hooks('display_item', $arr);
 
                                $threads[$threadsid]['id'] = $item['item_id'];
+                               $threads[$threadsid]['network'] = $item['item_network'];
                                $threads[$threadsid]['items'] = array($arr['output']);
 
                        }
-
                }
                else
                {
@@ -673,6 +719,21 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                        $threads = array();
                        foreach($items as $item) {
 
+                               if($arr_blocked) {
+                                       $blocked = false;
+                                       foreach($arr_blocked as $b) {
+
+                                               if($b && link_compare($item['author-link'],$b)) {
+                                                       $blocked = true;
+                                                       break;
+                                               }
+                                       }
+                                       if($blocked)
+                                               continue;
+                               }
+
+
+
                                // Can we put this after the visibility check?
                                like_puller($a,$item,$alike,'like');
                                like_puller($a,$item,$dlike,'dislike');
@@ -696,6 +757,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                        }
 
                        $threads = $conv->get_template_data($alike, $dlike);
+
                        if(!$threads) {
                                logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
                                $threads = array();
@@ -983,13 +1045,18 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
                }
        }
 
-       if($mail_enabled) {
-               $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
-               $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . t("Post to Email") . '</div>';
-       }
+       if (!$a->user['hidewall']) {
+               if($mail_enabled) {
+                       $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
+                       $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . t("Post to Email") . '</div>';
+               }
+
+               call_hooks('jot_networks', $jotnets);
+       } else
+               $jotnets .= sprintf(t('Connectors disabled, since "%s" is enabled.'),
+                                   t('Hide your profile details from unknown viewers?'));
 
        call_hooks('jot_tool', $jotplugins);
-       call_hooks('jot_networks', $jotnets);
 
        if($notes_cid)
                $jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';