mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-19 05:44:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use url_remove_credentials to log URL

Browse Source 
See https://github.com/FreshRSS/FreshRSS/issues/711
This commit is contained in:
Marien Fressinaud
2015-01-29 10:57:11 +01:00
parent e078f9fdac
commit 8ff3e5363d
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Models/Feed.php
View File

@@ -240,19 +240,16 @@ class FreshRSS_Feed extends Minz_Model {
$subscribe_url = $feed->subscribe_url(true);
}
$clean_url = url_remove_credentials($subscribe_url);
if ($subscribe_url !== null && $subscribe_url !== $url) {
if ($this->httpAuth != '') {
// on enlève les id si authentification HTTP
$subscribe_url = preg_replace('#((.+)://)((.+)@)(.+)#', '${1}${5}', $subscribe_url);
}
$this->_url($subscribe_url);
$this->_url($clean_url);
}
if (($mtime === true) ||($mtime > $this->lastUpdate)) {
Minz_Log::notice('FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $subscribe_url);
Minz_Log::notice('FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $clean_url);
$this->loadEntries($feed); // et on charge les articles du flux
} else {
Minz_Log::notice('FreshRSS use cache for ' . $subscribe_url);
Minz_Log::notice('FreshRSS use cache for ' . $clean_url);
$this->entries = array();
}

2
lib/lib_rss.php
View File

@@ -180,7 +180,7 @@ function sanitizeHTML($data, $base = '') {
function get_content_by_parsing ($url, $path) {
require_once (LIB_PATH . '/lib_phpQuery.php');
Minz_Log::notice('FreshRSS GET ' . $url);
Minz_Log::notice('FreshRSS GET ' . url_remove_credentials($url));
$html = file_get_contents ($url);
if ($html) {