convert to punycode for feed on idn hostname

[tt-rss.git] / include / functions2.php

diff --git a/include/functions2.php b/include/functions2.php
index 7e1171b7d218b112ebcf4baf5ef16c732ffee93f..6b6f5aa560b630d393b28f42c44e738fad2dcf78 100644 (file)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -1378,9 +1378,7 @@
                        }
 
                        if ($zoom_mode) {
-                               $feed_title = "<a href=\"".htmlspecialchars($line["site_url"]).
-                                       "\" target=\"_blank\">".
-                                       htmlspecialchars($line["feed_title"])."</a>";
+                               $feed_title = htmlspecialchars($line["feed_title"]);
 
                                $rv['content'] .= "<div class=\"postFeedTitle\">$feed_title</div>";
 
@@ -1778,6 +1776,16 @@
                        $url .= '/';
                }
 
+               //convert IDNA hostname to punycode if possible
+               if (function_exists("idn_to_ascii")) {
+                       $parts = parse_url($url);
+                       if (mb_detect_encoding($parts['host']) != 'ASCII')
+                       {
+                               $parts['host'] = idn_to_ascii($parts['host']);
+                               $url = build_url($parts);
+                       }
+               }
+
                if ($url != "http:///")
                        return $url;
                else