10 files changed, 508 insertions, 190 deletions
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index f6ba4708..65675afe 100755
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -31,10 +31,15 @@ class Database {
                $this->handle = new PDO($db_path);
                break;
            case 'mysql':
-                $db_path = 'mysql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB . ';charset=utf8mb4';
+                if (MYSQL_USE_UTF8MB4) {
-                $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD, array(
+                    $db_path = 'mysql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB . ';charset=utf8mb4';
-                    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4',
+                    $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD, array(
-                ));
+                        PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4',
+                    ));
+                } else {
+                    $db_path = 'mysql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB;
+                    $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD);
+                }
                break;
            case 'postgres':
                $db_path = 'pgsql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB;
@@ -293,7 +298,7 @@ class Database {
            $sql_limit = "LIMIT ".$limit." OFFSET 0";
        }
-        $sql        = "SELECT * FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE 'Untitled - Import%' AND user_id=? ORDER BY id " . $sql_limit;
+        $sql        = "SELECT * FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE '%Import%' AND user_id=? ORDER BY id " . $sql_limit;
        $query      = $this->executeQuery($sql, array($user_id));
        $entries    = $query->fetchAll();
@@ -302,7 +307,7 @@ class Database {
    public function retrieveUnfetchedEntriesCount($user_id)
    {
-      $sql        = "SELECT count(*) FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE 'Untitled - Import%' AND user_id=?";
+      $sql        = "SELECT count(*) FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE '%Import%' AND user_id=?";
      $query      = $this->executeQuery($sql, array($user_id));
      list($count) = $query->fetch();
@@ -406,6 +411,16 @@ class Database {
        return $count;
    }
+    public function getRandomId($user_id) {
+        $random = (STORAGE == 'mysql') ? 'RAND()' : 'RANDOM()';
+        $sql = "SELECT id FROM entries WHERE user_id=? ORDER BY ". $random . " LIMIT 1";
+        $params = array($user_id);
+        $query = $this->executeQuery($sql, $params);
+        $id = $query->fetchAll();
+        return $id;
+    }
    public function updateContent($id, $content, $user_id)
    {
diff --git a/inc/poche/Language.class.php b/inc/poche/Language.class.php
index 420f2fb9..962159c0 100644
--- a/inc/poche/Language.class.php
+++ b/inc/poche/Language.class.php
@@ -17,7 +17,7 @@ class Language
    private $languageNames = array(
        'cs_CZ.utf8' => 'čeština',
        'de_DE.utf8' => 'German',
-        'en_EN.utf8' => 'English',
+        'en_GB.utf8' => 'English (GB)',
        'en_US.utf8' => 'English (US)',
        'es_ES.utf8' => 'Español',
        'fa_IR.utf8' => 'فارسی',
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 16235474..fd2600f3 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -74,16 +74,57 @@ class Poche
    /**
     * Creates a new user
     */
-    public function createNewUser($username, $password, $email = "")
+    public function createNewUser($username, $password, $email = "", $internalRegistration = false)
    {
+        Tools::logm('Trying to create a new user...');
        if (!empty($username) && !empty($password)){
            $newUsername = filter_var($username, FILTER_SANITIZE_STRING);
            $email = filter_var($email, FILTER_SANITIZE_STRING);
            if (!$this->store->userExists($newUsername)){
                if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername), $email)) {
-                    Tools::logm('The new user ' . $newUsername . ' has been installed');
+                    if ($email != "") { // if email is filled
+                        if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) {
+                            // if internal registration from config screen
+                            $body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) . 
+                            "\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" .
+                            _('Note : The password has been chosen by the person who created your account. Get in touch with that person to know your password and change it as soon as possible') . "\r\n\r\n" .
+                            _('Have fun with it !') . "\r\n\r\n" .
+                            _('This is an automatically generated message, no one will answer if you respond to it.');
+                            
+                            // if external (public) registration
+                            $body = sprintf(_('Hi, %1$s'), $newUsername) . "\r\n\r\n" . 
+                            sprintf(_('You\'ve just created a wallabag account on %1$s.'), Tools::getPocheUrl()) . 
+                            "\r\n\r\n" . _("Have fun with it !");
+                            $body = $internalRegistration ? $body_internal : $body;
+                            $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard)
+                            if (mail($email, sprintf(_('Your new wallabag account on %1$s'), Tools::getPocheUrl()), $body, 
+                                'X-Mailer: PHP/' . phpversion() .  "\r\n" . 
+                                'Content-type: text/plain; charset=UTF-8' . "\r\n" .
+                                "From: " . $newUsername . "@" . gethostname() . "\r\n")) {
+                                Tools::logm('The user ' . $newUsername . ' has been emailed');
+                                $this->messages->add('i', sprintf(_('The new user %1$s has been sent an email at %2$s. You may have to check spam folder.'), $newUsername, $email));
+                                Tools::redirect('?');
+                                
+                            } else {
+                                Tools::logm('A problem has been encountered while sending an email');
+                                $this->messages->add('e', _('A problem has been encountered while sending an email'));
+                            }
+                        } else {
+                            Tools::logm('The user has been created, but the server did not authorize sending emails');
+                            $this->messages->add('i', _('The server did not authorize sending a confirmation email, but the user was created.'));
+                        }
+                } else {
+                    Tools::logm('The user has been created, but no email was saved, so no confimation email was sent');
+                    $this->messages->add('i', _('The user was created, but no email was sent because email was not filled in'));
+                }
+                Tools::logm('The new user ' . $newUsername . ' has been installed');
+                if (\Session::isLogged()) {
                    $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername));
-                    Tools::redirect();
+                }
+                Tools::redirect();
                }
                else {
                    Tools::logm('error during adding new user');
@@ -96,6 +137,9 @@ class Poche
                Tools::redirect();
            }
        }
