public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-20 18:01:28 +00:00
Code Issues Releases Wiki Activity

fetch_file_contents: fix fetching protected feeds when password has special characters

Browse Source
This commit is contained in:
Andrew Dolgov
2013-03-27 12:21:26 +04:00
parent 884d16505e
commit d3911f80ca
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/functions.php
View File

@@ -287,8 +287,6 @@
} }
function fetch_file_contents($url, $type = false, $login = false, $pass = false, $post_query = false, $timeout = false) { function fetch_file_contents($url, $type = false, $login = false, $pass = false, $post_query = false, $timeout = false) {
$login = urlencode($login);
$pass = urlencode($pass);
global $fetch_last_error; global $fetch_last_error;
@@ -350,11 +348,13 @@
return $contents; return $contents;
} else { } else {
if ($login && $pass ){ if ($login && $pass){
$url_parts = array(); $url_parts = array();
preg_match("/(^[^:]*):\/\/(.*)/", $url, $url_parts); preg_match("/(^[^:]*):\/\/(.*)/", $url, $url_parts);
$pass = urlencode($pass);
if ($url_parts[1] && $url_parts[2]) { if ($url_parts[1] && $url_parts[2]) {
$url = $url_parts[1] . "://$login:$pass@" . $url_parts[2]; $url = $url_parts[1] . "://$login:$pass@" . $url_parts[2];
} }