HTML entity encode source link URLs in plain XML output and add rel="nofollow" to...

diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 3eb54ccc36fe27b09f7a920c6ee41fdd0c107767..6c740c4902289270440095f98f4b07b4ffa4aa16 100644 (file)
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -349,7 +349,7 @@ class TwitapisearchatomAction extends ApiAction
         $ns = $notice->getSource();
         if ($ns) {
             if (!empty($ns->name) && !empty($ns->url)) {
-                $source = '<a href="' . $ns->url . '">' . $ns->name . '</a>';
+                $source = '<a href="' . $ns->url . '" rel="nofollow">' . $ns->name . '</a>';
             } else {
                 $source = $ns->code;
             }

diff --git a/lib/apiaction.php b/lib/apiaction.php
index 8c4dc6c262b1a556b9425389cc468c6abbe8da02..2608be227a4f5d09c8a5ed865ac2afc766c8e351 100644 (file)
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -319,13 +319,13 @@ class ApiAction extends Action
         $ns = $notice->getSource();
         if ($ns) {
             if (!empty($ns->name) && !empty($ns->url)) {
-                $source = '<a href="' . $ns->url . '">' . $ns->name . '</a>';
+                $source = '<a href="' . $ns->url . '" rel="nofollow">' . $ns->name . '</a>';
             } else {
                 $source = $ns->code;
             }
         }
 
-        $twitter_status['source'] = $source;
+        $twitter_status['source'] = htmlentities($source);
         $twitter_status['id'] = intval($notice->id);
 
         $replier_profile = null;