+        else {
+            Tools::logm('Password or username were empty');
+        }
    }
    /**
@@ -180,6 +224,13 @@ class Poche
                        }
                    }
+                    // if there are tags, add them to the new article
+                    if (isset($_GET['tags'])) {
+                        $_POST['value'] = $_GET['tags'];
+                        $_POST['entry_id'] = $last_id;
+                        $this->action('add_tag', $url);
+                    }
                    $this->messages->add('s', _('the link has been added successfully'));
                }
                else {
@@ -188,24 +239,38 @@ class Poche
                }
                if ($autoclose == TRUE) {
-                  Tools::redirect('?view=home');
+                    Tools::redirect('?view=home&closewin=true');
                } else {
-                  Tools::redirect('?view=home&closewin=true');
+                    Tools::redirect('?view=home');
                }
+                return $last_id;
                break;
            case 'delete':
-                $msg = 'delete link #' . $id;
+                if (isset($_GET['search'])) {
-                if ($this->store->deleteById($id, $this->user->getId())) {
+                    //when we want to apply a delete to a search
-                    if (DOWNLOAD_PICTURES) {
+                    $tags = array($_GET['search']);
-                        Picture::removeDirectory(ABS_PATH . $id);
+                    $allentry_ids = $this->store->search($tags[0], $this->user->getId());
+                    $entry_ids = array();
+                    foreach ($allentry_ids as $eachentry) {
+                        $entry_ids[] = $eachentry[0];
                    }
-                    $this->messages->add('s', _('the link has been deleted successfully'));
+                } else { // delete a single article
+                    $entry_ids = array($id);
                }
-                else {
+                foreach($entry_ids as $id) {
-                    $this->messages->add('e', _('the link wasn\'t deleted'));
+                    $msg = 'delete link #' . $id;
-                    $msg = 'error : can\'t delete link #' . $id;
+                    if ($this->store->deleteById($id, $this->user->getId())) {
+                        if (DOWNLOAD_PICTURES) {
+                            Picture::removeDirectory(ABS_PATH . $id);
+                        }
+                        $this->messages->add('s', _('the link has been deleted successfully'));
+                    }
+                    else {
+                        $this->messages->add('e', _('the link wasn\'t deleted'));
+                        $msg = 'error : can\'t delete link #' . $id;
+                    }
+                    Tools::logm($msg);
                }
-                Tools::logm($msg);
                Tools::redirect('?');
                break;
            case 'toggle_fav' :
@@ -220,8 +285,21 @@ class Poche
                }
                break;
            case 'toggle_archive' :
-                $this->store->archiveById($id, $this->user->getId());
+                if (isset($_GET['tag_id'])) {
-                Tools::logm('archive link #' . $id);
+                    //when we want to archive a whole tag
+                    $tag_id = $_GET['tag_id'];
+                    $allentry_ids = $this->store->retrieveEntriesByTag($tag_id, $this->user->getId());
+                    $entry_ids = array();
+                    foreach ($allentry_ids as $eachentry) {
+                        $entry_ids[] = $eachentry[0];
+                    }
+                } else { //archive a single article
+                    $entry_ids = array($id);
+                }
+                foreach($entry_ids as $id) {
+                    $this->store->archiveById($id, $this->user->getId());
+                    Tools::logm('archive link #' . $id);
+                }
                if ( Tools::isAjaxRequest() ) {
                  echo 1;
                  exit;
@@ -303,6 +381,26 @@ class Poche
                $this->messages->add('s', _('The tag has been successfully deleted'));
                Tools::redirect();
                break;
+            case 'reload_article' :
+                Tools::logm('reload article');
+                $id = $_GET['id'];
+                $entry = $this->store->retrieveOneById($id, $this->user->getId());
+                Tools::logm('reload url ' . $entry['url']);
+                $url = new Url(base64_encode($entry['url']));
+                $this->action('add', $url);
+                break;
+                
+            /* For some unknown reason I can't get displayView() to work here (it redirects to home view afterwards). So here's a dirty fix which redirects directly to URL */
+            case 'random':
+                Tools::logm('get a random article');
+                if ($this->store->getRandomId($this->user->getId())) {
+                    $id_array = $this->store->getRandomId($this->user->getId());
+                    $id = $id_array[0];
+                    Tools::redirect('?view=view&id=' . $id[0]);
+                    Tools::logm('got the article with id ' . $id[0]);
+                }
+                break;
            default:
                break;
        }
