valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'subscribe-idn-feed' into 'master' 

Subscribe to feed with Internationalized Domain Name

Currently you cannot subscribe to feeds on hosts with internationalized domain names (IDNA) within tt-rss. You need to manually convert them to punycode to subscribe to them.

This patch adds code to detect IDNA and convert them to punycode in fix_url() if possible on the system. This requires PHP IDN functions (e.g. on Debian Jessie this needs php5-intl to be installed), so a notice is added to the installer sanity check.

See merge request !37
This commit is contained in:
Andrew Dolgov 2017-01-16 11:36:00 +03:00
parent 6b06a609af 62958fe9dc
commit f6bcb5c606
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/functions2.php
View File

@ -1776,6 +1776,16 @@
$url .= '/'; $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:///") if ($url != "http:///")
return $url; return $url;
else else

4
install/index.php
View File

@ -309,6 +309,10 @@
array_push($notices, "CURL and open_basedir combination breaks support for HTTP redirects. See the FAQ for more information."); array_push($notices, "CURL and open_basedir combination breaks support for HTTP redirects. See the FAQ for more information.");
} }
if (!function_exists("idn_to_ascii")) {
array_push($notices, "PHP support for Internationalization Functions is required to handle Internationalized Domain Names.");
}
if (count($notices) > 0) { if (count($notices) > 0) {
print_notice("Configuration check succeeded with minor problems:"); print_notice("Configuration check succeeded with minor problems:");