Contact names with ">" and "<" are a problem ...

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index aa9792b159875fbbb78691a979f29a78c7eb249e..63fa43d3e25eb2feb41e78f8cab56a84bb2432d7 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -4,6 +4,7 @@ if(class_exists('Item'))
 
 require_once('object/BaseObject.php');
 require_once('include/text.php');
+require_once('include/diaspora.php');
 require_once('boot.php');
 
 /**
@@ -82,7 +83,6 @@ class Item extends BaseObject {
         */
        public function get_template_data($alike, $dlike, $thread_level=1) {
                require_once("mod/proxy.php");
-               require_once("include/diaspora.php");
 
                $result = array();
 
@@ -134,7 +134,7 @@ class Item extends BaseObject {
                $filer = (($conv->get_profile_owner() == local_user()) ? t("save to folder") : false);
 
                $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
-               $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+               $profile_name   = htmlentities(((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
                if($item['author-link'] && (! $item['author-name']))
                        $profile_name = $item['author-link'];
 
@@ -155,7 +155,7 @@ class Item extends BaseObject {
 
                $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
                call_hooks('render_location',$locate);
-               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
 
                $searchpath = $a->get_baseurl()."/search?tag=";
                $tags=array();
@@ -235,6 +235,8 @@ class Item extends BaseObject {
                        if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
                }
 
+               $comment = $this->get_comment_box($indent);
+
                if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0){
                        $shiny = 'shiny';
                }
@@ -304,11 +306,14 @@ class Item extends BaseObject {
                        !diaspora_is_redmatrix($item["owner-link"]) AND isset($buttons["like"]))
                        unset($buttons["like"]);
 
+               // Diaspora doesn't has multithreaded comments
+               if (($item["item_network"] == NETWORK_DIASPORA) AND ($indent == 'comment'))
+                       unset($comment);
+
                // Facebook can like comments - but it isn't programmed in the connector yet.
                if (($item["item_network"] == NETWORK_FACEBOOK) AND ($indent == 'comment') AND isset($buttons["like"]))
                        unset($buttons["like"]);
 
-
                $tmp_item = array(
                        'template' => $this->get_template(),
 
@@ -325,9 +330,9 @@ class Item extends BaseObject {
                        'body' => $body_e,
                        'text' => $text_e,
                        'id' => $this->get_id(),
-                       'guid' => $item['guid'],
+                       'guid' => urlencode($item['guid']),
                        'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
-                       'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+                       'olinktitle' => sprintf( t('View %s\'s profile @ %s'), htmlentities($this->get_owner_name()), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
                        'to' => t('to'),
                        'via' => t('via'),
                        'wall' => t('Wall-to-Wall'),
@@ -335,7 +340,7 @@ class Item extends BaseObject {
                        'profile_url' => $profile_link,
                        'item_photo_menu' => item_photo_menu($item),
                        'name' => $name_e,
-                       'thumb' => proxy_url($profile_avatar),
+                       'thumb' => proxy_url($profile_avatar, false, PROXY_SIZE_THUMB),
                        'osparkle' => $osparkle,
                        'sparkle' => $sparkle,
                        'title' => $title_e,
@@ -348,8 +353,8 @@ class Item extends BaseObject {
                        'indent' => $indent,
                        'shiny' => $shiny,
                        'owner_url' => $this->get_owner_url(),
-                       'owner_photo' => proxy_url($this->get_owner_photo()),
-                       'owner_name' => $owner_name_e,
+                       'owner_photo' => proxy_url($this->get_owner_photo(), false, PROXY_SIZE_THUMB),
+                       'owner_name' => htmlentities($owner_name_e),
                        'plink' => get_plink($item),
                        'edpost'    => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
                        'isstarred' => $isstarred,
@@ -362,14 +367,14 @@ class Item extends BaseObject {
                        'like' => $like,
                         'dislike'   => $dislike,
                        'switchcomment' => t('Comment'),
-                       'comment' => $this->get_comment_box($indent),
+                       'comment' => $comment,
                        'previewing' => ($conv->is_preview() ? ' preview ' : ''),
                        'wait' => t('Please wait'),
                        'thread_level' => $thread_level,
                         'postopts' => $langstr,
                         'edited' => $edited,
                        'network' => $item["item_network"],
-                       'network_name' => network_to_name($item['item_network']),
+                       'network_name' => network_to_name($item['item_network'], $profile_link),
                );
 
                $arr = array('item' => $item, 'output' => $tmp_item);
@@ -524,7 +529,7 @@ class Item extends BaseObject {
         */
        public function set_conversation($conv) {
                $previous_mode = ($this->conversation ? $this->conversation->get_mode() : '');
-               
+
                $this->conversation = $conv;
 
                // Set it on our children too
@@ -645,7 +650,7 @@ class Item extends BaseObject {
                if(!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) {
                        return '';
                }
-               
+
                $comment_box = '';
                $conv = $this->get_conversation();
                $template = get_markup_template($this->get_comment_box_template());