blallo/rss-bridge
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

core: use proxy when defined in HttpCachingBridgeAbstract

Browse source 
Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
This commit is contained in:
Pierre Mazière 2016-07-08 19:08:48 +02:00
parent d74beb6c6a
commit fe58d23c17
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Bridge.php
View file

@ -185,6 +185,7 @@ abstract class HttpCachingBridgeAbstract extends BridgeAbstract {
// $this->message("loading cached file from ".$filename." for page at url ".$url); // $this->message("loading cached file from ".$filename." for page at url ".$url);
// TODO touch file and its parent, and try to do neighbour deletion // TODO touch file and its parent, and try to do neighbour deletion
$this->refresh_in_cache($pageCacheDir, $filename); $this->refresh_in_cache($pageCacheDir, $filename);
$content=file_get_contents($filename);
} else { } else {
// $this->message("we have no local copy of ".$url." Downloading to ".$filename); // $this->message("we have no local copy of ".$url." Downloading to ".$filename);
$dir = substr($filename, 0, strrpos($filename, '/')); $dir = substr($filename, 0, strrpos($filename, '/'));
@ -192,11 +193,14 @@ abstract class HttpCachingBridgeAbstract extends BridgeAbstract {
// $this->message("creating directories for ".$dir); // $this->message("creating directories for ".$dir);
mkdir($dir, 0777, true); mkdir($dir, 0777, true);
} }
$this->download_remote($url, $filename); $content=$this->getContents($url);
if($content!==false){
file_put_contents($filename,$content);
}
} }
return file_get_contents($filename); return $content;
} }
public function get_cached_time($url) { public function get_cached_time($url) {
$simplified_url = str_replace(["http://", "https://", "?", "&", "="], ["", "", "/", "/", "/"], $url); $simplified_url = str_replace(["http://", "https://", "?", "&", "="], ["", "", "/", "/", "/"], $url);
// TODO build this from the variable given to Cache // TODO build this from the variable given to Cache