@@ -405,9 +503,12 @@ class Poche
                    }
                    # flattr checking
-                    $flattr = new FlattrItem();
+                    $flattr = NULL;
-                    $flattr->checkItem($entry['url'], $entry['id']);
+                    if (FLATTR) {
+                        $flattr = new FlattrItem();
+                        $flattr->checkItem($entry['url'], $entry['id']);
+                    }
+                    
                    # tags
                    $tags = $this->store->retrieveTagsByEntry($entry['id']);
@@ -540,6 +641,8 @@ class Poche
                Tools::redirect($referer);
            }
            $this->messages->add('e', _('login failed: bad login or password'));
+            // log login failure in web server log to allow fail2ban usage
+            error_log('user '.$login.' authentication failure');
            Tools::logm('login failed');
            Tools::redirect();
        }
@@ -625,7 +728,18 @@ class Poche
                        $urlsInserted[] = $url; //add
                        if (isset($record['tags']) && trim($record['tags'])) {
-                            // @TODO: set tags
+                            $tags = explode(',', $record['tags']);                                                                                                              
+                                                        foreach($tags as $tag) {
+                                                                $entry_id = $id;
+                                                                $tag_id = $this->store->retrieveTagByValue($tag);
+                                                                if ($tag_id) {
+                                                                        $this->store->setTagToEntry($tag_id['id'], $entry_id);                                                                  
+                                                                } else {
+                                                                        $this->store->createTag($tag);
+                                                                        $tag_id = $this->store->retrieveTagByValue($tag);
+                                                                        $this->store->setTagToEntry($tag_id['id'], $entry_id);
+                                                                }
+                                                        }
                        }
                    }
@@ -640,7 +754,7 @@ class Poche
        Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
      }
      else {
-        $this->messages->add('s', _('Did you forget to select a file?'));
+        $this->messages->add('e', _('Did you forget to select a file?'));
      }
        // file parsing finished here
        // now download article contents if any
@@ -669,17 +783,23 @@ class Poche
                $purifier = $this->_getPurifier();
                foreach($items as $item) {
                    $url = new Url(base64_encode($item['url']));
-                    Tools::logm('Fetching article ' . $item['id']);
+                    if( $url->isCorrect() )
-                    $content = Tools::getPageContent($url);
+                    {
-                    $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
+                        Tools::logm('Fetching article ' . $item['id']);
-                    $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
+                        $content = Tools::getPageContent($url);
+                        $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
-                    // clean content to prevent xss attack
+                        $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
-                    $title = $purifier->purify($title);
+                        // clean content to prevent xss attack
-                    $body = $purifier->purify($body);
-                    $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
+                        $title = $purifier->purify($title);
-                    Tools::logm('Article ' . $item['id'] . ' updated.');
+                        $body = $purifier->purify($body);
+                        $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
+                        Tools::logm('Article ' . $item['id'] . ' updated.');
+                    } else
+                    {
+                        Tools::logm('Unvalid URL (' . $item['url'] .')  to fetch for article ' . $item['id']);
+                    }
                }
            }
        }
@@ -748,10 +868,11 @@ class Poche
     *
     * @param $token
     * @param $user_id
-     * @param $tag_id
+     * @param $tag_id if $type is 'tag', the id of the tag to generate feed for
-     * @param string $type
+     * @param string $type the type of feed to generate
+     * @param int $limit the maximum number of items (0 means all)
     */
-    public function generateFeeds($token, $user_id, $tag_id, $type = 'home')
+    public function generateFeeds($token, $user_id, $tag_id, $type = 'home', $limit = 0)
    {
        $allowed_types = array('home', 'fav', 'archive', 'tag');
        $config = $this->store->getConfigUser($user_id);
@@ -778,8 +899,13 @@ class Poche
            $entries = $this->store->getEntriesByView($type, $user_id);
        }
+        // if $limit is set to zero, use all entries
+        if (0 == $limit) {
+            $limit = count($entries);
+        }
        if (count($entries) > 0) {
-            foreach ($entries as $entry) {
+            for ($i = 0; $i < min(count($entries), $limit); $i++) {
+                $entry = $entries[$i];
                $newItem = $feed->createNewItem();
                $newItem->setTitle($entry['title']);
                $newItem->setSource(Tools::getPocheUrl() . '?view=view&amp;id=' . $entry['id']);
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index 6ae93d21..177b74d5 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -33,6 +33,7 @@ class Routing
        $this->view         = Tools::checkVar('view', 'home');
        $this->action       = Tools::checkVar('action');
        $this->id           = Tools::checkVar('id');
+        $this->autoclose    = Tools::checkVar('autoclose',FALSE);
        $_SESSION['sort']   = Tools::checkVar('sort', 'id');
        $this->url          = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
    }
@@ -64,9 +65,15 @@ class Routing
        $tplVars = array();
        if (\Session::isLogged()) {
-            $this->wallabag->action($this->action, $this->url, $this->id);
+            $this->wallabag->action($this->action, $this->url, $this->id, FALSE, $this->autoclose);
            $tplFile = Tools::getTplFile($this->view);
            $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
+        } elseif(ALLOW_REGISTER && isset($_GET['registerform'])) {
+            Tools::logm('register');
+            $tplFile = Tools::getTplFile('register');
+        } elseif (ALLOW_REGISTER && isset($_GET['register'])){
+            $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail']);
+            Tools::redirect();
        } elseif(isset($_SERVER['PHP_AUTH_USER'])) {
            if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) {
                $this->wallabag->login($this->referer);
@@ -102,8 +109,11 @@ class Routing
                $this->wallabag->login($this->referer);
        } elseif (isset($_GET['feed']) && isset($_GET['user_id'])) {
            $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0);
-            $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type']);
+            $limit = (isset($_GET['limit']) ? intval($_GET['limit']) : 0);
-        }
+            $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type'], $limit);
+        } //elseif (ALLOW_REGISTER && isset($_GET['register'])) {
+            //$this->wallabag->register
+        //}
        
        //allowed ONLY to logged in user
        if (\Session::isLogged() === true) 
