10 files changed, 58 insertions, 6 deletions

diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php
index c940fcd6..0d3e69d0 100644
--- a/inc/3rdparty/FlattrItem.class.php
+++ b/inc/3rdparty/FlattrItem.class.php
@@ -9,9 +9,9 @@ class FlattrItem {
     public $flattrItemURL;
     public $numflattrs;
 
-    public function checkItem($urltoflattr) {
-        $this->cacheflattrfile($urltoflattr);
-        $flattrResponse = file_get_contents(CACHE . "/flattr/".base64_encode($urltoflattr).".cache");
+    public function checkItem($urltoflattr,$id) {
+        $this->cacheflattrfile($urltoflattr, $id);
+        $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache");
         if($flattrResponse != FALSE) {
             $result = json_decode($flattrResponse);
             if (isset($result->message)){
@@ -33,15 +33,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/".base64_encode($urltoflattr).".cache")) || (time() - filemtime(CACHE . "/flattr/".base64_encode($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/".base64_encode($urltoflattr).".cache", 'w+');
+            $flattrCacheFile = fopen(CACHE . "/flattr/".$id.".cache", 'w+');
             fwrite($flattrCacheFile, $askForFlattr);
             fclose($flattrCacheFile);
         }
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
--- /dev/null
+++ b/inc/3rdparty/site_config/custom/palkeo.com.txt
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 @@
+<?php
+// this is here to prevent directory listing over the web
+?>
\ 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 @@
+<?php
+// this is here to prevent directory listing over the web
+?>
\ 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 @@
+<?php 
+return 1;
\ No newline at end of file