add nickname to list/icons links

[quix0rs-gnu-social.git] / lib / twitterapi.php

diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index d4b6fff4fb47f7bacaa153d87ed962dd5eb0aca2..e2b0ba164d016edf947f734a8f8a3b79eefc44b3 100644 (file)
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -67,7 +67,7 @@ class TwitterapiAction extends Action {
                $twitter_status['source'] = $this->source_link($notice->source);
                $twitter_status['id'] = intval($notice->id);
                $twitter_status['in_reply_to_user_id'] = ($notice->reply_to) ? $this->replier_by_reply(intval($notice->reply_to)) : NULL;
-               
+
                if (isset($this->auth_user)) {
                        common_debug("auth user set: " . $this->auth_user->nickname);
                        $twitter_status['favorited'] = ($this->auth_user->hasFave($notice)) ? 'true' : 'false';
@@ -92,7 +92,7 @@ class TwitterapiAction extends Action {
                $server = common_config('site', 'server');
                $entry = array();
 
-               $entry['content'] = $profile->nickname . ': ' . $notice->content;
+               $entry['content'] = $profile->nickname . ': ' . common_xml_safe_str($notice->content);
                $entry['title'] = $entry['content'];
                $entry['link'] = common_local_url('shownotice', array('notice' => $notice->id));
                $entry['published'] = common_date_iso8601($notice->created);
@@ -115,14 +115,14 @@ class TwitterapiAction extends Action {
                $entry['title'] = sprintf('Message from %s to %s',
                        $message->getFrom()->nickname, $message->getTo()->nickname);
 
-               $entry['content'] = $message->content;
+               $entry['content'] = common_xml_safe_str($message->content);
                $entry['link'] = $message->uri;
                $entry['published'] = common_date_iso8601($message->created);
                $entry['id'] = "tag:$server,2008:$entry[link]";
                $entry['updated'] = $entry['published'];
 
                # RSS Item specific
-               $entry['description'] = $message->content;
+               $entry['description'] = $entry['content'];
                $entry['pubDate'] = common_date_rfc2822($message->created);
                $entry['guid'] = $entry['link'];
 
@@ -152,9 +152,14 @@ class TwitterapiAction extends Action {
        function show_twitter_xml_status($twitter_status) {
                common_element_start('status');
                foreach($twitter_status as $element => $value) {
-                       if ($element == 'user') {
+                       switch ($element) {
+                       case 'user':
                                $this->show_twitter_xml_user($twitter_status['user']);
-                       } else {
+                               break;
+                       case 'text':
+                               common_element($element, NULL, common_xml_safe_str($value));
+                               break;
+                       default:
                                common_element($element, NULL, $value);
                        }
                }
@@ -229,9 +234,15 @@ class TwitterapiAction extends Action {
        function show_twitter_xml_dmsg($twitter_dm) {
                common_element_start('direct_message');
                foreach($twitter_dm as $element => $value) {
-                       if ($element == 'sender' || $element == 'recipient') {
+                       switch ($element) {
+                       case 'sender':
+                       case 'recipient':
                                $this->show_twitter_xml_user($value, $element);
-                       } else {
+                               break;
+                       case 'text':
+                               common_element($element, NULL, common_xml_safe_str($value));
+                               break;
+                       default:
                                common_element($element, NULL, $value);
                        }
                }
@@ -386,7 +397,7 @@ class TwitterapiAction extends Action {
                }
        }
 
-       function init_document($type='xml') {   
+       function init_document($type='xml') {
                switch ($type) {
                 case 'xml':
                        header('Content-Type: application/xml; charset=utf-8');