Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr

Conflicts:
	inc/3rdparty/site_config

3 files changed, 16 insertions, 4 deletions

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 534e660a..9db4a034 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -247,17 +247,23 @@ class Poche
                         $tidy = tidy_parse_string($content, array('indent'=>true, 'show-body-only' => true), 'UTF8');
                         $tidy->cleanRepair();
                         $content = $tidy->value;
-                    }
-                    $tpl_vars = array(
+
+                        # flattr checking
+                        $flattr = new FlattrItem();
+                        $flattr->checkItem($entry['url']);
+
+                        $tpl_vars = array(
                         'entry' => $entry,
                         'content' => $content,
-                    );
+                        'flattr' => $flattr
+                        );
+                    }
                 }
                 else {
                     Tools::logm('error in view call : entry is null');
                 }
                 break;
-            default: # home, favorites and archive views
+            default: # home, favorites and archive views 
                 $entries = $this->store->getEntriesByView($view, $this->user->getId());
                 $tpl_vars = array(
                     'entries' => '',
diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php
index 7f1b8c92..45526695 100755
--- a/inc/poche/config.inc.php
+++ b/inc/poche/config.inc.php
@@ -37,6 +37,7 @@ require_once __DIR__ . '/../../inc/3rdparty/humble-http-agent/CookieJar.php';
 require_once __DIR__ . '/../../inc/3rdparty/feedwriter/FeedItem.php';
 require_once __DIR__ . '/../../inc/3rdparty/feedwriter/FeedWriter.php';
 require_once __DIR__ . '/../../inc/3rdparty/feedwriter/DummySingleItemFeed.php';
+require_once __DIR__ . '/../../inc/3rdparty/FlattrItem.class.php';
 
 if (DOWNLOAD_PICTURES) {
     require_once __DIR__ . '/../../inc/poche/pochePictures.php';
diff --git a/inc/poche/define.inc.php b/inc/poche/define.inc.php
index 53c275dd..40f77b5c 100644
--- a/inc/poche/define.inc.php
+++ b/inc/poche/define.inc.php
@@ -22,6 +22,11 @@ define ('SHARE_TWITTER', TRUE);
 define ('SHARE_MAIL', TRUE);
 define ('SHARE_SHAARLI', FALSE);
 define ('SHAARLI_URL', 'http://myshaarliurl.com');
+define ('FLATTR', TRUE);
+define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url=');
+define ('NOT_FLATTRABLE', '0');
+define ('FLATTRABLE', '1');
+define ('FLATTRED', '2');
 define ('ABS_PATH', 'assets/');
 define ('TPL', __DIR__ . '/../../tpl');
 define ('LOCALE', __DIR__  . '/../../locale');