12 files changed, 1264 insertions, 950 deletions

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 11cccb72..b5dd2120 100755
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -5,23 +5,28 @@
  * @category   wallabag
  * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
- * @license    http://www.wtfpl.net/ see COPYING file
+ * @license    http://opensource.org/licenses/MIT see COPYING file
  */
 
 class Database {
+
     var $handle;
-    private $order = array(
-      'ia' => 'ORDER BY entries.id',
-      'id' => 'ORDER BY entries.id DESC',
-      'ta' => 'ORDER BY lower(entries.title)',
-      'td' => 'ORDER BY lower(entries.title) DESC',
-      'default' => 'ORDER BY entries.id'
+    private $order = array (
+        'ia' => 'ORDER BY entries.id',
+        'id' => 'ORDER BY entries.id DESC',
+        'ta' => 'ORDER BY lower(entries.title)',
+        'td' => 'ORDER BY lower(entries.title) DESC',
+        'default' => 'ORDER BY entries.id'
     );
 
     function __construct()
     {
         switch (STORAGE) {
             case 'sqlite':
+                // Check if /db is writeable
+                if ( !is_writable(STORAGE_SQLITE) || !is_writable(dirname(STORAGE_SQLITE))) {

+                        die('An error occured: "db" directory must be writeable for your web server user!');
+                }
                 $db_path = 'sqlite:' . STORAGE_SQLITE;
                 $this->handle = new PDO($db_path);
                 break;
@@ -38,28 +43,17 @@ class Database {
         }
 
         $this->handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        $this->_checkTags();
         Tools::logm('storage type ' . STORAGE);
     }
 
-    private function getHandle() {
+    private function getHandle()
+    {
         return $this->handle;
     }
 
-    public function isInstalled() {
-        $sql = "SELECT username FROM users";
-        $query = $this->executeQuery($sql, array());
-        if ($query == false) {
-            die(STORAGE . ' database looks empty. You have to create it (you can find database structure in install folder).');
-        }
-        $hasAdmin = count($query->fetchAll());
-
-        if ($hasAdmin == 0)
-            return false;
-
-        return true;
-    }
-
-    public function checkTags() {
+    private function _checkTags()
+    {
 
         if (STORAGE == 'sqlite') {
             $sql = '
@@ -123,9 +117,10 @@ class Database {
         $query = $this->executeQuery($sql, array());
     }
 
-    public function install($login, $password) {
+    public function install($login, $password, $email = '')
+    {
         $sql = 'INSERT INTO users ( username, password, name, email) VALUES (?, ?, ?, ?)';
-        $params = array($login, $password, $login, ' ');
+        $params = array($login, $password, $login, $email);
         $query = $this->executeQuery($sql, $params);
 
         $sequence = '';
@@ -150,7 +145,8 @@ class Database {
         return TRUE;
     }
 
-    public function getConfigUser($id) {
+    public function getConfigUser($id)
+    {
         $sql = "SELECT * FROM users_config WHERE user_id = ?";
         $query = $this->executeQuery($sql, array($id));
         $result = $query->fetchAll();
@@ -163,7 +159,8 @@ class Database {
         return $user_config;
     }
 
-    public function userExists($username) {
+    public function userExists($username)
+    {
         $sql = "SELECT * FROM users WHERE username=?";
         $query = $this->executeQuery($sql, array($username));
         $login = $query->fetchAll();
@@ -174,13 +171,14 @@ class Database {
         }
     }
 
-    public function login($username, $password, $isauthenticated=false) {
+    public function login($username, $password, $isauthenticated = FALSE)
+    {
         if ($isauthenticated) {
-          $sql = "SELECT * FROM users WHERE username=?";
-          $query = $this->executeQuery($sql, array($username));
+            $sql = "SELECT * FROM users WHERE username=?";
+            $query = $this->executeQuery($sql, array($username));
         } else {
-          $sql = "SELECT * FROM users WHERE username=? AND password=?";
-          $query = $this->executeQuery($sql, array($username, $password));
+            $sql = "SELECT * FROM users WHERE username=? AND password=?";
+            $query = $this->executeQuery($sql, array($username, $password));
         }
         $login = $query->fetchAll();
 
@@ -204,7 +202,8 @@ class Database {
         $query = $this->executeQuery($sql_update, $params_update);
     }
 
-    public function updateUserConfig($userId, $key, $value) {
+    public function updateUserConfig($userId, $key, $value)
+    {
         $config = $this->getConfigUser($userId);
 
         if (! isset($config[$key])) {
@@ -218,7 +217,8 @@ class Database {
         $query = $this->executeQuery($sql, $params);
     }
 
-    private function executeQuery($sql, $params) {
+    private function executeQuery($sql, $params)
+    {
         try
         {
             $query = $this->getHandle()->prepare($sql);
@@ -232,28 +232,32 @@ class Database {
         }
     }
     
-    public function listUsers($username=null) {
+    public function listUsers($username = NULL)
+    {
         $sql = 'SELECT count(*) FROM users'.( $username ? ' WHERE username=?' : '');
         $query = $this->executeQuery($sql, ( $username ? array($username) : array()));
         list($count) = $query->fetch();
         return $count;
     }
     
-    public function getUserPassword($userID) {
+    public function getUserPassword($userID)
+    {
         $sql = "SELECT * FROM users WHERE id=?";
         $query = $this->executeQuery($sql, array($userID));
         $password = $query->fetchAll();
         return isset($password[0]['password']) ? $password[0]['password'] : null;
     }
     
-    public function deleteUserConfig($userID) {
+    public function deleteUserConfig($userID)
+    {
         $sql_action = 'DELETE from users_config WHERE user_id=?';
         $params_action = array($userID);
         $query = $this->executeQuery($sql_action, $params_action);
         return $query;
     }
     
-    public function deleteTagsEntriesAndEntries($userID) {
+    public function deleteTagsEntriesAndEntries($userID)
+    {
         $entries = $this->retrieveAll($userID);
         foreach($entries as $entryid) {
             $tags = $this->retrieveTagsByEntry($entryid);
@@ -264,20 +268,23 @@ class Database {
         }
     }
     
-    public function deleteUser($userID) {
+    public function deleteUser($userID)
+    {
         $sql_action = 'DELETE from users WHERE id=?';
         $params_action = array($userID);
         $query = $this->executeQuery($sql_action, $params_action);
     }
 
-    public function updateContentAndTitle($id, $title, $body, $user_id) {
+    public function updateContentAndTitle($id, $title, $body, $user_id)
+    {
         $sql_action = 'UPDATE entries SET content = ?, title = ? WHERE id=? AND user_id=?';
         $params_action = array($body, $title, $id, $user_id);
         $query = $this->executeQuery($sql_action, $params_action);
         return $query;
     }
 
-    public function retrieveUnfetchedEntries($user_id, $limit) {
+    public function retrieveUnfetchedEntries($user_id, $limit)
+    {
 
         $sql_limit = "LIMIT 0,".$limit;
         if (STORAGE == 'postgres') {
@@ -291,7 +298,8 @@ class Database {
         return $entries;
     }
 
-    public function retrieveUnfetchedEntriesCount($user_id) {
+    public function retrieveUnfetchedEntriesCount($user_id)
+    {
       $sql        = "SELECT count(*) FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE 'Untitled - Import%' AND user_id=?";
       $query      = $this->executeQuery($sql, array($user_id));
       list($count) = $query->fetch();
@@ -299,7 +307,8 @@ class Database {
       return $count;
     }
 
-    public function retrieveAll($user_id) {
+    public function retrieveAll($user_id)
+    {
         $sql        = "SELECT * FROM entries WHERE user_id=? ORDER BY id";
         $query      = $this->executeQuery($sql, array($user_id));
         $entries    = $query->fetchAll();
@@ -307,7 +316,8 @@ class Database {
         return $entries;
     }
 
-    public function retrieveOneById($id, $user_id) {
+    public function retrieveOneById($id, $user_id)
+    {
         $entry  = NULL;
         $sql    = "SELECT * FROM entries WHERE id=? AND user_id=?";
         $params = array(intval($id), $user_id);
@@ -317,7 +327,8 @@ class Database {
         return isset($entry[0]) ? $entry[0] : null;
     }
 
-    public function retrieveOneByURL($url, $user_id) {
+    public function retrieveOneByURL($url, $user_id)
+    {
         $entry  = NULL;
         $sql    = "SELECT * FROM entries WHERE url=? AND user_id=?";
         $params = array($url, $user_id);
@@ -327,13 +338,15 @@ class Database {
         return isset($entry[0]) ? $entry[0] : null;
     }
 
-    public function reassignTags($old_entry_id, $new_entry_id) {
+    public function reassignTags($old_entry_id, $new_entry_id)
+    {
         $sql    = "UPDATE tags_entries SET entry_id=? WHERE entry_id=?";
         $params = array($new_entry_id, $old_entry_id);
         $query  = $this->executeQuery($sql, $params);
     }
 
-    public function getEntriesByView($view, $user_id, $limit = '', $tag_id = 0) {
+    public function getEntriesByView($view, $user_id, $limit = '', $tag_id = 0)
+    {
         switch ($view) {
             case 'archive':
                 $sql    = "SELECT * FROM entries WHERE user_id=? AND is_read=? ";
@@ -361,9 +374,10 @@ class Database {
                 $entries = $query->fetchAll();
 
                 return $entries;
-        }
+    }
 
-    public function getEntriesByViewCount($view, $user_id, $tag_id = 0) {
+    public function getEntriesByViewCount($view, $user_id, $tag_id = 0)
+    {
         switch ($view) {
             case 'archive':
                     $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";
@@ -391,7 +405,8 @@ class Database {
         return $count;
     }
 
-    public function updateContent($id, $content, $user_id) {
+    public function updateContent($id, $content, $user_id)
+    {
         $sql_action = 'UPDATE entries SET content = ? WHERE id=? AND user_id=?';
         $params_action = array($content, $id, $user_id);
         $query = $this->executeQuery($sql_action, $params_action);
@@ -406,7 +421,8 @@ class Database {
      * @param integer $user_id
      * @return integer $id of inserted record
      */
-    public function add($url, $title, $content, $user_id, $isFavorite=0, $isRead=0) {
+    public function add($url, $title, $content, $user_id, $isFavorite=0, $isRead=0)
+    {
         $sql_action = 'INSERT INTO entries ( url, title, content, user_id, is_fav, is_read ) VALUES (?, ?, ?, ?, ?, ?)';
         $params_action = array($url, $title, $content, $user_id, $isFavorite, $isRead);
 
@@ -419,36 +435,42 @@ class Database {
         return $id;
     }
 
-    public function deleteById($id, $user_id) {
+    public function deleteById($id, $user_id)
+    {
         $sql_action     = "DELETE FROM entries WHERE id=? AND user_id=?";
         $params_action  = array($id, $user_id);
         $query          = $this->executeQuery($sql_action, $params_action);
         return $query;
     }
 
-    public function favoriteById($id, $user_id) {
+    public function favoriteById($id, $user_id)
+    {
         $sql_action     = "UPDATE entries SET is_fav=NOT is_fav WHERE id=? AND user_id=?";
         $params_action  = array($id, $user_id);
         $query          = $this->executeQuery($sql_action, $params_action);
     }
 
-    public function archiveById($id, $user_id) {
+    public function archiveById($id, $user_id)
+    {
         $sql_action     = "UPDATE entries SET is_read=NOT is_read WHERE id=? AND user_id=?";
         $params_action  = array($id, $user_id);
         $query          = $this->executeQuery($sql_action, $params_action);
     }
 
-    public function archiveAll($user_id) {
+    public function archiveAll($user_id)
+    {
         $sql_action     = "UPDATE entries SET is_read=? WHERE user_id=? AND is_read=?";
         $params_action  = array($user_id, 1, 0);
         $query          = $this->executeQuery($sql_action, $params_action);
     }
 
-    public function getLastId($column = '') {
+    public function getLastId($column = '')
+    {
         return $this->getHandle()->lastInsertId($column);
     }
 
-    public function search($term, $user_id, $limit = '') {
+    public function search($term, $user_id, $limit = '')
+    {
         $search = '%'.$term.'%';
         $sql_action = "SELECT * FROM entries WHERE user_id=? AND (content LIKE ? OR title LIKE ? OR url LIKE ?) "; //searches in content, title and URL
         $sql_action .= $this->getEntriesOrder().' ' . $limit;
@@ -457,7 +479,8 @@ class Database {
         return $query->fetchAll();
         }
 
-    public function retrieveAllTags($user_id, $term = null) {
+    public function retrieveAllTags($user_id, $term = NULL)
+    {
         $sql = "SELECT DISTINCT tags.*, count(entries.id) AS entriescount FROM tags
           LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
           LEFT JOIN entries ON tags_entries.entry_id=entries.id
@@ -471,7 +494,8 @@ class Database {
         return $tags;
     }
 
-    public function retrieveTag($id, $user_id) {
+    public function retrieveTag($id, $user_id)
+    {
         $tag  = NULL;
         $sql    = "SELECT DISTINCT tags.* FROM tags
           LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
@@ -481,10 +505,11 @@ class Database {
         $query  = $this->executeQuery($sql, $params);
         $tag  = $query->fetchAll();
 
-        return isset($tag[0]) ? $tag[0] : null;
+        return isset($tag[0]) ? $tag[0] : NULL;
     }
 
-    public function retrieveEntriesByTag($tag_id, $user_id) {
+    public function retrieveEntriesByTag($tag_id, $user_id)
+    {
         $sql =
             "SELECT entries.* FROM entries
             LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
@@ -495,7 +520,8 @@ class Database {
         return $entries;
     }
 
-    public function retrieveTagsByEntry($entry_id) {
+    public function retrieveTagsByEntry($entry_id)
+    {
         $sql =
             "SELECT tags.* FROM tags
             LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
@@ -506,14 +532,16 @@ class Database {
         return $tags;
     }
 
-    public function removeTagForEntry($entry_id, $tag_id) {
+    public function removeTagForEntry($entry_id, $tag_id)
+    {
         $sql_action     = "DELETE FROM tags_entries WHERE tag_id=? AND entry_id=?";
         $params_action  = array($tag_id, $entry_id);
         $query          = $this->executeQuery($sql_action, $params_action);
         return $query;
     }
     
-    public function cleanUnusedTag($tag_id) {
+    public function cleanUnusedTag($tag_id)
+    {
         $sql_action = "SELECT tags.* FROM tags JOIN tags_entries ON tags_entries.tag_id=tags.id WHERE tags.id=?";
         $query = $this->executeQuery($sql_action,array($tag_id));
         $tagstokeep = $query->fetchAll();
@@ -532,7 +560,8 @@ class Database {
         
     }
 
-    public function retrieveTagByValue($value) {
+    public function retrieveTagByValue($value)
+    {
         $tag  = NULL;
         $sql    = "SELECT * FROM tags WHERE value=?";
         $params = array($value);
@@ -542,27 +571,29 @@ class Database {
         return isset($tag[0]) ? $tag[0] : null;
     }
 
-    public function createTag($value) {
+    public function createTag($value)
+    {
         $sql_action = 'INSERT INTO tags ( value ) VALUES (?)';
         $params_action = array($value);
         $query = $this->executeQuery($sql_action, $params_action);
         return $query;
     }
 
-    public function setTagToEntry($tag_id, $entry_id) {
+    public function setTagToEntry($tag_id, $entry_id)
+    {
         $sql_action = 'INSERT INTO tags_entries ( tag_id, entry_id ) VALUES (?, ?)';
         $params_action = array($tag_id, $entry_id);
         $query = $this->executeQuery($sql_action, $params_action);
         return $query;
     }
 
-        private function getEntriesOrder() {
-            if (isset($_SESSION['sort']) and array_key_exists($_SESSION['sort'], $this->order)) {
-                return $this->order[$_SESSION['sort']];
-            }
-            else {
-                return $this->order['default'];
-            }
+    private function getEntriesOrder()
+    {
+        if (isset($_SESSION['sort']) and array_key_exists($_SESSION['sort'], $this->order)) {
+            return $this->order[$_SESSION['sort']];
         }
-
+        else {
+            return $this->order['default'];
+        }
+    }
 }
diff --git a/inc/poche/Language.class.php b/inc/poche/Language.class.php
new file mode 100644
index 00000000..8d3912f5
--- /dev/null
+++ b/inc/poche/Language.class.php
@@ -0,0 +1,113 @@
+<?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 Language
+{
+    protected $wallabag;
+
+    private $currentLanguage;
+
+    private $languageNames = array(
+        'cs_CZ.utf8' => 'čeština',
+        'de_DE.utf8' => 'German',
+        'en_EN.utf8' => 'English',
+        'es_ES.utf8' => 'Español',
+        'fa_IR.utf8' => 'فارسی',
+        'fr_FR.utf8' => 'Français',
+        'it_IT.utf8' => 'Italiano',
+        'pl_PL.utf8' => 'Polski',
+        'pt_BR.utf8' => 'Português (Brasil)',
+        'ru_RU.utf8' => 'Pусский',
+        'sl_SI.utf8' => 'Slovenščina',
+        'uk_UA.utf8' => 'Українська',
+    );
+
+    public function __construct(Poche $wallabag)
+    {
+        $this->wallabag = $wallabag;
+        $pocheUser = Session::getParam('poche_user');
+        $language  = (is_null($pocheUser) ? LANG : $pocheUser->getConfigValue('language'));
+
+        @putenv('LC_ALL=' . $language);
+        setlocale(LC_ALL, $language);
+        bindtextdomain($language, LOCALE);
+        textdomain($language);
+
+        $this->currentLanguage = $language;
+    }
+
+    public function getLanguage() {
+        return $this->currentLanguage;
+    }
+
+    public function getInstalledLanguages() {
+        $handle = opendir(LOCALE);
+        $languages = array();
+
+        while (($language = readdir($handle)) !== false) {
+            # Languages are stored in a directory, so all directory names are languages
+            # @todo move language installation data to database
+            if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.', 'tools'))) {
+                continue;
+            }
+
+            $current = false;
+
+            if ($language === $this->getLanguage()) {
+                $current = true;
+            }
+
+            $languages[] = array('name' => (isset($this->languageNames[$language]) ? $this->languageNames[$language] : $language), 'value' => $language, 'current' => $current);
+        }
+
+        return $languages;
+    }
+
+
+    /**
+     * Update language for current user
+     *
+     * @param $newLanguage
+     */
+    public function updateLanguage($newLanguage)
+    {
+        # we are not going to change it to the current language
+        if ($newLanguage == $this->getLanguage()) {
+            $this->wallabag->messages->add('w', _('still using the "' . $this->getLanguage() . '" language!'));
+            Tools::redirect('?view=config');
+        }
+
+        $languages = $this->getInstalledLanguages();
+        $actualLanguage = false;
+
+        foreach ($languages as $language) {
+            if ($language['value'] == $newLanguage) {
+                $actualLanguage = true;
+                break;
+            }
+        }
+
+        if (!$actualLanguage) {
+            $this->wallabag->messages->add('e', _('that language does not seem to be installed'));
+            Tools::redirect('?view=config');
+        }
+
+        $this->wallabag->store->updateUserConfig($this->wallabag->user->getId(), 'language', $newLanguage);
+        $this->wallabag->messages->add('s', _('you have changed your language preferences'));
+
+        $currentConfig = $_SESSION['poche_user']->config;
+        $currentConfig['language'] = $newLanguage;
+
+        $_SESSION['poche_user']->setConfig($currentConfig);
+
+        Tools::emptyCache();
+        Tools::redirect('?view=config');
+    }
+} 
\ No newline at end of file
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 09a9f5ff..8cebafa3 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -5,402 +5,127 @@
  * @category   wallabag
  * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
- * @license    http://www.wtfpl.net/ see COPYING file
+ * @license    http://opensource.org/licenses/MIT see COPYING file
  */
 
 class Poche
 {
-    public static $canRenderTemplates = true;
-    public static $configFileAvailable = true;
-
+    /**
+     * @var User
+     */
     public $user;
+    /**
+     * @var Database
+     */
     public $store;
+    /**
+     * @var Template
+     */
     public $tpl;
+    /**
+     * @var Language
+     */
+    public $language;
+    /**
+     * @var Routing
+     */
+    public $routing;
+    /**
+     * @var Messages
+     */
     public $messages;
+    /**
+     * @var Paginator
+     */
     public $pagination;
 
-    private $currentTheme = '';
-    private $currentLanguage = '';
-    private $notInstalledMessage = array();
-
-    private $language_names = array(
-      'cs_CZ.utf8' => 'čeština',
-      'de_DE.utf8' => 'German',
-      'en_EN.utf8' => 'English',
-      'es_ES.utf8' => 'Español',
-      'fa_IR.utf8' => 'فارسی',
-      'fr_FR.utf8' => 'Français',
-      'it_IT.utf8' => 'Italiano',
-      'pl_PL.utf8' => 'Polski',
-      'pt_BR.utf8' => 'Português (Brasil)',
-      'ru_RU.utf8' => 'Pусский',
-      'sl_SI.utf8' => 'Slovenščina',
-      'uk_UA.utf8' => 'Українська',
-    );
     public function __construct()
     {
-        if ($this->configFileIsAvailable()) {
-            $this->init();
-        }
-
-        if ($this->themeIsInstalled()) {
-            $this->initTpl();
-        }
-
-        if ($this->systemIsInstalled()) {
-            $this->store = new Database();
-            $this->messages = new Messages();
-            # installation
-            if (! $this->store->isInstalled()) {
-                $this->install();
-            }
-            $this->store->checkTags();
-        }
+        $this->init();
     }
 
     private function init()
     {
         Tools::initPhp();
 
-        if (isset($_SESSION['poche_user']) && $_SESSION['poche_user'] != array()) {
-            $this->user = $_SESSION['poche_user'];
+        $pocheUser = Session::getParam('poche_user');
+
+        if ($pocheUser && $pocheUser != array()) {
+            $this->user = $pocheUser;
         } else {
-            # fake user, just for install & login screens
+            // fake user, just for install & login screens
             $this->user = new User();
             $this->user->setConfig($this->getDefaultConfig());
         }
 
-        # l10n
-        $language = $this->user->getConfigValue('language');
-        @putenv('LC_ALL=' . $language);
-        setlocale(LC_ALL, $language);
-        bindtextdomain($language, LOCALE);
-        textdomain($language);
-
-        # Pagination
-        $this->pagination = new Paginator($this->user->getConfigValue('pager'), 'p');
-
-        # Set up theme
-        $themeDirectory = $this->user->getConfigValue('theme');
-
-        if ($themeDirectory === false) {
-            $themeDirectory = DEFAULT_THEME;
-        }
-
-        $this->currentTheme = $themeDirectory;
-
-        # Set up language
-        $languageDirectory = $this->user->getConfigValue('language');
-
-        if ($languageDirectory === false) {
-            $languageDirectory = DEFAULT_THEME;
-        }
-
-        $this->currentLanguage = $languageDirectory;
+        $this->pagination   = new Paginator($this->user->getConfigValue('pager'), 'p');
+        $this->language     = new Language($this);
+        $this->tpl          = new Template($this);
+        $this->store        = new Database();
+        $this->messages     = new Messages();
+        $this->routing      = new Routing($this);
     }
 
-    public function configFileIsAvailable() {
-        if (! self::$configFileAvailable) {
-            $this->notInstalledMessage[] = 'You have to copy (don\'t just rename!) inc/poche/config.inc.default.php to inc/poche/config.inc.php.';
-
-            return false;
-        }
-
-        return true;
-    }
-
-    public function themeIsInstalled() {
-        $passTheme = TRUE;
-        # Twig is an absolute requirement for Poche to function. Abort immediately if the Composer installer hasn't been run yet
-        if (! self::$canRenderTemplates) {
-            $this->notInstalledMessage[] = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. You can also download <a href="http://wllbg.org/vendor">vendor.zip</a> and extract it in your wallabag folder.';
-            $passTheme = FALSE;
-        }
-
-        if (! is_writable(CACHE)) {
-            $this->notInstalledMessage[] = 'You don\'t have write access on cache directory.';
-
-            self::$canRenderTemplates = false;
-
-            $passTheme = FALSE;
-        }
-
-        # Check if the selected theme and its requirements are present
-        $theme = $this->getTheme();
-
-        if ($theme != '' && ! is_dir(THEME . '/' . $theme)) {
-            $this->notInstalledMessage[] = 'The currently selected theme (' . $theme . ') does not seem to be properly installed (Missing directory: ' . THEME . '/' . $theme . ')';
-
-            self::$canRenderTemplates = false;
-
-            $passTheme = FALSE;
-        }
-
-        $themeInfo = $this->getThemeInfo($theme);
-        if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
-            foreach ($themeInfo['requirements'] as $requiredTheme) {
-                if (! is_dir(THEME . '/' . $requiredTheme)) {
-                    $this->notInstalledMessage[] = 'The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')';
-
-                    self::$canRenderTemplates = false;
-
-                    $passTheme = FALSE;
-                }
-            }
-        }
-
-        if (!$passTheme) {
-            return FALSE;
-        }
-
-
-        return true;
+    public function run()
+    {
+        $this->routing->run();
     }
 
     /**
-     * all checks before installation.
-     * @todo move HTML to template
-     * @return boolean
+     * Creates a new user
      */
-    public function systemIsInstalled()
-    {
-        $msg = TRUE;
-
-        $configSalt = defined('SALT') ? constant('SALT') : '';
-
-        if (empty($configSalt)) {
-            $this->notInstalledMessage[] = 'You have not yet filled in the SALT value in the config.inc.php file.';
-            $msg = FALSE;
-        }
-        if (STORAGE == 'sqlite' && ! file_exists(STORAGE_SQLITE)) {
-            Tools::logm('sqlite file doesn\'t exist');
-            $this->notInstalledMessage[] = 'sqlite file doesn\'t exist, you can find it in install folder. Copy it in /db folder.';
-            $msg = FALSE;
-        }
-        if (is_dir(ROOT . '/install') && ! DEBUG_POCHE) {
-            $this->notInstalledMessage[] = 'you have to delete the /install folder before using poche.';
-            $msg = FALSE;
-        }
-        if (STORAGE == 'sqlite' && ! is_writable(STORAGE_SQLITE)) {
-            Tools::logm('you don\'t have write access on sqlite file');
-            $this->notInstalledMessage[] = 'You don\'t have write access on sqlite file.';
-            $msg = FALSE;
-        }
-
-        if (! $msg) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function getNotInstalledMessage() {
-        return $this->notInstalledMessage;
-    }
-
-    private function initTpl()
+    public function createNewUser($username, $password, $email = "")
     {
-        $loaderChain = new Twig_Loader_Chain();
-        $theme = $this->getTheme();
-
-        # add the current theme as first to the loader chain so Twig will look there first for overridden template files
-        try {
-            $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $theme));
-        } catch (Twig_Error_Loader $e) {
-            # @todo isInstalled() should catch this, inject Twig later
-            die('The currently selected theme (' . $theme . ') does not seem to be properly installed (' . THEME . '/' . $theme .' is missing)');
-        }
-
-        # add all required themes to the loader chain
-        $themeInfo = $this->getThemeInfo($theme);
-        if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
-            foreach ($themeInfo['requirements'] as $requiredTheme) {
-                try {
-                    $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $requiredTheme));
-                } catch (Twig_Error_Loader $e) {
-                    # @todo isInstalled() should catch this, inject Twig later
-                    die('The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')');
-                }
-            }
-        }
-
-        if (DEBUG_POCHE) {
-            $twigParams = array();
-        } else {
-            $twigParams = array('cache' => CACHE);
-        }
-
-        $this->tpl = new Twig_Environment($loaderChain, $twigParams);
-        $this->tpl->addExtension(new Twig_Extensions_Extension_I18n());
-
-        # filter to display domain name of an url
-        $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
-        $this->tpl->addFilter($filter);
-
-        # filter for reading time
-        $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
-        $this->tpl->addFilter($filter);
-    }
-
-    public function createNewUser() {
-        if (isset($_GET['newuser'])){
-            if ($_POST['newusername'] != "" && $_POST['password4newuser'] != ""){
-                $newusername = filter_var($_POST['newusername'], FILTER_SANITIZE_STRING);
-                if (!$this->store->userExists($newusername)){
-                    if ($this->store->install($newusername, Tools::encodeString($_POST['password4newuser'] . $newusername))) {
-                        Tools::logm('The new user '.$newusername.' has been installed');
-                        $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'),$newusername));
-                        Tools::redirect();
-                    }
-                    else {
-                        Tools::logm('error during adding new user');
-                        Tools::redirect();
-                    }
-                }
-                else {
-                    $this->messages->add('e', sprintf(_('Error : An user with the name %s already exists !'),$newusername));
-                    Tools::logm('An user with the name '.$newusername.' already exists !');
+        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');
+                    $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to <a href="?logout">logout ?</a>'), $newUsername));
                     Tools::redirect();
                 }
-            }
-        }
-    }
-
-    public function deleteUser(){
-        if (isset($_GET['deluser'])){
-            if ($this->store->listUsers() > 1) {
-                if (Tools::encodeString($_POST['password4deletinguser'].$this->user->getUsername()) == $this->store->getUserPassword($this->user->getId())) {
-                    $username = $this->user->getUsername();
-                    $this->store->deleteUserConfig($this->user->getId());
-                    Tools::logm('The configuration for user '. $username .' has been deleted !');
-                    $this->store->deleteTagsEntriesAndEntries($this->user->getId());
-                    Tools::logm('The entries for user '. $username .' has been deleted !');
-                    $this->store->deleteUser($this->user->getId());
-                    Tools::logm('User '. $username .' has been completely deleted !');
-                    Session::logout();
-                    Tools::logm('logout');
-                    Tools::redirect();
-                    $this->messages->add('s', sprintf(_('User %s has been successfully deleted !'),$newusername));
-                }
                 else {
-                    Tools::logm('Bad password !');
-                    $this->messages->add('e', _('Error : The password is wrong !'));
-                }
-            }
-            else {
-                Tools::logm('Only user !');
-                $this->messages->add('e', _('Error : You are the only user, you cannot delete your account !'));
-            }
-        }
-    }
-
-    private function install()
-    {
-        Tools::logm('poche still not installed');
-        echo $this->tpl->render('install.twig', array(
-            'token' => Session::getToken(),
-            'theme' => $this->getTheme(),
-            'poche_url' => Tools::getPocheUrl()
-        ));
-        if (isset($_GET['install'])) {
-            if (($_POST['password'] == $_POST['password_repeat'])
-                && $_POST['password'] != "" && $_POST['login'] != "") {
-                # let's rock, install poche baby !
-                if ($this->store->install($_POST['login'], Tools::encodeString($_POST['password'] . $_POST['login'])))
-                {
-                    Session::logout();
-                    Tools::logm('poche is now installed');
+                    Tools::logm('error during adding new user');
                     Tools::redirect();
                 }
             }
             else {
-                Tools::logm('error during installation');
+                $this->messages->add('e', sprintf(_('Error : An user with the name %s already exists !'), $newUsername));
+                Tools::logm('An user with the name ' . $newUsername . ' already exists !');
                 Tools::redirect();
             }
         }
-        exit();
-    }
-
-    public function getTheme() {
-        return $this->currentTheme;
     }
 
     /**
-     * Provides theme information by parsing theme.ini file if present in the theme's root directory.
-     * In all cases, the following data will be returned:
-     * - name: theme's name, or key if the theme is unnamed,
-     * - current: boolean informing if the theme is the current user theme.
-     *
-     * @param string $theme Theme key (directory name)
-     * @return array|boolean Theme information, or false if the theme doesn't exist.
+     * Delete an existing user
      */
-    public function getThemeInfo($theme) {
-        if (!is_dir(THEME . '/' . $theme)) {
-            return false;
-        }
-
-        $themeIniFile = THEME . '/' . $theme . '/theme.ini';
-        $themeInfo = array();
-
-        if (is_file($themeIniFile) && is_readable($themeIniFile)) {
-            $themeInfo = parse_ini_file($themeIniFile);
-        }
-
-        if ($themeInfo === false) {
-            $themeInfo = array();
-        }
-        if (!isset($themeInfo['name'])) {
-            $themeInfo['name'] = $theme;
-        }
-        $themeInfo['current'] = ($theme === $this->getTheme());
-
-        return $themeInfo;
-    }
-
-    public function getInstalledThemes() {
-        $handle = opendir(THEME);
-        $themes = array();
-
-        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('.', '..'))) {
-                continue;
-            }
-
-            $themes[$theme] = $this->getThemeInfo($theme);
-        }
-
-        ksort($themes);
-
-        return $themes;
-    }
-
-    public function getLanguage() {
-        return $this->currentLanguage;
-    }
-
-    public function getInstalledLanguages() {
-        $handle = opendir(LOCALE);
-        $languages = array();
-
-        while (($language = readdir($handle)) !== false) {
-            # Languages are stored in a directory, so all directory names are languages
-            # @todo move language installation data to database
-            if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.', 'tools'))) {
-                continue;
+    public function deleteUser($password)
+    {
+        if ($this->store->listUsers() > 1) {
+            if (Tools::encodeString($password . $this->user->getUsername()) == $this->store->getUserPassword($this->user->getId())) {
+                $username = $this->user->getUsername();
+                $this->store->deleteUserConfig($this->user->getId());
+                Tools::logm('The configuration for user '. $username .' has been deleted !');
+                $this->store->deleteTagsEntriesAndEntries($this->user->getId());
+                Tools::logm('The entries for user '. $username .' has been deleted !');
+                $this->store->deleteUser($this->user->getId());
+                Tools::logm('User '. $username .' has been completely deleted !');
+                Session::logout();
+                Tools::logm('logout');
+                Tools::redirect();
+                $this->messages->add('s', sprintf(_('User %s has been successfully deleted !'), $username));
             }
-
-            $current = false;
-
-            if ($language === $this->getLanguage()) {
-                $current = true;
+            else {
+                Tools::logm('Bad password !');
+                $this->messages->add('e', _('Error : The password is wrong !'));
             }
-
-            $languages[] = array('name' => (isset($this->language_names[$language]) ? $this->language_names[$language] : $language), 'value' => $language, 'current' => $current);
         }
-
-        return $languages;
+        else {
+            Tools::logm('Only user !');
+            $this->messages->add('e', _('Error : You are the only user, you cannot delete your account !'));
+        }
     }
 
     public function getDefaultConfig()
@@ -425,7 +150,7 @@ class Poche
                 $body = $content['rss']['channel']['item']['description'];
 
                 // clean content from prevent xss attack
-                $purifier = $this->getPurifier();
+                $purifier = $this->_getPurifier();
                 $title = $purifier->purify($title);
                 $body = $purifier->purify($body);
 
@@ -437,7 +162,7 @@ class Poche
                 if ( $last_id ) {
                     Tools::logm('add link ' . $url->getUrl());
                     if (DOWNLOAD_PICTURES) {
-                        $content = filtre_picture($body, $url->getUrl(), $last_id);
+                        $content = Picture::filterPicture($body, $url->getUrl(), $last_id);
                         Tools::logm('updating content article');
                         $this->store->updateContent($last_id, $content, $this->user->getId());
                     }
@@ -472,7 +197,7 @@ class Poche
                 $msg = 'delete link #' . $id;
                 if ($this->store->deleteById($id, $this->user->getId())) {
                     if (DOWNLOAD_PICTURES) {
-                        remove_directory(ABS_PATH . $id);
+                        Picture::removeDirectory(ABS_PATH . $id);
                     }
                     $this->messages->add('s', _('the link has been deleted successfully'));
                 }
@@ -590,16 +315,16 @@ class Poche
         switch ($view)
         {
             case 'config':
-                $dev_infos = $this->getPocheVersion('dev');
+                $dev_infos = $this->_getPocheVersion('dev');
                 $dev = trim($dev_infos[0]);
                 $check_time_dev = date('d-M-Y H:i', $dev_infos[1]);
-                $prod_infos = $this->getPocheVersion('prod');
+                $prod_infos = $this->_getPocheVersion('prod');
                 $prod = trim($prod_infos[0]);
                 $check_time_prod = date('d-M-Y H:i', $prod_infos[1]);
                 $compare_dev = version_compare(POCHE, $dev);
                 $compare_prod = version_compare(POCHE, $prod);
-                $themes = $this->getInstalledThemes();
-                $languages = $this->getInstalledLanguages();
+                $themes = $this->tpl->getInstalledThemes();
+                $languages = $this->language->getInstalledLanguages();
                 $token = $this->user->getConfigValue('token');
                 $http_auth = (isset($_SERVER['PHP_AUTH_USER']) || isset($_SERVER['REMOTE_USER'])) ? true : false;
                 $only_user = ($this->store->listUsers() > 1) ? false : true;
@@ -703,7 +428,7 @@ class Poche
                     'listmode' => (isset($_COOKIE['listmode']) ? true : false),
                 );
 
-                //if id is given - we retrive entries by tag: id is tag id
+                //if id is given - we retrieve entries by tag: id is tag id
                 if ($id) {
                   $tpl_vars['tag'] = $this->store->retrieveTag($id, $this->user->getId());
                   $tpl_vars['id'] = intval($id);
@@ -733,7 +458,7 @@ class Poche
      * @todo set the new password in function header like this updatePassword($newPassword)
      * @return boolean
      */
-    public function updatePassword()
+    public function updatePassword($password, $confirmPassword)
     {
         if (MODE_DEMO) {
             $this->messages->add('i', _('in demo mode, you can\'t update your password'));
@@ -741,10 +466,10 @@ class Poche
             Tools::redirect('?view=config');
         }
         else {
-            if (isset($_POST['password']) && isset($_POST['password_repeat'])) {
-                if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") {
+            if (isset($password) && isset($confirmPassword)) {
+                if ($password == $confirmPassword && !empty($password)) {
                     $this->messages->add('s', _('your password has been updated'));
-                    $this->store->updatePassword($this->user->getId(), Tools::encodeString($_POST['password'] . $this->user->getUsername()));
+                    $this->store->updatePassword($this->user->getId(), Tools::encodeString($password . $this->user->getUsername()));
                     Session::logout();
                     Tools::logm('password updated');
                     Tools::redirect();
@@ -757,102 +482,25 @@ class Poche
         }
     }
 
-    public function updateTheme()
-    {
-        # no data
-        if (empty($_POST['theme'])) {
-        }
-
-        # we are not going to change it to the current theme...
-        if ($_POST['theme'] == $this->getTheme()) {
-            $this->messages->add('w', _('still using the "' . $this->getTheme() . '" theme!'));
-            Tools::redirect('?view=config');
-        }
-
-        $themes = $this->getInstalledThemes();
-        $actualTheme = false;
-
-        foreach (array_keys($themes) as $theme) {
-            if ($theme == $_POST['theme']) {
-                $actualTheme = true;
-                break;
-            }
-        }
-
-        if (! $actualTheme) {
-            $this->messages->add('e', _('that theme does not seem to be installed'));
-            Tools::redirect('?view=config');
-        }
-
-        $this->store->updateUserConfig($this->user->getId(), 'theme', $_POST['theme']);
-        $this->messages->add('s', _('you have changed your theme preferences'));
-
-        $currentConfig = $_SESSION['poche_user']->config;
-        $currentConfig['theme'] = $_POST['theme'];
-
-        $_SESSION['poche_user']->setConfig($currentConfig);
-
-        $this->emptyCache();
-
-        Tools::redirect('?view=config');
-    }
-
-    public function updateLanguage()
-    {
-        # no data
-        if (empty($_POST['language'])) {
-        }
-
-        # we are not going to change it to the current language...
-        if ($_POST['language'] == $this->getLanguage()) {
-            $this->messages->add('w', _('still using the "' . $this->getLanguage() . '" language!'));
-            Tools::redirect('?view=config');
-        }
-
-        $languages = $this->getInstalledLanguages();
-        $actualLanguage = false;
-
-        foreach ($languages as $language) {
-            if ($language['value'] == $_POST['language']) {
-                $actualLanguage = true;
-                break;
-            }
-        }
-
-        if (! $actualLanguage) {
-            $this->messages->add('e', _('that language does not seem to be installed'));
-            Tools::redirect('?view=config');
-        }
-
-        $this->store->updateUserConfig($this->user->getId(), 'language', $_POST['language']);
-        $this->messages->add('s', _('you have changed your language preferences'));
-
-        $currentConfig = $_SESSION['poche_user']->config;
-        $currentConfig['language'] = $_POST['language'];
-
-        $_SESSION['poche_user']->setConfig($currentConfig);
-
-        $this->emptyCache();
-
-        Tools::redirect('?view=config');
-    }
     /**
-     * get credentials from differents sources
-     * it redirects the user to the $referer link
+     * Get credentials from differents sources
+     * It redirects the user to the $referer link
+     *
      * @return array
      */
-    private function credentials() {
-        if(isset($_SERVER['PHP_AUTH_USER'])) {
-            return array($_SERVER['PHP_AUTH_USER'],'php_auth',true);
+    private function credentials()
+    {
+        if (isset($_SERVER['PHP_AUTH_USER'])) {
+            return array($_SERVER['PHP_AUTH_USER'], 'php_auth', true);
         }
-        if(!empty($_POST['login']) && !empty($_POST['password'])) {
-            return array($_POST['login'],$_POST['password'],false);
+        if (!empty($_POST['login']) && !empty($_POST['password'])) {
+            return array($_POST['login'], $_POST['password'], false);
         }
-        if(isset($_SERVER['REMOTE_USER'])) {
-            return array($_SERVER['REMOTE_USER'],'http_auth',true);
+        if (isset($_SERVER['REMOTE_USER'])) {
+            return array($_SERVER['REMOTE_USER'], 'http_auth', true);
         }
 
-        return array(false,false,false);
+        return array(false, false, false);
     }
 
     /**
@@ -877,6 +525,14 @@ class Poche
                 $longlastingsession = isset($_POST['longlastingsession']);
                 $passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login);
                 Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user)));
+
+                # reload l10n
+                $language = $user['config']['language'];
+                @putenv('LC_ALL=' . $language);
+                setlocale(LC_ALL, $language);
+                bindtextdomain($language, LOCALE);
+                textdomain($language);
+
                 $this->messages->add('s', _('welcome to your wallabag'));
                 Tools::logm('login successful');
                 Tools::redirect($referer);
@@ -901,12 +557,13 @@ class Poche
     }
 
     /**
-     * import datas into your poche
+     * import datas into your wallabag
      * @return boolean
      */
+
     public function import() {
 
-      if ( isset($_FILES['file']) ) {
+      if ( isset($_FILES['file']) && $_FILES['file']['tmp_name'] ) {
         Tools::logm('Import stated: parsing file');
 
         // assume, that file is in json format
@@ -935,95 +592,112 @@ class Poche
               $read = ((sizeof($data) && $read)?0:1);
             }
           }
-        }
+        }
 
-        //for readability structure
-        foreach ($data as $record) {
-          if (is_array($record)) {
-            $data[] = $record;
-            foreach ($record as $record2) {
-              if (is_array($record2)) {
-                $data[] = $record2;
-              }
+            // for readability structure
+
+            foreach($data as $record) {
+                if (is_array($record)) {
+                    $data[] = $record;
+                    foreach($record as $record2) {
+                        if (is_array($record2)) {
+                            $data[] = $record2;
+                        }
+                    }
+                }
             }
-          }
-        }
 
-        $urlsInserted = array(); //urls of articles inserted
-        foreach ($data as $record) {
-          $url = trim( isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : '') );
-          if ( $url and !in_array($url, $urlsInserted) ) {
-            $title = (isset($record['title']) ? $record['title'] :  _('Untitled - Import - ').'</a> <a href="./?import">'._('click to finish import').'</a><a>');
-            $body = (isset($record['content']) ? $record['content'] : '');
-            $isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive'])?intval($record['archive']):0));
-            $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : (isset($record['favorite'])?intval($record['favorite']):0) );
-            //insert new record
-            $id = $this->store->add($url, $title, $body, $this->user->getId(), $isFavorite, $isRead);
-            if ( $id ) {
-              $urlsInserted[] = $url; //add
-
-              if ( isset($record['tags']) && trim($record['tags']) ) {
-                //@TODO: set tags
+            $urlsInserted = array(); //urls of articles inserted
+            foreach($data as $record) {
+                $url = trim(isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : ''));
+                if ($url and !in_array($url, $urlsInserted)) {
+                    $title = (isset($record['title']) ? $record['title'] : _('Untitled - Import - ') . '</a> <a href="./?import">' . _('click to finish import') . '</a><a>');
+                    $body = (isset($record['content']) ? $record['content'] : '');
+                    $isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive']) ? intval($record['archive']) : 0));
+                    $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : (isset($record['favorite']) ? intval($record['favorite']) : 0));
 
-              }
+                    // insert new record
+
+                    $id = $this->store->add($url, $title, $body, $this->user->getId() , $isFavorite, $isRead);
+                    if ($id) {
+                        $urlsInserted[] = $url; //add
+                        if (isset($record['tags']) && trim($record['tags'])) {
+
+                            // @TODO: set tags
+
+                        }
+                    }
+                }
+            }
+
+            $i = sizeof($urlsInserted);
+            if ($i > 0) {
+                $this->messages->add('s', _('Articles inserted: ') . $i . _('. Please note, that some may be marked as "read".'));
             }
-          }
-        }
 
-        $i = sizeof($urlsInserted);
-        if ( $i > 0 ) {
-          $this->messages->add('s', _('Articles inserted: ').$i._('. Please note, that some may be marked as "read".'));
-        }
         Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
       }
-      //file parsing finished here
+      else {
+        $this->messages->add('s', _('Did you forget to select a file?'));
+      }
+        // file parsing finished here
+        // now download article contents if any
+        // check if we need to download any content
 
-      //now download article contents if any
+        $recordsDownloadRequired = $this->store->retrieveUnfetchedEntriesCount($this->user->getId());
 
-      //check if we need to download any content
-      $recordsDownloadRequired = $this->store->retrieveUnfetchedEntriesCount($this->user->getId());
-      if ( $recordsDownloadRequired == 0 ) {
-        //nothing to download
-        $this->messages->add('s', _('Import finished.'));
-        Tools::logm('Import finished completely');
-        Tools::redirect();
-      }
-      else {
-        //if just inserted - don't download anything, download will start in next reload
-        if ( !isset($_FILES['file']) ) {
-          //download next batch
-          Tools::logm('Fetching next batch of articles...');
-          $items = $this->store->retrieveUnfetchedEntries($this->user->getId(), IMPORT_LIMIT);
+        if ($recordsDownloadRequired == 0) {
 
-          $purifier = $this->getPurifier();
+            // nothing to download
 
-          foreach ($items as $item) {
-            $url = new Url(base64_encode($item['url']));
-            Tools::logm('Fetching article '.$item['id']);
-            $content = Tools::getPageContent($url);
+            $this->messages->add('s', _('Import finished.'));
+            Tools::logm('Import finished completely');
+            Tools::redirect();
+        }
+        else {
 
-            $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
-            $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
+            // if just inserted - don't download anything, download will start in next reload
 
-            //clean content to prevent xss attack
-            $title = $purifier->purify($title);
-            $body = $purifier->purify($body);
+            if (!isset($_FILES['file'])) {
 
-            $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
-            Tools::logm('Article '.$item['id'].' updated.');
-          }
+                // download next batch
+
+                Tools::logm('Fetching next batch of articles...');
+                $items = $this->store->retrieveUnfetchedEntries($this->user->getId() , IMPORT_LIMIT);
+                $purifier = $this->_getPurifier();
+                foreach($items as $item) {
+                    $url = new Url(base64_encode($item['url']));
+                    Tools::logm('Fetching article ' . $item['id']);
+                    $content = Tools::getPageContent($url);
+                    $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
+                    $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
+
+                    // clean content to prevent xss attack
 
+                    $title = $purifier->purify($title);
+                    $body = $purifier->purify($body);
+                    $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
+                    Tools::logm('Article ' . $item['id'] . ' updated.');
+                }
+            }
         }
-      }
 
-      return array('includeImport'=>true, 'import'=>array('recordsDownloadRequired'=>$recordsDownloadRequired, 'recordsUnderDownload'=> IMPORT_LIMIT, 'delay'=> IMPORT_DELAY * 1000) );
+        return array(
+            'includeImport' => true,
+            'import' => array(
+                'recordsDownloadRequired' => $recordsDownloadRequired,
+                'recordsUnderDownload' => IMPORT_LIMIT,
+                'delay' => IMPORT_DELAY * 1000
+            )
+        );
     }
 
     /**
      * export poche entries in json
      * @return json all poche entries
      */
-    public function export() {
+    public function export()
+    {
       $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
       header('Content-Disposition: attachment; filename='.$filename);
 
@@ -1039,7 +713,7 @@ class Poche
      * @param  string $which 'prod' or 'dev'
      * @return string        latest $which version
      */
-    private function getPocheVersion($which = 'prod') {
+    private function _getPocheVersion($which = 'prod') {
       $cache_file = CACHE . '/' . $which;
       $check_time = time();
 
@@ -1054,29 +728,27 @@ class Poche
       return array($version, $check_time);
     }
 
-    public function generateToken()
+    /**
+     * Update token for current user
+     */
+    public function updateToken()
     {
-      if (ini_get('open_basedir') === '') {
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-          echo 'This is a server using Windows!';
-          // alternative to /dev/urandom for Windows
-          $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
-        } else {
-          $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
-        }
-      }
-      else {
-        $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
-      }
-
-      $token = str_replace('+', '', $token);
-      $this->store->updateUserConfig($this->user->getId(), 'token', $token);
-      $currentConfig = $_SESSION['poche_user']->config;
-      $currentConfig['token'] = $token;
-      $_SESSION['poche_user']->setConfig($currentConfig);
-      Tools::redirect();
+        $token = Tools::generateToken();
+        $this->store->updateUserConfig($this->user->getId(), 'token', $token);
+        $currentConfig = $_SESSION['poche_user']->config;
+        $currentConfig['token'] = $token;
+        $_SESSION['poche_user']->setConfig($currentConfig);
+        Tools::redirect();
     }
 
+    /**
+     * Generate RSS feeds for current user
+     *
+     * @param $token
+     * @param $user_id
+     * @param $tag_id
+     * @param string $type
+     */
     public function generateFeeds($token, $user_id, $tag_id, $type = 'home')
     {
         $allowed_types = array('home', 'fav', 'archive', 'tag');
@@ -1086,10 +758,9 @@ class Poche
             die(sprintf(_('User with this id (%d) does not exist.'), $user_id));
         }
 
-        if (!in_array($type, $allowed_types) || $token != $config['token']) {
-            die(_('Uh, there is a problem while generating feeds.'));
+        if (!in_array($type, $allowed_types) || !isset($config['token']) || $token != $config['token']) {
+            die(_('Uh, there is a problem while generating feed. Wrong token used?'));
         }
-        // Check the token
 
         $feed = new FeedWriter(RSS2);
         $feed->setTitle('wallabag — ' . $type . ' feed');
@@ -1121,147 +792,22 @@ class Poche
         exit;
     }
 
-    public function emptyCache() {
-        $files = new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator(CACHE, RecursiveDirectoryIterator::SKIP_DOTS),
-            RecursiveIteratorIterator::CHILD_FIRST
-        );
-
-        foreach ($files as $fileinfo) {
-            $todo = ($fileinfo->isDir() ? 'rmdir' : 'unlink');
-            $todo($fileinfo->getRealPath());
-        }
 
-        Tools::logm('empty cache');
-        $this->messages->add('s', _('Cache deleted.'));
-        Tools::redirect();
-    }
 
     /**
-     * return new purifier object with actual config
+     * Returns new purifier object with actual config
      */
-    protected function getPurifier() {
-      $config = HTMLPurifier_Config::createDefault();
-      $config->set('Cache.SerializerPath', CACHE);
-      $config->set('HTML.SafeIframe', true);
+    private function _getPurifier()
+    {
+        $config = HTMLPurifier_Config::createDefault();
+        $config->set('Cache.SerializerPath', CACHE);
+        $config->set('HTML.SafeIframe', true);
 
-      //allow YouTube, Vimeo and dailymotion videos
-      $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%');
+        //allow YouTube, Vimeo and dailymotion videos
+        $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%');
 
-      return new HTMLPurifier($config);
+        return new HTMLPurifier($config);
     }
 
-    /**
-     * handle epub
-     */
-    public function createEpub() {
-
-        switch ($_GET['method']) {
-            case 'id':
-                $entryID = filter_var($_GET['id'],FILTER_SANITIZE_NUMBER_INT);
-                $entry = $this->store->retrieveOneById($entryID, $this->user->getId());
-                $entries = array($entry);
-                $bookTitle = $entry['title'];
-                $bookFileName = substr($bookTitle, 0, 200);
-                break;
-            case 'all':
-                $entries = $this->store->retrieveAll($this->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($_GET['tag'],FILTER_SANITIZE_STRING);
-                $tags_id = $this->store->retrieveAllTags($this->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->store->retrieveEntriesByTag($tag_id,$this->user->getId());
-                $bookTitle = sprintf(_('Articles tagged %s'),$tag);
-                $bookFileName = substr(sprintf(_('Tag %s'),$tag), 0, 200);
-                break;
-            case 'category':
-                $category = filter_var($_GET['category'],FILTER_SANITIZE_STRING);
-                $entries = $this->store->getEntriesByView($category,$this->user->getId());
-                $bookTitle = sprintf(_('All articles in category %s'), $category);
-                $bookFileName = substr(sprintf(_('Category %s'),$category), 0, 200);
-                break;
-            case 'search':
-                $search = filter_var($_GET['search'],FILTER_SANITIZE_STRING);
-                $entries = $this->store->search($search,$this->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(_('wallabag\'s articles'));
-        $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->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) {
-            $epuplog = $book->getLog();
-            $book->addChapter("Log", "Log.html", $content_start . $log->getLog() . "\n</pre>" . $bookEnd); // log generation
-        }
-        $book->finalize();
-        $zipData = $book->sendBook($bookFileName);
-    }
 }
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
new file mode 100755
index 00000000..0b373058
--- /dev/null
+++ b/inc/poche/Routing.class.php
@@ -0,0 +1,151 @@
+<?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 Routing
+{
+    protected $wallabag;
+    protected $referer;
+    protected $view;
+    protected $action;
+    protected $id;
+    protected $url;
+    protected $file;
+    protected $defaultVars = array();
+    protected $vars = array();
+
+    public function __construct(Poche $wallabag)
+    {
+        $this->wallabag = $wallabag;
+        $this->_init();
+    }
+
+    private function _init()
+    {
+        # Parse GET & REFERER vars
+        $this->referer      = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
+        $this->view         = Tools::checkVar('view', 'home');
+        $this->action       = Tools::checkVar('action');
+        $this->id           = Tools::checkVar('id');
+        $_SESSION['sort']   = Tools::checkVar('sort', 'id');
+        $this->url          = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
+    }
+
+    public function run()
+    {
+        # vars to _always_ send to templates
+        $this->defaultVars = array(
+            'referer' => $this->referer,
+            'view' => $this->view,
+            'poche_url' => Tools::getPocheUrl(),
+            'title' => _('wallabag, a read it later open source system'),
+            'token' => \Session::getToken(),
+            'theme' => $this->wallabag->tpl->getTheme()
+        );
+
+        $this->_launchAction();
+        $this->_defineTplInformation();
+
+        # because messages can be added in $poche->action(), we have to add this entry now (we can add it before)
+        $this->vars = array_merge($this->vars, array('messages' => $this->wallabag->messages->display('all', FALSE)));
+
+        $this->_render($this->file, $this->vars);
+    }
+
+    private function _defineTplInformation()
+    {
+        $tplFile = array();
+        $tplVars = array();
+
+        if (\Session::isLogged()) {
+            $this->wallabag->action($this->action, $this->url, $this->id);
+            $tplFile = Tools::getTplFile($this->view);
+            $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
+        } elseif(isset($_SERVER['PHP_AUTH_USER'])) {
+            if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) {
+                $this->wallabag->login($this->referer);
+            } else {
+                $this->wallabag->messages->add('e', _('login failed: user doesn\'t exist'));
+                Tools::logm('user doesn\'t exist');
+                $tplFile = Tools::getTplFile('login');
+                $tplVars['http_auth'] = 1;
+            }
+        } elseif(isset($_SERVER['REMOTE_USER'])) {
+            if($this->wallabag->store->userExists($_SERVER['REMOTE_USER'])) {
+                $this->wallabag->login($this->referer);
+            } else {
+                $this->wallabag->messages->add('e', _('login failed: user doesn\'t exist'));
+                Tools::logm('user doesn\'t exist');
+                $tplFile = Tools::getTplFile('login');
+                $tplVars['http_auth'] = 1;
+            }
+        } else {
+            $tplFile = Tools::getTplFile('login');
+            $tplVars['http_auth'] = 0;
+            \Session::logout();
+        }
+
+        $this->file = $tplFile;
+        $this->vars = array_merge($this->defaultVars, $tplVars);
+    }
+
+    private function _launchAction()
+    {
+        if (isset($_GET['login'])) {
+                // hello to you
+                $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']);
+        }
+        
+        //allowed ONLY to logged in user
+        if (\Session::isLogged() === true) 
+        {
+            if (isset($_GET['logout'])) {
+                // see you soon !
+                $this->wallabag->logout();
+            } elseif (isset($_GET['config'])) {
+                // update password
+                $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']);
+            } elseif (isset($_GET['newuser'])) {
+                $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']);
+            } elseif (isset($_GET['deluser'])) {
+                $this->wallabag->deleteUser($_POST['password4deletinguser']);
+            } elseif (isset($_GET['epub'])) {
+                $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['id'], $_GET['value']);
+                $epub->run();
+            } elseif (isset($_GET['import'])) {
+                $import = $this->wallabag->import();
+                $tplVars = array_merge($this->vars, $import);
+            } elseif (isset($_GET['empty-cache'])) {
+                Tools::emptyCache();
+            } elseif (isset($_GET['export'])) {
+                $this->wallabag->export();
+            } elseif (isset($_GET['updatetheme'])) {
+                $this->wallabag->tpl->updateTheme($_POST['theme']);
+            } elseif (isset($_GET['updatelanguage'])) {
+                $this->wallabag->language->updateLanguage($_POST['language']);
+            } elseif (isset($_GET['uploadfile'])) {
+                $this->wallabag->uploadFile();
+            } elseif (isset($_GET['feed']) && isset($_GET['action']) && $_GET['action'] == 'generate') {
+                $this->wallabag->updateToken();
+            }
+            elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) {
+                $plainUrl = new Url(base64_encode($_GET['plainurl']));
+                $this->wallabag->action('add', $plainUrl);
+            }
+        }
+    }
+
+    public function _render($file, $vars)
+    {
+        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
new file mode 100644
index 00000000..b686f2ec
--- /dev/null
+++ b/inc/poche/Template.class.php
@@ -0,0 +1,235 @@
+<?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 Template extends Twig_Environment
+{
+    protected $wallabag;
+
+    private $canRenderTemplates = TRUE;
+    private $currentTheme = '';
+
+    public function __construct(Poche $wallabag)
+    {
+        $this->wallabag = $wallabag;
+
+        // Set up theme
+        $pocheUser = Session::getParam('poche_user');
+
+        $themeDirectory = (is_null($pocheUser) ? DEFAULT_THEME : $pocheUser->getConfigValue('theme'));
+
+        if ($themeDirectory === false) {
+            $themeDirectory = DEFAULT_THEME;
+        }
+
+        $this->currentTheme = $themeDirectory;
+
+        if ($this->_themeIsInstalled() === array()) {
+            $this->_init();
+        }
+    }
+
+    /**
+     * Returns true if selected theme is installed
+     *
+     * @return bool
+     */
+    private function _themeIsInstalled()
+    {
+        $errors = array();
+
+        // Twig is an absolute requirement for wallabag to function.
+        // Abort immediately if the Composer installer hasn't been run yet
+        if (!$this->canRenderTemplates) {
+            $errors[]   = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. You can also download <a href="http://wllbg.org/vendor">vendor.zip</a> and extract it in your wallabag folder.';
+        }
+
+        // Check if the selected theme and its requirements are present
+        $theme = $this->getTheme();
+        if ($theme != '' && !is_dir(THEME . '/' . $theme)) {
+            $errors[]                   = 'The currently selected theme (' . $theme . ') does not seem to be properly installed (Missing directory: ' . THEME . '/' . $theme . ')';
+            $this->canRenderTemplates   = FALSE;
+        }
+
+        $themeInfo = $this->getThemeInfo($theme);
+        if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
+            foreach ($themeInfo['requirements'] as $requiredTheme) {
+                if (! is_dir(THEME . '/' . $requiredTheme)) {
+                    $errors[]                   = 'The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')';
+                    $this->canRenderTemplates   = FALSE;
+                }
+            }
+        }
+
+        $currentErrors = (is_null(Session::getParam('errors'))? array() : Session::getParam('errors'));
+        Session::setParam('errors', array_merge($errors, $currentErrors));
+
+        return $errors;
+    }
+
+    /**
+     * Initialization for templates
+     */
+    private function _init()
+    {
+        $loaderChain    = new Twig_Loader_Chain();
+        $theme          = $this->getTheme();
+
+        // add the current theme as first to the loader chain
+        // so Twig will look there first for overridden template files
+        try {
+            $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $theme));
+        } catch (Twig_Error_Loader $e) {
+            # @todo isInstalled() should catch this, inject Twig later
+            die('The currently selected theme (' . $theme . ') does not seem to be properly installed (' . THEME . '/' . $theme .' is missing)');
+        }
+
+        // add all required themes to the loader chain
+        $themeInfo = $this->getThemeInfo($theme);
+        if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
+            foreach ($themeInfo['requirements'] as $requiredTheme) {
+                try {
+                    $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $requiredTheme));
+                } catch (Twig_Error_Loader $e) {
+                    # @todo isInstalled() should catch this, inject Twig later
+                    die('The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')');
+                }
+            }
+        }
+
+        if (DEBUG_POCHE) {
+            $twigParams = array();
+        } else {
+            $twigParams = array('cache' => CACHE);
+        }
+
+        parent::__construct($loaderChain, $twigParams);
+
+        //$tpl = new Twig_Environment($loaderChain, $twigParams);
+        $this->addExtension(new Twig_Extensions_Extension_I18n());
+
+        # filter to display domain name of an url
+        $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
+        $this->addFilter($filter);
+
+        # filter for reading time
+        $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
+        $this->addFilter($filter);
+    }
+
+    /**
+     * Returns current theme
+     *
+     * @return string
+     */
+    public function getTheme()
+    {
+        return $this->currentTheme;
+    }
+
+    /**
+     * Provides theme information by parsing theme.ini file if present in the theme's root directory.
+     * In all cases, the following data will be returned:
+     * - name: theme's name, or key if the theme is unnamed,
+     * - current: boolean informing if the theme is the current user theme.
+     *
+     * @param string $theme Theme key (directory name)
+     * @return array|boolean Theme information, or false if the theme doesn't exist.
+     */
+    public function getThemeInfo($theme)
+    {
+        if (!is_dir(THEME . '/' . $theme)) {
+            return false;
+        }
+
+        $themeIniFile   = THEME . '/' . $theme . '/theme.ini';
+        $themeInfo      = array();
+
+        if (is_file($themeIniFile) && is_readable($themeIniFile)) {
+            $themeInfo = parse_ini_file($themeIniFile);
+        }
+
+        if ($themeInfo === false) {
+            $themeInfo = array();
+        }
+
+        if (!isset($themeInfo['name'])) {
+            $themeInfo['name'] = $theme;
+        }
+
+        $themeInfo['current'] = ($theme === $this->getTheme());
+
+        return $themeInfo;
+    }
+
+    /**
+     * Returns an array with installed themes
+     *
+     * @return array
+     */
+    public function getInstalledThemes()
+    {
+        $handle = opendir(THEME);
+        $themes = array();
+
+        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('.', '..'))) {
+                continue;
+            }
+
+            $themes[$theme] = $this->getThemeInfo($theme);
+        }
+
+        ksort($themes);
+
+        return $themes;
+    }
+
+    /**
+     * Update theme for the current user
+     *
+     * @param $newTheme
+     */
+    public function updateTheme($newTheme)
+    {
+        # we are not going to change it to the current theme...
+        if ($newTheme == $this->getTheme()) {
+            $this->wallabag->messages->add('w', _('still using the "' . $this->getTheme() . '" theme!'));
+            Tools::redirect('?view=config');
+        }
+
+        $themes = $this->getInstalledThemes();
+        $actualTheme = false;
+
+        foreach (array_keys($themes) as $theme) {
+            if ($theme == $newTheme) {
+                $actualTheme = true;
+                break;
+            }
+        }
+
+        if (!$actualTheme) {
+            $this->wallabag->messages->add('e', _('that theme does not seem to be installed'));
+            Tools::redirect('?view=config');
+        }
+
+        $this->wallabag->store->updateUserConfig($this->wallabag->user->getId(), 'theme', $newTheme);
+        $this->wallabag->messages->add('s', _('you have changed your theme preferences'));
+
+        $currentConfig = $_SESSION['poche_user']->config;
+        $currentConfig['theme'] = $newTheme;
+
+        $_SESSION['poche_user']->setConfig($currentConfig);
+
+        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 cc01f403..93ec3fc6 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -5,19 +5,18 @@
  * @category   wallabag
  * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
- * @license    http://www.wtfpl.net/ see COPYING file
+ * @license    http://opensource.org/licenses/MIT see COPYING file
  */
 
-class Tools
+final class Tools
 {
+    /**
+     * Initialize PHP environment
+     */
     public static function initPhp()
     {
         define('START_TIME', microtime(true));
 
-        if (phpversion() < 5) {
-            die(_('Oops, it seems you don\'t have PHP 5.'));
-        }
-
         function stripslashesDeep($value) {
             return is_array($value)
                 ? array_map('stripslashesDeep', $value)
@@ -34,6 +33,11 @@ class Tools
         register_shutdown_function('ob_end_flush');
     }
 
+    /**
+     * Get wallabag instance URL
+     *
+     * @return string
+     */
     public static function getPocheUrl()
     {
         $https = (!empty($_SERVER['HTTPS'])
@@ -50,6 +54,10 @@ class Tools
             || ($https && $_SERVER["SERVER_PORT"] == '443')
             || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection
             ? '' : ':' . $_SERVER["SERVER_PORT"]);
+        
+        if (isset($_SERVER["HTTP_X_FORWARDED_PORT"])) {
+            $serverport = ':' . $_SERVER["HTTP_X_FORWARDED_PORT"];
+        }
 
         $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]);
 
@@ -67,6 +75,11 @@ class Tools
             . $host . $serverport . $scriptname;
     }
 
+    /**
+     * Redirects to a URL
+     *
+     * @param string $url
+     */
     public static function redirect($url = '')
     {
         if ($url === '') {
@@ -87,11 +100,18 @@ class Tools
                 $url = $ref;
             }
         }
+
         self::logm('redirect to ' . $url);
         header('Location: '.$url);
         exit();
     }
 
+    /**
+     * Returns name of the template file to display
+     *
+     * @param $view
+     * @return string
+     */
     public static function getTplFile($view)
     {
         $views = array(
@@ -99,13 +119,15 @@ class Tools
             'edit-tags', 'view', 'login', 'error'
             );
 
-        if (in_array($view, $views)) {
-            return $view . '.twig';
-        }
-
-        return 'home.twig';
+        return (in_array($view, $views) ? $view . '.twig' : 'home.twig');
     }
 
+    /**
+     * Download a file (typically, for downloading pictures on web server)
+     *
+     * @param $url
+     * @return bool|mixed|string
+     */
     public static function getFile($url)
     {
         $timeout = 15;
@@ -186,6 +208,11 @@ class Tools
         }
     }
 
+    /**
+     * Headers for JSON export
+     *
+     * @param $data
+     */
     public static function renderJson($data)
     {
         header('Cache-Control: no-cache, must-revalidate');
@@ -195,6 +222,11 @@ class Tools
         exit();
     }
 
+    /**
+     * Create new line in log file
+     *
+     * @param $message
+     */
     public static function logm($message)
     {
         if (DEBUG_POCHE && php_sapi_name() != 'cli') {
@@ -204,36 +236,57 @@ class Tools
         }
     }
 
+    /**
+     * Encode a URL by using a salt
+     *
+     * @param $string
+     * @return string
+     */
     public static function encodeString($string)
     {
         return sha1($string . SALT);
     }
 
+    /**
+     * Cleans a variable
+     *
+     * @param $var
+     * @param string $default
+     * @return string
+     */
     public static function checkVar($var, $default = '')
     {
-        return ((isset ($_REQUEST["$var"])) ? htmlentities($_REQUEST["$var"]) : $default);
+        return ((isset($_REQUEST["$var"])) ? htmlentities($_REQUEST["$var"]) : $default);
     }
 
+    /**
+     * Returns the domain name for a URL
+     *
+     * @param $url
+     * @return string
+     */
     public static function getDomain($url)
     {
         return parse_url($url, PHP_URL_HOST);
     }
 
-    public static function getReadingTime($text) {
-        $word = str_word_count(strip_tags($text));
-        $minutes = floor($word / 200);
-        $seconds = floor($word % 200 / (200 / 60));
-        $time = array('minutes' => $minutes, 'seconds' => $seconds);
-
-        return $minutes;
-    }
-
-    public static function getDocLanguage($userlanguage) {
-        $lang = explode('.', $userlanguage);
-        return str_replace('_', '-', $lang[0]);
+    /**
+     * For a given text, we calculate reading time for an article
+     *
+     * @param $text
+     * @return float
+     */
+    public static function getReadingTime($text)
+    {
+        return floor(str_word_count(strip_tags($text)) / 200);
     }
 
-    public static function status($status_code)
+    /**
+     * Returns the correct header for a status code
+     *
+     * @param $status_code
+     */
+    private static function _status($status_code)
     {
         if (strpos(php_sapi_name(), 'apache') !== false) {
 
@@ -245,29 +298,24 @@ class Tools
         }
     }
 
-    public static function download_db() {
-        header('Content-Disposition: attachment; filename="poche.sqlite.gz"');
-        self::status(200);
-
-        header('Content-Transfer-Encoding: binary');
-        header('Content-Type: application/octet-stream');
-        echo gzencode(file_get_contents(STORAGE_SQLITE));
-
-        exit;
-    }
-
+    /**
+     * Get the content for a given URL (by a call to FullTextFeed)
+     *
+     * @param Url $url
+     * @return mixed
+     */
     public static function getPageContent(Url $url)
     {
         // Saving and clearing context
         $REAL = array();
         foreach( $GLOBALS as $key => $value ) {
             if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) {
-                $GLOBALS[$key] = array();
-                $REAL[$key] = $value;
+                $GLOBALS[$key]  = array();
+                $REAL[$key]     = $value;
             }
         }
         // Saving and clearing session
-        if ( isset($_SESSION) ) {
+        if (isset($_SESSION)) {
             $REAL_SESSION = array();
             foreach( $_SESSION as $key => $value ) {
                 $REAL_SESSION[$key] = $value;
@@ -279,12 +327,12 @@ class Tools
         $scope = function() {
             extract( func_get_arg(1) );
             $_GET = $_REQUEST = array(
-                        "url" => $url->getUrl(),
-                        "max" => 5,
-                        "links" => "preserve",
-                        "exc" => "",
-                        "format" => "json",
-                        "submit" => "Create Feed"
+                "url" => $url->getUrl(),
+                "max" => 5,
+                "links" => "preserve",
+                "exc" => "",
+                "format" => "json",
+                "submit" => "Create Feed"
             );
             ob_start();
             require func_get_arg(0);
@@ -292,23 +340,26 @@ class Tools
             ob_end_clean();
             return $json;
         };
-        $json = $scope( "inc/3rdparty/makefulltextfeed.php", array("url" => $url) );
+
+        $json = $scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url));
 
         // Clearing and restoring context
-        foreach( $GLOBALS as $key => $value ) {
-            if( $key != "GLOBALS" && $key != "_SESSION" ) {
+        foreach ($GLOBALS as $key => $value) {
+            if($key != "GLOBALS" && $key != "_SESSION" ) {
                 unset($GLOBALS[$key]);
             }
         }
-        foreach( $REAL as $key => $value ) {
+        foreach ($REAL as $key => $value) {
             $GLOBALS[$key] = $value;
         }
+
         // Clearing and restoring session
-        if ( isset($REAL_SESSION) ) {
-            foreach( $_SESSION as $key => $value ) {
+        if (isset($REAL_SESSION)) {
+            foreach($_SESSION as $key => $value) {
                 unset($_SESSION[$key]);
             }
-            foreach( $REAL_SESSION as $key => $value ) {
+
+            foreach($REAL_SESSION as $key => $value) {
                 $_SESSION[$key] = $value;
             }
         }
@@ -318,11 +369,48 @@ class Tools
 
     /**
      * Returns whether we handle an AJAX (XMLHttpRequest) request.
+     *
      * @return boolean whether we handle an AJAX (XMLHttpRequest) request.
      */
     public static function isAjaxRequest()
     {
-      return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH']==='XMLHttpRequest';
+        return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH']==='XMLHttpRequest';
+    }
+
+    /*
+     * Empty cache folder
+     */
+    public static function emptyCache()
+    {
+        $files = new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(CACHE, RecursiveDirectoryIterator::SKIP_DOTS),
+            RecursiveIteratorIterator::CHILD_FIRST
+        );
+
+        foreach ($files as $fileInfo) {
+            $todo = ($fileInfo->isDir() ? 'rmdir' : 'unlink');
+            $todo($fileInfo->getRealPath());
+        }
+
+        Tools::logm('empty cache');
+        Tools::redirect();
+    }
+
+    public static function generateToken()
+    {
+        if (ini_get('open_basedir') === '') {
+            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+                // alternative to /dev/urandom for Windows
+                $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
+            } else {
+                $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
+            }
+        }
+        else {
+            $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
+        }
+
+        return str_replace('+', '', $token);
     }
 
 }
diff --git a/inc/poche/Url.class.php b/inc/poche/Url.class.php
index aba236fa..d9172b7d 100644
--- a/inc/poche/Url.class.php
+++ b/inc/poche/Url.class.php
@@ -5,7 +5,7 @@
  * @category   wallabag
  * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
- * @license    http://www.wtfpl.net/ see COPYING file
+ * @license    http://opensource.org/licenses/MIT see COPYING file
  */
 
 class Url
diff --git a/inc/poche/User.class.php b/inc/poche/User.class.php
index cc8bec65..eaadd3e5 100644
--- a/inc/poche/User.class.php
+++ b/inc/poche/User.class.php
@@ -5,7 +5,7 @@
  * @category   wallabag
  * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
- * @license    http://www.wtfpl.net/ see COPYING file
+ * @license    http://opensource.org/licenses/MIT see COPYING file
  */
 
 class User
@@ -44,7 +44,14 @@ class User
         $this->config = $config;
     }
 
-    public function getConfigValue($name) {
+    /**
+     * Returns configuration entry for a user
+     *
+     * @param $name
+     * @return bool
+     */
+    public function getConfigValue($name)
+    {
         return (isset($this->config[$name])) ? $this->config[$name] : FALSE;
     }
 }
\ No newline at end of file
diff --git a/inc/poche/WallabagEpub.class.php b/inc/poche/WallabagEpub.class.php
new file mode 100644
index 00000000..9c4d3566
--- /dev/null
+++ b/inc/poche/WallabagEpub.class.php
@@ -0,0 +1,135 @@
+<?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 95f727c6..2a458544 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -5,7 +5,7 @@
  * @category   wallabag
  * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
- * @license    http://www.wtfpl.net/ see COPYING file
+ * @license    http://opensource.org/licenses/MIT see COPYING file
  */
 
 @define ('SALT', ''); # put a strong string here
@@ -59,7 +59,7 @@
 @define ('LOCALE', ROOT . '/locale');
 @define ('CACHE', ROOT . '/cache');
 
-@define ('PAGINATION', '10');
+@define ('PAGINATION', '12');
 
 //limit for download of articles during import
 @define ('IMPORT_LIMIT', 5);
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 8cf86d03..b8c487e3 100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -5,7 +5,7 @@
  * @category   wallabag
  * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
- * @license    http://www.wtfpl.net/ see COPYING file
+ * @license    http://opensource.org/licenses/MIT see COPYING file
  */
 
 # the poche system root directory (/inc)
@@ -18,6 +18,11 @@ require_once INCLUDES . '/poche/Tools.class.php';
 require_once INCLUDES . '/poche/User.class.php';
 require_once INCLUDES . '/poche/Url.class.php';
 require_once INCLUDES . '/3rdparty/class.messages.php';
+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/Poche.class.php';
 
 require_once INCLUDES . '/poche/Database.class.php';
@@ -36,25 +41,18 @@ 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;
-} else {
-    require_once ROOT . '/vendor/autoload.php';
-}
-
 # 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';
-}
+require_once INCLUDES . '/poche/config.inc.php';
+require_once INCLUDES . '/poche/config.inc.default.php';
 
-if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) {
+if (DOWNLOAD_PICTURES) {
     require_once  INCLUDES . '/poche/pochePictures.php';
 }
 
 if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) {
     date_default_timezone_set('UTC');
-}
\ No newline at end of file
+}
+
+if (defined('ERROR_REPORTING')) {
+    error_reporting(ERROR_REPORTING);
+}
diff --git a/inc/poche/pochePictures.php b/inc/poche/pochePictures.php
index 7c319a85..52394c70 100644
--- a/inc/poche/pochePictures.php
+++ b/inc/poche/pochePictures.php
@@ -5,154 +5,164 @@
  * @category   wallabag
  * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
- * @license    http://www.wtfpl.net/ see COPYING file
+ * @license    http://opensource.org/licenses/MIT see COPYING file
  */
 
-/**
- * On modifie les URLS des images dans le corps de l'article
- */
-function filtre_picture($content, $url, $id)
+
+final class Picture
 {
-    $matches = array();
-    $processing_pictures = array(); // list of processing image to avoid processing the same pictures twice
-    preg_match_all('#<\s*(img)[^>]+src="([^"]*)"[^>]*>#Si', $content, $matches, PREG_SET_ORDER);
-    foreach($matches as $i => $link) {
-        $link[1] = trim($link[1]);
-        if (!preg_match('#^(([a-z]+://)|(\#))#', $link[1])) {
-            $absolute_path = get_absolute_link($link[2],$url);
-            $filename = basename(parse_url($absolute_path, PHP_URL_PATH));
-            $directory = create_assets_directory($id);
-            $fullpath = $directory . '/' . $filename;
-            
-            if (in_array($absolute_path, $processing_pictures) === true) {
-                // replace picture's URL only if processing is OK : already processing -> go to next picture
-                continue;
+    /**
+     * Changing pictures URL in article content
+     */
+    public static function filterPicture($content, $url, $id)
+    {
+        $matches = array();
+        $processing_pictures = array(); // list of processing image to avoid processing the same pictures twice
+        preg_match_all('#<\s*(img)[^>]+src="([^"]*)"[^>]*>#Si', $content, $matches, PREG_SET_ORDER);
+        foreach($matches as $i => $link) {
+            $link[1] = trim($link[1]);
+            if (!preg_match('#^(([a-z]+://)|(\#))#', $link[1])) {
+                $absolute_path = self::_getAbsoluteLink($link[2], $url);
+                $filename = basename(parse_url($absolute_path, PHP_URL_PATH));
+                $directory = self::_createAssetsDirectory($id);
+                $fullpath = $directory . '/' . $filename;
+
+                if (in_array($absolute_path, $processing_pictures) === true) {
+                    // replace picture's URL only if processing is OK : already processing -> go to next picture
+                    continue;
+                }
+
+                if (self::_downloadPictures($absolute_path, $fullpath) === true) {
+                    $content = str_replace($matches[$i][2], Tools::getPocheUrl() . $fullpath, $content);
+                }
+
+                $processing_pictures[] = $absolute_path;
             }
-            
-            if (download_pictures($absolute_path, $fullpath) === true) {
-                $content = str_replace($matches[$i][2], $fullpath, $content);
-            }
-            
-            $processing_pictures[] = $absolute_path;
         }
 
+        return $content;
     }
 
-    return $content;
-}
+    /**
+     * Get absolute URL
+     */
+    private static function _getAbsoluteLink($relativeLink, $url)
+    {
+        /* return if already absolute URL */
+        if (parse_url($relativeLink, PHP_URL_SCHEME) != '') return $relativeLink;
 
-/**
- * Retourne le lien absolu
- */
-function get_absolute_link($relative_link, $url) {
-    /* return if already absolute URL */
-    if (parse_url($relative_link, PHP_URL_SCHEME) != '') return $relative_link;
+        /* queries and anchors */
+        if ($relativeLink[0]=='#' || $relativeLink[0]=='?') return $url . $relativeLink;
 
-    /* queries and anchors */
-    if ($relative_link[0]=='#' || $relative_link[0]=='?') return $url . $relative_link;
+        /* parse base URL and convert to local variables:
+           $scheme, $host, $path */
+        extract(parse_url($url));
 
-    /* parse base URL and convert to local variables:
-       $scheme, $host, $path */
-    extract(parse_url($url));
+        /* remove non-directory element from path */
+        $path = preg_replace('#/[^/]*$#', '', $path);
 
-    /* remove non-directory element from path */
-    $path = preg_replace('#/[^/]*$#', '', $path);
+        /* destroy path if relative url points to root */
+        if ($relativeLink[0] == '/') $path = '';
 
-    /* destroy path if relative url points to root */
-    if ($relative_link[0] == '/') $path = '';
+        /* dirty absolute URL */
+        $abs = $host . $path . '/' . $relativeLink;
 
-    /* dirty absolute URL */
-    $abs = $host . $path . '/' . $relative_link;
+        /* replace '//' or '/./' or '/foo/../' with '/' */
+        $re = array('#(/\.?/)#', '#/(?!\.\.)[^/]+/\.\./#');
+        for($n=1; $n>0; $abs=preg_replace($re, '/', $abs, -1, $n)) {}
 
-    /* replace '//' or '/./' or '/foo/../' with '/' */
-    $re = array('#(/\.?/)#', '#/(?!\.\.)[^/]+/\.\./#');
-    for($n=1; $n>0; $abs=preg_replace($re, '/', $abs, -1, $n)) {}
+        /* absolute URL is ready! */
+        return $scheme.'://'.$abs;
+    }
 
-    /* absolute URL is ready! */
-    return $scheme.'://'.$abs;
-}
+    /**
+     * Downloading pictures
+     *
+     * @return bool true if the download and processing is OK, false else
+     */
+    private static function _downloadPictures($absolute_path, $fullpath)
+    {
+        $rawdata = Tools::getFile($absolute_path);
+        $fullpath = urldecode($fullpath);
+
+        if(file_exists($fullpath)) {
+            unlink($fullpath);
+        }
 
-/**
- * Téléchargement des images
- * 
- * @return bool true if the download and processing is OK, false else
- */
-function download_pictures($absolute_path, $fullpath)
-{
-    $rawdata = Tools::getFile($absolute_path);
-    $fullpath = urldecode($fullpath);
+        // check extension
+        $file_ext = strrchr($fullpath, '.');
+        $whitelist = array(".jpg",".jpeg",".gif",".png");
+        if (!(in_array($file_ext, $whitelist))) {
+            Tools::logm('processed image with not allowed extension. Skipping ' . $fullpath);
+            return false;
+        }
 
-    if(file_exists($fullpath)) {
-        unlink($fullpath);
-    }
-    
-    // check extension
-    $file_ext = strrchr($fullpath, '.');
-    $whitelist = array(".jpg",".jpeg",".gif",".png"); 
-    if (!(in_array($file_ext, $whitelist))) {
-        Tools::logm('processed image with not allowed extension. Skipping ' . $fullpath);
-        return false;
-    }
-    
-    // check headers
-    $imageinfo = getimagesize($absolute_path);
-    if ($imageinfo['mime'] != 'image/gif' && $imageinfo['mime'] != 'image/jpeg'&& $imageinfo['mime'] != 'image/jpg'&& $imageinfo['mime'] != 'image/png') {
-        Tools::logm('processed image with bad header. Skipping ' . $fullpath);
-        return false;
-    }
-    
-    // regenerate image
-    $im = imagecreatefromstring($rawdata);
-    if ($im === false) {
-        Tools::logm('error while regenerating image ' . $fullpath);
-        return false;
-    }
-    
-    switch ($imageinfo['mime']) {
-        case 'image/gif':
-            $result = imagegif($im, $fullpath);
-            break;
-        case 'image/jpeg':
-        case 'image/jpg':
-            $result = imagejpeg($im, $fullpath, REGENERATE_PICTURES_QUALITY);
-            break;
-        case 'image/png':
-            $result = imagepng($im, $fullpath, ceil(REGENERATE_PICTURES_QUALITY / 100 * 9));
-            break;
-    }
-    imagedestroy($im);
-    
-    return $result;
-}
+        // check headers
+        $imageinfo = getimagesize($absolute_path);
+        if ($imageinfo['mime'] != 'image/gif' && $imageinfo['mime'] != 'image/jpeg'&& $imageinfo['mime'] != 'image/jpg'&& $imageinfo['mime'] != 'image/png') {
+            Tools::logm('processed image with bad header. Skipping ' . $fullpath);
+            return false;
+        }
 
-/**
- * Crée un répertoire de médias pour l'article
- */
-function create_assets_directory($id)
-{
-    $assets_path = ABS_PATH;
-    if(!is_dir($assets_path)) {
-        mkdir($assets_path, 0715);
-    }
+        // regenerate image
+        $im = imagecreatefromstring($rawdata);
+        if ($im === false) {
+            Tools::logm('error while regenerating image ' . $fullpath);
+            return false;
+        }
+
+        switch ($imageinfo['mime']) {
+            case 'image/gif':
+                $result = imagegif($im, $fullpath);
+                break;
+            case 'image/jpeg':
+            case 'image/jpg':
+                $result = imagejpeg($im, $fullpath, REGENERATE_PICTURES_QUALITY);
+                break;
+            case 'image/png':
+                $result = imagepng($im, $fullpath, ceil(REGENERATE_PICTURES_QUALITY / 100 * 9));
+                break;
+        }
+        imagedestroy($im);
 
-    $article_directory = $assets_path . $id;
-    if(!is_dir($article_directory)) {
-        mkdir($article_directory, 0715);
+        return $result;
     }
 
-    return $article_directory;
-}
+    /**
+     * Create a directory for an article
+     *
+     * @param $id ID of the article
+     * @return string
+     */
+    private static function _createAssetsDirectory($id)
+    {
+        $assets_path = ABS_PATH;
+        if (!is_dir($assets_path)) {
+            mkdir($assets_path, 0715);
+        }
 
-/**
- * Suppression du répertoire d'images
- */
-function remove_directory($directory)
-{
-    if(is_dir($directory)) {
-        $files = array_diff(scandir($directory), array('.','..'));
-        foreach ($files as $file) {
-            (is_dir("$directory/$file")) ? remove_directory("$directory/$file") : unlink("$directory/$file");
+        $article_directory = $assets_path . $id;
+        if (!is_dir($article_directory)) {
+            mkdir($article_directory, 0715);
+        }
+
+        return $article_directory;
+    }
+
+    /**
+     * Remove the directory
+     *
+     * @param $directory
+     * @return bool
+     */
+    public static function removeDirectory($directory)
+    {
+        if (is_dir($directory)) {
+            $files = array_diff(scandir($directory), array('.','..'));
+            foreach ($files as $file) {
+                (is_dir("$directory/$file")) ? self::removeDirectory("$directory/$file") : unlink("$directory/$file");
+            }
+            return rmdir($directory);
         }
-        return rmdir($directory);
     }
-}
+}
\ No newline at end of file