Bug with bracket

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

diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
old mode 100644 (file)
new mode 100755 (executable)
index 2437d06..8cf86d0
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * poche, a read it later open source system
+ * wallabag, self hostable application allowing you to not miss any content anymore
  *
- * @category   poche
+ * @category   wallabag
  * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
  * @license    http://www.wtfpl.net/ see COPYING file
@@ -20,27 +20,22 @@ 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';
 
+require_once INCLUDES . '/3rdparty/htmlpurifier/HTMLPurifier.auto.php';
+
+# epub library
+require_once INCLUDES . '/3rdparty/libraries/PHPePub/Logger.php';
+require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php';
+require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php';
+
 # Composer its autoloader for automatically loading Twig
 if (! file_exists(ROOT . '/vendor/autoload.php')) {
     Poche::$canRenderTemplates = false;
@@ -48,11 +43,12 @@ if (! file_exists(ROOT . '/vendor/autoload.php')) {
     require_once ROOT . '/vendor/autoload.php';
 }
 
-# system configuration; database credentials et cetera
+# system configuration; database credentials et caetera
 if (! file_exists(INCLUDES . '/poche/config.inc.php')) {
     Poche::$configFileAvailable = false;
 } else {
     require_once INCLUDES . '/poche/config.inc.php';
+    require_once INCLUDES . '/poche/config.inc.default.php';
 }
 
 if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) {
@@ -61,12 +57,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