@@ -115,12 +125,21 @@ class Routing
                // update password
                $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']);
            } elseif (isset($_GET['newuser'])) {
-                $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']);
+                $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail'], true);
            } elseif (isset($_GET['deluser'])) {
                $this->wallabag->deleteUser($_POST['password4deletinguser']);
            } elseif (isset($_GET['epub'])) {
                $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['value']);
-                $epub->run();
+                $epub->prepareData();
+                $epub->produceEpub();
+            } elseif (isset($_GET['mobi'])) {
+                $mobi = new WallabagMobi($this->wallabag, $_GET['method'], $_GET['value']);
+                $mobi->prepareData();
+                $mobi->produceMobi();
+            } elseif (isset($_GET['pdf'])) {
+                $pdf = new WallabagPDF($this->wallabag, $_GET['method'], $_GET['value']);
+                $pdf->prepareData();
+                $pdf->producePDF();
            } elseif (isset($_GET['import'])) {
                $import = $this->wallabag->import();
                $tplVars = array_merge($this->vars, $import);
@@ -148,4 +167,4 @@ class Routing
    {
        echo $this->wallabag->tpl->render($file, $vars);
    }
-} 
-\ No newline at end of file
+} 
diff --git a/inc/poche/Template.class.php b/inc/poche/Template.class.php
index b686f2ec..4d0bfdbb 100644
--- a/inc/poche/Template.class.php
+++ b/inc/poche/Template.class.php
@@ -24,7 +24,7 @@ class Template extends Twig_Environment
        $themeDirectory = (is_null($pocheUser) ? DEFAULT_THEME : $pocheUser->getConfigValue('theme'));
-        if ($themeDirectory === false) {
+        if ($themeDirectory === false || !is_dir(THEME . '/' . $themeDirectory)) {
            $themeDirectory = DEFAULT_THEME;
        }
@@ -181,7 +181,7 @@ class Template extends Twig_Environment
        while (($theme = readdir($handle)) !== false) {
            # Themes are stored in a directory, so all directory names are themes
            # @todo move theme installation data to database
-            if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..'))) {
+            if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..', '_global'))) {
                continue;
            }
@@ -232,4 +232,4 @@ class Template extends Twig_Environment
        Tools::emptyCache();
        Tools::redirect('?view=config');
    }
