diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-10 11:51:59 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-10 11:51:59 +0200 |
| commit | 7d1ebd3c23d8189adb522ccaf63a6f525bbe6ff2 (patch) | |
| tree | e47b4ce39e190788dcaa5be159ded1fc3dbdf63a /lib/lib_rss.php | |
| parent | f3aef1e59b872b2e8378c2852b1a5307706ed897 (diff) | |
| parent | fedf062b4942a1e30608b662f713f06a83a0565c (diff) | |
Merge branch 'FreshRSS/dev' into sql_hash_lastUpdate
Diffstat (limited to 'lib/lib_rss.php')
| -rw-r--r-- | lib/lib_rss.php | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php index db8fa63d1..6342011c8 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -51,6 +51,21 @@ function classAutoloader($class) { spl_autoload_register('classAutoloader'); //</Auto-loading> +function idn_to_puny($url) { + if (function_exists('idn_to_ascii')) { + $parts = parse_url($url); + if (!empty($parts['host'])) { + $idn = $parts['host']; + $puny = idn_to_ascii($idn); + $pos = strpos($url, $idn); + if ($pos !== false) { + return substr_replace($url, $puny, $pos, strlen($idn)); + } + } + } + return $url; +} + function checkUrl($url) { if (empty ($url)) { return ''; @@ -58,6 +73,7 @@ function checkUrl($url) { if (!preg_match ('#^https?://#i', $url)) { $url = 'http://' . $url; } + $url = idn_to_puny($url); //PHP bug #53474 IDN if (filter_var($url, FILTER_VALIDATE_URL) || (version_compare(PHP_VERSION, '5.3.3', '<') && (strpos($url, '-') > 0) && //PHP bug #51192 ($url === filter_var($url, FILTER_SANITIZE_URL)))) { |