From be2b9055b9019fccc9d2e4678494d0ffcd5f5f12 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 26 Sep 2013 22:00:44 +0200 Subject: Changed url's encryption from base64 to md5 Fixes Issue #243. md5 hashes are only coded on 32 hexadecimal characters, so it won't make too long file names. --- inc/3rdparty/FlattrItem.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'inc/3rdparty') diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php index c940fcd6..ab5ed81d 100644 --- a/inc/3rdparty/FlattrItem.class.php +++ b/inc/3rdparty/FlattrItem.class.php @@ -11,7 +11,7 @@ class FlattrItem { public function checkItem($urltoflattr) { $this->cacheflattrfile($urltoflattr); - $flattrResponse = file_get_contents(CACHE . "/flattr/".base64_encode($urltoflattr).".cache"); + $flattrResponse = file_get_contents(CACHE . "/flattr/".md5($urltoflattr).".cache"); if($flattrResponse != FALSE) { $result = json_decode($flattrResponse); if (isset($result->message)){ @@ -39,9 +39,9 @@ class FlattrItem { } // if a cache flattr file for this url already exists and it's been less than one day than it have been updated, see in /cache - if ((!file_exists(CACHE . "/flattr/".base64_encode($urltoflattr).".cache")) || (time() - filemtime(CACHE . "/flattr/".base64_encode($urltoflattr).".cache") > 86400)) { + if ((!file_exists(CACHE . "/flattr/".md5($urltoflattr).".cache")) || (time() - filemtime(CACHE . "/flattr/".md5($urltoflattr).".cache") > 86400)) { $askForFlattr = Tools::getFile(FLATTR_API . $urltoflattr); - $flattrCacheFile = fopen(CACHE . "/flattr/".base64_encode($urltoflattr).".cache", 'w+'); + $flattrCacheFile = fopen(CACHE . "/flattr/".md5($urltoflattr).".cache", 'w+'); fwrite($flattrCacheFile, $askForFlattr); fclose($flattrCacheFile); } -- cgit v1.2.3 From 4e5b04113d923b54206436c74ce1fa8649854046 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 27 Sep 2013 11:11:45 +0200 Subject: Changed Flattr Caching System From md5(url) to the ID of an article. Easier and faster. --- inc/3rdparty/FlattrItem.class.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'inc/3rdparty') diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php index ab5ed81d..2b7ea3fa 100644 --- a/inc/3rdparty/FlattrItem.class.php +++ b/inc/3rdparty/FlattrItem.class.php @@ -9,9 +9,10 @@ class FlattrItem { public $flattrItemURL; public $numflattrs; - public function checkItem($urltoflattr) { - $this->cacheflattrfile($urltoflattr); - $flattrResponse = file_get_contents(CACHE . "/flattr/".md5($urltoflattr).".cache"); + public function checkItem($urltoflattr,$id) { + $this->cacheflattrfile($urltoflattr, $id); + $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache"); + print_r($flattrResponse); if($flattrResponse != FALSE) { $result = json_decode($flattrResponse); if (isset($result->message)){ @@ -33,15 +34,15 @@ class FlattrItem { } } - private function cacheflattrfile($urltoflattr) { + private function cacheflattrfile($urltoflattr, $id) { if (!is_dir(CACHE . '/flattr')) { mkdir(CACHE . '/flattr', 0777); } // if a cache flattr file for this url already exists and it's been less than one day than it have been updated, see in /cache - if ((!file_exists(CACHE . "/flattr/".md5($urltoflattr).".cache")) || (time() - filemtime(CACHE . "/flattr/".md5($urltoflattr).".cache") > 86400)) { + if ((!file_exists(CACHE . "/flattr/".$id.".cache")) || (time() - filemtime(CACHE . "/flattr/".$id.".cache") > 86400)) { $askForFlattr = Tools::getFile(FLATTR_API . $urltoflattr); - $flattrCacheFile = fopen(CACHE . "/flattr/".md5($urltoflattr).".cache", 'w+'); + $flattrCacheFile = fopen(CACHE . "/flattr/".$id.".cache", 'w+'); fwrite($flattrCacheFile, $askForFlattr); fclose($flattrCacheFile); } -- cgit v1.2.3 From 969a91a1e3cff023139ae7fd065b81c921b713ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 3 Oct 2013 13:48:58 +0200 Subject: site_config is now embedded with poche --- inc/3rdparty/site_config/README.md | 6 ++++++ inc/3rdparty/site_config/custom/bfmtv.com.txt | 6 ++++++ inc/3rdparty/site_config/custom/inthepoche.com.txt | 7 +++++++ inc/3rdparty/site_config/custom/palkeo.com.txt | 0 inc/3rdparty/site_config/custom/tldp.org.txt | 6 ++++++ inc/3rdparty/site_config/index.php | 3 +++ inc/3rdparty/site_config/standard/.wikipedia.org.txt | 19 +++++++++++++++++++ inc/3rdparty/site_config/standard/index.php | 3 +++ inc/3rdparty/site_config/standard/version.php | 2 ++ 9 files changed, 52 insertions(+) create mode 100644 inc/3rdparty/site_config/README.md create mode 100644 inc/3rdparty/site_config/custom/bfmtv.com.txt create mode 100644 inc/3rdparty/site_config/custom/inthepoche.com.txt create mode 100644 inc/3rdparty/site_config/custom/palkeo.com.txt create mode 100644 inc/3rdparty/site_config/custom/tldp.org.txt create mode 100644 inc/3rdparty/site_config/index.php create mode 100644 inc/3rdparty/site_config/standard/.wikipedia.org.txt create mode 100644 inc/3rdparty/site_config/standard/index.php create mode 100644 inc/3rdparty/site_config/standard/version.php (limited to 'inc/3rdparty') diff --git a/inc/3rdparty/site_config/README.md b/inc/3rdparty/site_config/README.md new file mode 100644 index 00000000..0aff456b --- /dev/null +++ b/inc/3rdparty/site_config/README.md @@ -0,0 +1,6 @@ +Full-Text RSS Site Patterns +--------------------------- + +Site patterns allow you to specify what should be extracted from specific sites. + +Please see http://help.fivefilters.org/customer/portal/articles/223153-site-patterns for more information. \ No newline at end of file diff --git a/inc/3rdparty/site_config/custom/bfmtv.com.txt b/inc/3rdparty/site_config/custom/bfmtv.com.txt new file mode 100644 index 00000000..0ff28d56 --- /dev/null +++ b/inc/3rdparty/site_config/custom/bfmtv.com.txt @@ -0,0 +1,6 @@ +title: //title +body: //h2 | //span[@class='masque'] | //article[@class='corps_article_right'] +prune: no +tidy: no + +test_url: http://www.bfmtv.com/societe/cigarette-electronique-dangers-588622.html \ No newline at end of file diff --git a/inc/3rdparty/site_config/custom/inthepoche.com.txt b/inc/3rdparty/site_config/custom/inthepoche.com.txt new file mode 100644 index 00000000..ede74b97 --- /dev/null +++ b/inc/3rdparty/site_config/custom/inthepoche.com.txt @@ -0,0 +1,7 @@ +title: //title +body: //div[@class='post-content'] + +prune: no +tidy: no + +test_url: http://www.inthepoche.com/?post/poche-hosting \ No newline at end of file diff --git a/inc/3rdparty/site_config/custom/palkeo.com.txt b/inc/3rdparty/site_config/custom/palkeo.com.txt new file mode 100644 index 00000000..e69de29b diff --git a/inc/3rdparty/site_config/custom/tldp.org.txt b/inc/3rdparty/site_config/custom/tldp.org.txt new file mode 100644 index 00000000..7dd5cdb5 --- /dev/null +++ b/inc/3rdparty/site_config/custom/tldp.org.txt @@ -0,0 +1,6 @@ +title: //title +body: //h2 | //p | //ul +prune: no +tidy: no + +test_url: http://www.tldp.org/HOWTO/Plug-and-Play-HOWTO-7.html \ No newline at end of file diff --git a/inc/3rdparty/site_config/index.php b/inc/3rdparty/site_config/index.php new file mode 100644 index 00000000..a3d5f739 --- /dev/null +++ b/inc/3rdparty/site_config/index.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/inc/3rdparty/site_config/standard/.wikipedia.org.txt b/inc/3rdparty/site_config/standard/.wikipedia.org.txt new file mode 100644 index 00000000..8b98ae4b --- /dev/null +++ b/inc/3rdparty/site_config/standard/.wikipedia.org.txt @@ -0,0 +1,19 @@ +title: //h1[@id='firstHeading'] +body: //div[@id = 'bodyContent'] +strip_id_or_class: editsection +#strip_id_or_class: toc +strip_id_or_class: vertical-navbox +strip: //table[@id='toc'] +strip: //div[@id='catlinks'] +strip: //div[@id='jump-to-nav'] +strip: //div[@class='thumbcaption']//div[@class='magnify'] +strip: //table[@class='navbox'] +strip: //table[contains(@class, 'infobox')] +strip: //div[@class='dablink'] +strip: //div[@id='contentSub'] +strip: //table[contains(@class, 'metadata')] +strip: //*[contains(@class, 'noprint')] +strip: //span[@title='pronunciation:'] +prune: no +tidy: no +test_url: http://en.wikipedia.org/wiki/Christopher_Lloyd \ No newline at end of file diff --git a/inc/3rdparty/site_config/standard/index.php b/inc/3rdparty/site_config/standard/index.php new file mode 100644 index 00000000..a3d5f739 --- /dev/null +++ b/inc/3rdparty/site_config/standard/index.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/inc/3rdparty/site_config/standard/version.php b/inc/3rdparty/site_config/standard/version.php new file mode 100644 index 00000000..e61807ed --- /dev/null +++ b/inc/3rdparty/site_config/standard/version.php @@ -0,0 +1,2 @@ + Date: Thu, 3 Oct 2013 14:53:08 +0200 Subject: remove print_r --- inc/3rdparty/FlattrItem.class.php | 1 - 1 file changed, 1 deletion(-) (limited to 'inc/3rdparty') diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php index 2b7ea3fa..0d3e69d0 100644 --- a/inc/3rdparty/FlattrItem.class.php +++ b/inc/3rdparty/FlattrItem.class.php @@ -12,7 +12,6 @@ class FlattrItem { public function checkItem($urltoflattr,$id) { $this->cacheflattrfile($urltoflattr, $id); $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache"); - print_r($flattrResponse); if($flattrResponse != FALSE) { $result = json_decode($flattrResponse); if (isset($result->message)){ -- cgit v1.2.3