-}
-\ No newline at end of file
+}
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 7ccfc069..d0b31d4f 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -117,7 +117,7 @@ final class Tools
    {
        $views = array(
            'install', 'import', 'export', 'config', 'tags',
-            'edit-tags', 'view', 'login', 'error', 'about'
+            'edit-tags', 'view', 'login', 'error', 'about', 'register'
            );
        return (in_array($view, $views) ? $view . '.twig' : 'home.twig');
diff --git a/inc/poche/WallabagEBooks.class.php b/inc/poche/WallabagEBooks.class.php
new file mode 100644
index 00000000..55831571
--- /dev/null
+++ b/inc/poche/WallabagEBooks.class.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * wallabag, self hostable application allowing you to not miss any content anymore
+ *
+ * @category   wallabag
+ * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
+ * @copyright  2013
+ * @license    http://opensource.org/licenses/MIT see COPYING file
+ */
+class WallabagEBooks
+{
+        protected $wallabag;
+    protected $method;
+    protected $value;
+    protected $entries;
+    protected $bookTitle;
+    protected $bookFileName;
+    protected $author = 'wallabag';
+    public function __construct(Poche $wallabag, $method, $value)
+    {
+        $this->wallabag = $wallabag;
+        $this->method   = $method;
+        $this->value    = $value;
+    }
+    public function prepareData()
+    {
+        switch ($this->method) {
+            case 'id':
+                $entryID = filter_var($this->value, FILTER_SANITIZE_NUMBER_INT);
+                $entry = $this->wallabag->store->retrieveOneById($entryID, $this->wallabag->user->getId());
+                $this->entries = array($entry);
+                $this->bookTitle = $entry['title'];
+                $this->bookFileName = str_replace('/', '_', substr($this->bookTitle, 0, 200));
+                $this->author = preg_replace('#^w{3}.#', '', Tools::getdomain($entry["url"])); # if only one article, set author to domain name (we strip the eventual www part)
+                Tools::logm('Producing ebook from article ' . $this->bookTitle);
+                break;
+            case 'all':
+                $this->entries = $this->wallabag->store->retrieveAll($this->wallabag->user->getId());
+                $this->bookTitle = sprintf(_('All my articles on %s'), date(_('d.m.y'))); #translatable because each country has it's own date format system
+                $this->bookFileName = _('Allarticles') . date(_('dmY'));
+                Tools::logm('Producing ebook from all articles');
+                break;
+            case 'tag':
+                $tag = filter_var($this->value, FILTER_SANITIZE_STRING);
+                $tags_id = $this->wallabag->store->retrieveAllTags($this->wallabag->user->getId(), $tag);
+                $tag_id = $tags_id[0]["id"]; // we take the first result, which is supposed to match perfectly. There must be a workaround.
+                $this->entries = $this->wallabag->store->retrieveEntriesByTag($tag_id, $this->wallabag->user->getId());
+                $this->bookTitle = sprintf(_('Articles tagged %s'), $tag);
+                $this->bookFileName = substr(sprintf(_('Tag %s'), $tag), 0, 200);
+                Tools::logm('Producing ebook from tag ' . $tag);
+                break;
+            case 'category':
+                $category = filter_var($this->value, FILTER_SANITIZE_STRING);
+                $this->entries = $this->wallabag->store->getEntriesByView($category, $this->wallabag->user->getId());
+                $this->bookTitle = sprintf(_('Articles in category %s'), $category);
+                $this->bookFileName = substr(sprintf(_('Category %s'), $category), 0, 200);
+                Tools::logm('Producing ebook from category ' . $category);
+                break;
+            case 'search':
+                $search = filter_var($this->value, FILTER_SANITIZE_STRING);
+                Tools::logm($search);
+                $this->entries = $this->wallabag->store->search($search, $this->wallabag->user->getId());
+                $this->bookTitle = sprintf(_('Articles for search %s'), $search);
+                $this->bookFileName = substr(sprintf(_('Search %s'), $search), 0, 200);
+                Tools::logm('Producing ebook from search ' . $search);
+                break;
+            case 'default':
+                die(_('Uh, there is a problem while generating eBook.'));
+        }
+    }
+}
+class WallabagEpub extends WallabagEBooks
+{
+    /**
+     * handle ePub
+     */
+    public function produceEpub()
+    {
+        Tools::logm('Starting to produce ePub 3 file');
+        try {
+        $content_start =
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+            . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">\n"
+            . "<head>"
+            . "<meta http-equiv=\"Default-Style\" content=\"text/html; charset=utf-8\" />\n"
+            . "<title>" . _("wallabag articles book") . "</title>\n"
+            . "</head>\n"
+            . "<body>\n";
+        $bookEnd = "</body>\n</html>\n";
+        $log = new Logger("wallabag", TRUE);
+        $fileDir = CACHE;
+        $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE);
+        $log->logLine("new EPub()");
+        $log->logLine("EPub class version: " . EPub::VERSION);
+        $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION);
+        $log->logLine("Zip version: " . Zip::VERSION);
+        $log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL());
+        $log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL());
+        Tools::logm('Filling metadata for ePub...');
+        $book->setTitle($this->bookTitle);
+        $book->setIdentifier("http://$_SERVER[HTTP_HOST]", EPub::IDENTIFIER_URI); // Could also be the ISBN number, prefered for published books, or a UUID.
+        //$book->setLanguage("en"); // Not needed, but included for the example, Language is mandatory, but EPub defaults to "en". Use RFC3066 Language codes, such as "en", "da", "fr" etc.
+        $book->setDescription(_("Some articles saved on my wallabag"));
+        $book->setAuthor($this->author,$this->author);
+        $book->setPublisher("wallabag", "wallabag"); // I hope this is a non existant address :)
+        $book->setDate(time()); // Strictly not needed as the book date defaults to time().
+        //$book->setRights("Copyright and licence information specific for the book."); // As this is generated, this _could_ contain the name or licence information of the user who purchased the book, if needed. If this is used that way, the identifier must also be made unique for the book.
+        $book->setSourceURL("http://$_SERVER[HTTP_HOST]");
+        $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP");
+        $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "wallabag");
+        $cssData = "body {\n margin-left: .5em;\n margin-right: .5em;\n text-align: justify;\n}\n\np {\n font-family: serif;\n font-size: 10pt;\n text-align: justify;\n text-indent: 1em;\n margin-top: 0px;\n margin-bottom: 1ex;\n}\n\nh1, h2 {\n font-family: sans-serif;\n font-style: italic;\n text-align: center;\n background-color: #6b879c;\n color: white;\n width: 100%;\n}\n\nh1 {\n margin-bottom: 2px;\n}\n\nh2 {\n margin-top: -2px;\n margin-bottom: 2px;\n}\n";
+        $log->logLine("Add Cover");
+        $fullTitle = "<h1> " . $this->bookTitle . "</h1>\n";
+        $book->setCoverImage("Cover.png", file_get_contents("themes/_global/img/appicon/apple-touch-icon-152.png"), "image/png", $fullTitle);
+        $cover = $content_start . '<div style="text-align:center;"><p>' . _('Produced by wallabag with PHPePub') . '</p><p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p></div>' . $bookEnd;
+        //$book->addChapter("Table of Contents", "TOC.xhtml", NULL, false, EPub::EXTERNAL_REF_IGNORE);
+        $book->addChapter("Notices", "Cover2.html", $cover);
+        $book->buildTOC();
+        Tools::logm('Adding actual content...');
+        foreach ($this->entries as $entry) { //set tags as subjects
+            $tags = $this->wallabag->store->retrieveTagsByEntry($entry['id']);
+            foreach ($tags as $tag) {
+                $book->setSubject($tag['value']);
+            }
+            $log->logLine("Set up parameters");
+            $chapter = $content_start . $entry['content'] . $bookEnd;
+            $book->addChapter($entry['title'], htmlspecialchars($entry['title']) . ".html", $chapter, true, EPub::EXTERNAL_REF_ADD);
+            $log->logLine("Added chapter " . $entry['title']);
+        }
+        if (DEBUG_POCHE) {
+            $book->addChapter("Log", "Log.html", $content_start . $log->getLog() . "\n</pre>" . $bookEnd); // log generation
+            Tools::logm('Production log available in produced file');
+        }
+        $book->finalize();
+        $zipData = $book->sendBook($this->bookFileName);
+        Tools::logm('Ebook produced');
+        }
+        catch (Exception $e) {
+            Tools::logm('PHPePub has encountered an error : '.$e->getMessage());
+            $this->wallabag->messages->add('e', $e->getMessage());
+        }
+    }
+} 
+class WallabagMobi extends WallabagEBooks
+{
+        /**
+        * MOBI Class
+        * @author Sander Kromwijk
+        */
+        public function produceMobi()
+        {
+                try {
+        Tools::logm('Starting to produce Mobi file');
+        $mobi = new MOBI();
+        $content = new MOBIFile();
+        $messages = new Messages(); // for later
+        
+        Tools::logm('Filling metadata for Mobi...');
+        $content->set("title", $this->bookTitle);
+        $content->set("author", $this->author);
+        $content->set("subject", $this->bookTitle);
+        # introduction
+        $content->appendParagraph('<div style="text-align:center;" ><p>' . _('Produced by wallabag with PHPMobi') . '</p><p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p></div>');
+        $content->appendImage(imagecreatefrompng("themes/_global/img/appicon/apple-touch-icon-152.png"));
+        $content->appendPageBreak();
+        Tools::logm('Adding actual content...');
+        foreach ($this->entries as $item) {
+            $content->appendChapterTitle($item['title']);
+            $content->appendParagraph($item['content']);
+            $content->appendPageBreak();
+        }
+        $mobi->setContentProvider($content);
+        // the browser inside Kindle Devices doesn't likes special caracters either, we limit to A-z/0-9
+        $this->bookFileName = preg_replace('/[^A-Za-z0-9\-]/', '', $this->bookFileName);
+        // we offer file to download
+        $mobi->download($this->bookFileName.'.mobi');
+        Tools::logm('Mobi file produced');
+        }
+        catch (Exception $e) {
+            Tools::logm('PHPMobi has encountered an error : '.$e->getMessage());
+            $this->wallabag->messages->add('e', $e->getMessage());
+        }
+    }
+}
+class WallabagPDF extends WallabagEbooks
+{
+        public function producePDF()
+        {
+        Tools::logm('Starting to produce PDF file');
+        @define ('K_TCPDF_THROW_EXCEPTION_ERROR', TRUE);
+        try {
+        $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
+        Tools::logm('Filling metadata for PDF...');
+        $pdf->SetCreator(PDF_CREATOR);
+        $pdf->SetAuthor('wallabag');
+        $pdf->SetTitle($this->bookTitle);
+        $pdf->SetSubject('Articles via wallabag');
+        $pdf->SetKeywords('wallabag');
+                
+        Tools::logm('Adding introduction...');
+        $pdf->AddPage();
+        $intro = '<h1>' . $this->bookTitle . '</h1><div style="text-align:center;" >
+        <p>' . _('Produced by wallabag with tcpdf') . '</p>
+        <p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p>
+        <img src="themes/_global/img/appicon/apple-touch-icon-152.png" /></div>';
+        $pdf->writeHTMLCell(0, 0, '', '', $intro, 0, 1, 0, true, '', true);
+        $i = 1;
+        Tools::logm('Adding actual content...');
+        foreach ($this->entries as $item) {
+                $tags = $this->wallabag->store->retrieveTagsByEntry($entry['id']);
+                foreach ($tags as $tag) {
+                $pdf->SetKeywords($tag['value']);
+            }
+            $pdf->AddPage();
+            $html = '<h1>' . $item['title'] . '</h1>';
+            $html .= $item['content'];
+            $pdf->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, true, '', true);
+        }
+        // set image scale factor
+        $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
+        
+        
+        $pdf->Output($this->bookFileName . '.pdf', 'FD');
+        }
+        catch (Exception $e) {
+            Tools::logm('TCPDF has encountered an error : '.$e->getMessage());
+            $this->wallabag->messages->add('e', $e->getMessage());
+            }
+        }
+}
diff --git a/inc/poche/WallabagEpub.class.php b/inc/poche/WallabagEpub.class.php
deleted file mode 100644
index 9c4d3566..00000000
--- a/inc/poche/WallabagEpub.class.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
- * wallabag, self hostable application allowing you to not miss any content anymore
- *
- * @category   wallabag
- * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
- * @copyright  2013
- * @license    http://opensource.org/licenses/MIT see COPYING file
- */
-class WallabagEpub
-{
-    protected $wallabag;
-    protected $method;
-    protected $value;
-    public function __construct(Poche $wallabag, $method, $value)
-    {
-        $this->wallabag = $wallabag;
-        $this->method   = $method;
-        $this->value    = $value;
-    }
-    /**
-     * handle ePub
-     */
-    public function run()
-    {
-        switch ($this->method) {
-            case 'id':
-                $entryID = filter_var($this->value, FILTER_SANITIZE_NUMBER_INT);
-                $entry = $this->wallabag->store->retrieveOneById($entryID, $this->wallabag->user->getId());
-                $entries = array($entry);
-                $bookTitle = $entry['title'];
-                $bookFileName = substr($bookTitle, 0, 200);
-                break;
-            case 'all':
-                $entries = $this->wallabag->store->retrieveAll($this->wallabag->user->getId());
-                $bookTitle = sprintf(_('All my articles on '), date(_('d.m.y'))); #translatable because each country has it's own date format system
-                $bookFileName = _('Allarticles') . date(_('dmY'));
-                break;
-            case 'tag':
-                $tag = filter_var($this->value, FILTER_SANITIZE_STRING);
-                $tags_id = $this->wallabag->store->retrieveAllTags($this->wallabag->user->getId(), $tag);
-                $tag_id = $tags_id[0]["id"]; // we take the first result, which is supposed to match perfectly. There must be a workaround.
-                $entries = $this->wallabag->store->retrieveEntriesByTag($tag_id, $this->wallabag->user->getId());
-                $bookTitle = sprintf(_('Articles tagged %s'), $tag);
-                $bookFileName = substr(sprintf(_('Tag %s'), $tag), 0, 200);
-                break;
-            case 'category':
-                $category = filter_var($this->value, FILTER_SANITIZE_STRING);
-                $entries = $this->wallabag->store->getEntriesByView($category, $this->wallabag->user->getId());
-                $bookTitle = sprintf(_('All articles in category %s'), $category);
-                $bookFileName = substr(sprintf(_('Category %s'), $category), 0, 200);
-                break;
-            case 'search':
-                $search = filter_var($this->value, FILTER_SANITIZE_STRING);
-                $entries = $this->store->search($search, $this->wallabag->user->getId());
-                $bookTitle = sprintf(_('All articles for search %s'), $search);
-                $bookFileName = substr(sprintf(_('Search %s'), $search), 0, 200);
-                break;
-            case 'default':
-                die(_('Uh, there is a problem while generating epub.'));
-        }
-        $content_start =
-            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-            . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">\n"
-            . "<head>"
-            . "<meta http-equiv=\"Default-Style\" content=\"text/html; charset=utf-8\" />\n"
-            . "<title>wallabag articles book</title>\n"
-            . "</head>\n"
-            . "<body>\n";
-        $bookEnd = "</body>\n</html>\n";
-        $log = new Logger("wallabag", TRUE);
-        $fileDir = CACHE;
-        $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE);
-        $log->logLine("new EPub()");
-        $log->logLine("EPub class version: " . EPub::VERSION);
-        $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION);
-        $log->logLine("Zip version: " . Zip::VERSION);
-        $log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL());
-        $log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL());
-        $book->setTitle($bookTitle);
-        $book->setIdentifier("http://$_SERVER[HTTP_HOST]", EPub::IDENTIFIER_URI); // Could also be the ISBN number, prefered for published books, or a UUID.
-        //$book->setLanguage("en"); // Not needed, but included for the example, Language is mandatory, but EPub defaults to "en". Use RFC3066 Language codes, such as "en", "da", "fr" etc.
-        $book->setDescription(_("Some articles saved on my wallabag"));
-        $book->setAuthor("wallabag", "wallabag");
-        $book->setPublisher("wallabag", "wallabag"); // I hope this is a non existant address :)
-        $book->setDate(time()); // Strictly not needed as the book date defaults to time().
-        //$book->setRights("Copyright and licence information specific for the book."); // As this is generated, this _could_ contain the name or licence information of the user who purchased the book, if needed. If this is used that way, the identifier must also be made unique for the book.
-        $book->setSourceURL("http://$_SERVER[HTTP_HOST]");
-        $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP");
-        $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "wallabag");
-        $cssData = "body {\n margin-left: .5em;\n margin-right: .5em;\n text-align: justify;\n}\n\np {\n font-family: serif;\n font-size: 10pt;\n text-align: justify;\n text-indent: 1em;\n margin-top: 0px;\n margin-bottom: 1ex;\n}\n\nh1, h2 {\n font-family: sans-serif;\n font-style: italic;\n text-align: center;\n background-color: #6b879c;\n color: white;\n width: 100%;\n}\n\nh1 {\n margin-bottom: 2px;\n}\n\nh2 {\n margin-top: -2px;\n margin-bottom: 2px;\n}\n";
-        $log->logLine("Add Cover");
-        $fullTitle = "<h1> " . $bookTitle . "</h1>\n";
-        $book->setCoverImage("Cover.png", file_get_contents("themes/baggy/img/apple-touch-icon-152.png"), "image/png", $fullTitle);
-        $cover = $content_start . '<div style="text-align:center;"><p>' . _('Produced by wallabag with PHPePub') . '</p><p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p></div>' . $bookEnd;
-        //$book->addChapter("Table of Contents", "TOC.xhtml", NULL, false, EPub::EXTERNAL_REF_IGNORE);
-        $book->addChapter("Notices", "Cover2.html", $cover);
-        $book->buildTOC();
-        foreach ($entries as $entry) { //set tags as subjects
-            $tags = $this->wallabag->store->retrieveTagsByEntry($entry['id']);
-            foreach ($tags as $tag) {
-                $book->setSubject($tag['value']);
-            }
-            $log->logLine("Set up parameters");
-            $chapter = $content_start . $entry['content'] . $bookEnd;
-            $book->addChapter($entry['title'], htmlspecialchars($entry['title']) . ".html", $chapter, true, EPub::EXTERNAL_REF_ADD);
-            $log->logLine("Added chapter " . $entry['title']);
-        }
-        if (DEBUG_POCHE) {
-            $book->addChapter("Log", "Log.html", $content_start . $log->getLog() . "\n</pre>" . $bookEnd); // log generation
-        }
-        $book->finalize();
-        $zipData = $book->sendBook($bookFileName);
-    }
-} 
-\ No newline at end of file
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index f666f468..09d3aa9a 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -20,6 +20,7 @@
 @define ('STORAGE_DB', 'poche');
 @define ('STORAGE_USER', 'poche');
 @define ('STORAGE_PASSWORD', 'poche');
