Create sqlite table tags_entries only if not already exists

[github/wallabag/wallabag.git] / inc / poche / global.inc.php

diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 2437d0652034024cf02d45b41b67a75892988ad2..846699d3f73404b38aa506d0f75720ed55a578ac 100644 (file)
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -3,7 +3,7 @@
  * poche, a read it later open source system
  *
  * @category   poche
- * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
+ * @author     Nicolas Lœuillet <support@inthepoche.com>
  * @copyright  2013
  * @license    http://www.wtfpl.net/ see COPYING file
  */
@@ -20,25 +20,13 @@ require_once INCLUDES . '/poche/Url.class.php';
 require_once INCLUDES . '/3rdparty/class.messages.php';
 require_once INCLUDES . '/poche/Poche.class.php';
 
-require_once INCLUDES . '/3rdparty/Readability.php';
-require_once INCLUDES . '/poche/PocheReadability.php';
-
-require_once INCLUDES . '/3rdparty/Encoding.php';
 require_once INCLUDES . '/poche/Database.class.php';
 require_once INCLUDES . '/3rdparty/simple_html_dom.php';
 require_once INCLUDES . '/3rdparty/paginator.php';
 require_once INCLUDES . '/3rdparty/Session.class.php';
 
-require_once INCLUDES . '/3rdparty/simplepie/SimplePieAutoloader.php';
-require_once INCLUDES . '/3rdparty/simplepie/SimplePie/Core.php';
-require_once INCLUDES . '/3rdparty/content-extractor/ContentExtractor.php';
-require_once INCLUDES . '/3rdparty/content-extractor/SiteConfig.php';
-require_once INCLUDES . '/3rdparty/humble-http-agent/HumbleHttpAgent.php';
-require_once INCLUDES . '/3rdparty/humble-http-agent/SimplePie_HumbleHttpAgent.php';
-require_once INCLUDES . '/3rdparty/humble-http-agent/CookieJar.php';
-require_once INCLUDES . '/3rdparty/feedwriter/FeedItem.php';
-require_once INCLUDES . '/3rdparty/feedwriter/FeedWriter.php';
-require_once INCLUDES . '/3rdparty/feedwriter/DummySingleItemFeed.php';
+require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedItem.php';
+require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedWriter.php';
 require_once INCLUDES . '/3rdparty/FlattrItem.class.php';
 
 # Composer its autoloader for automatically loading Twig
@@ -61,12 +49,4 @@ if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) {
 
 if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) {
     date_default_timezone_set('UTC');
-}
-
-#XSRF protection with token
-if (!empty($_POST)) {
-    if (!Session::isToken($_POST['token'])) {
-        die(_('Wrong token'));
-    }
-    unset($_SESSION['token']);
 }
\ No newline at end of file