X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Fpoche%2Fglobal.inc.php;h=8cf86d03de12c930c409913e985d5de22a9b8efb;hb=f2b6b4e23064c40cde9e2ad5327499589dee503b;hp=65a026a733a7b923b75b60a714ee7636303b5620;hpb=5801355cbcfc00be56d3745ae0a82ee7797bd0dc;p=github%2Fwallabag%2Fwallabag.git

diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
old mode 100644
new mode 100755
index 65a026a7..8cf86d03
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * poche, a read it later open source system
+ * wallabag, self hostable application allowing you to not miss any content anymore
  *
- * @category   poche
- * @author     Nicolas Lœuillet <support@inthepoche.com>
+ * @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) {