+@define ('MYSQL_USE_UTF8MB4', FALSE); // This should be false unless you know what it is
 #################################################################################
 # Do not trespass unless you know what you are doing
@@ -44,15 +45,30 @@
 @define ('SHARE_MAIL', TRUE);
 @define ('SHARE_SHAARLI', FALSE);
 @define ('SHAARLI_URL', 'http://myshaarliurl.com');
+@define ('SHARE_EVERNOTE', FALSE);
+@define ('SHARE_DIASPORA', FALSE);
+@define ('DIASPORA_URL', 'http://diasporapod.com'); # Don't add a / at the end
 @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 ('CARROT', FALSE);
+// ebook
+@define ('EPUB', TRUE);
+@define ('MOBI', FALSE);
+@define ('PDF', FALSE);
+// registration
+@define ('ALLOW_REGISTER', FALSE);
+@define ('SEND_CONFIRMATION_EMAIL', FALSE);
 // display or not print link in article view
 @define ('SHOW_PRINTLINK', '1');
 // display or not percent of read in article view. Affects only default theme.
 @define ('SHOW_READPERCENT', '1');
+@define ('RELOAD_ARTICLE', TRUE);
 @define ('ABS_PATH', 'assets/');
 @define ('DEFAULT_THEME', 'baggy');
@@ -67,4 +83,3 @@
 @define ('IMPORT_LIMIT', 5);
 //delay between downloads (in sec)
 @define ('IMPORT_DELAY', 5);
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index b8c487e3..728528f8 100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -22,7 +22,7 @@ require_once ROOT . '/vendor/autoload.php';
 require_once INCLUDES . '/poche/Template.class.php';
 require_once INCLUDES . '/poche/Language.class.php';
 require_once INCLUDES . '/poche/Routing.class.php';
-require_once INCLUDES . '/poche/WallabagEpub.class.php';
+require_once INCLUDES . '/poche/WallabagEBooks.class.php';
 require_once INCLUDES . '/poche/Poche.class.php';
 require_once INCLUDES . '/poche/Database.class.php';
@@ -41,6 +41,13 @@ require_once INCLUDES . '/3rdparty/libraries/PHPePub/Logger.php';
 require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php';
 require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php';
+# mobi library
+require_once INCLUDES . '/3rdparty/libraries/MOBIClass/MOBI.php';
+# pdf library
+#require_once INCLUDES . '/3rdparty/libraries/mpdf/mpdf.php';
+require_once  INCLUDES . '/3rdparty/libraries/tcpdf/tcpdf.php';
 # system configuration; database credentials et caetera
 require_once INCLUDES . '/poche/config.inc.php';
 require_once INCLUDES . '/poche/config.inc.default.php';