Merge branch 'v0.11' into stablestable

author: ArthurHoaro <arthur@hoa.ro> 2020-10-13 12:07:13 +0200
committer: ArthurHoaro <arthur@hoa.ro> 2020-10-13 12:07:13 +0200
commit: d9f6275ebca035fec8331652c677981056793ccc (patch)
tree: 37a64baf4f0eba6b781040605965383d8aded2cc /application
parent: 38672ba0d1c722e5d6d33a58255ceb55e9410e46 (diff)
parent: d63ff87a009313141ae684ec447b902562ff6ee7 (diff)
download: Shaarli-stable.tar.gz
Shaarli-stable.tar.zst
Shaarli-stable.zip
38 files changed, 845 insertions, 551 deletions
diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php
index a3b2dcb1..7fe3cb32 100644
--- a/application/ApplicationUtils.php
+++ b/application/ApplicationUtils.php
@@ -1,4 +1,9 @@
 <?php
+namespace Shaarli;
+use Exception;
+use Shaarli\Config\ConfigManager;
 /**
 * Shaarli (application) utilities
 */
@@ -51,7 +56,7 @@ class ApplicationUtils
                return false;
            }
        } else {
-            if (! is_file($remote)) {
+            if (!is_file($remote)) {
                return false;
            }
            $data = file_get_contents($remote);
@@ -97,7 +102,7 @@ class ApplicationUtils
        // Do not check versions for visitors
        // Do not check if the user doesn't want to
        // Do not check with dev version
-        if (! $isLoggedIn || empty($enableCheck) || $currentVersion === 'dev') {
+        if (!$isLoggedIn || empty($enableCheck) || $currentVersion === 'dev') {
            return false;
        }
@@ -111,7 +116,7 @@ class ApplicationUtils
            return false;
        }
-        if (! in_array($branch, self::$GIT_BRANCHES)) {
+        if (!in_array($branch, self::$GIT_BRANCHES)) {
            throw new Exception(
                'Invalid branch selected for updates: "' . $branch . '"'
            );
@@ -123,7 +128,7 @@ class ApplicationUtils
            self::$GIT_URL . '/' . $branch . '/' . self::$VERSION_FILE
        );
-        if (! $latestVersion) {
+        if (!$latestVersion) {
            // Only update the file's modification date
            file_put_contents($updateFile, $currentVersion);
            return false;
@@ -152,9 +157,9 @@ class ApplicationUtils
        if (version_compare($curVersion, $minVersion) < 0) {
            $msg = t(
                'Your PHP version is obsolete!'
-                 . ' Shaarli requires at least PHP %s, and thus cannot run.'
+                . ' Shaarli requires at least PHP %s, and thus cannot run.'
-                 . ' Your PHP version has known security vulnerabilities and should be'
+                . ' Your PHP version has known security vulnerabilities and should be'
-                 . ' updated as soon as possible.'
+                . ' updated as soon as possible.'
            );
            throw new Exception(sprintf($msg, $minVersion));
        }
@@ -174,50 +179,50 @@ class ApplicationUtils
        // Check script and template directories are readable
        foreach (array(
-            'application',
+                     'application',
-            'inc',
+                     'inc',
-            'plugins',
+                     'plugins',
-            $rainTplDir,
+                     $rainTplDir,
-            $rainTplDir.'/'.$conf->get('resource.theme'),
+                     $rainTplDir . '/' . $conf->get('resource.theme'),
-        ) as $path) {
+                 ) as $path) {
-            if (! is_readable(realpath($path))) {
+            if (!is_readable(realpath($path))) {
-                $errors[] = '"'.$path.'" '. t('directory is not readable');
+                $errors[] = '"' . $path . '" ' . t('directory is not readable');
            }
        }
        // Check cache and data directories are readable and writable
        foreach (array(
-            $conf->get('resource.thumbnails_cache'),
+                     $conf->get('resource.thumbnails_cache'),
-            $conf->get('resource.data_dir'),
+                     $conf->get('resource.data_dir'),
-            $conf->get('resource.page_cache'),
+                     $conf->get('resource.page_cache'),
-            $conf->get('resource.raintpl_tmp'),
+                     $conf->get('resource.raintpl_tmp'),
-        ) as $path) {
+                 ) as $path) {
-            if (! is_readable(realpath($path))) {
+            if (!is_readable(realpath($path))) {
-                $errors[] = '"'.$path.'" '. t('directory is not readable');
+                $errors[] = '"' . $path . '" ' . t('directory is not readable');
            }
-            if (! is_writable(realpath($path))) {
+            if (!is_writable(realpath($path))) {
-                $errors[] = '"'.$path.'" '. t('directory is not writable');
+                $errors[] = '"' . $path . '" ' . t('directory is not writable');
            }
        }
        // Check configuration files are readable and writable
        foreach (array(
-            $conf->getConfigFileExt(),
+                     $conf->getConfigFileExt(),
-            $conf->get('resource.datastore'),
+                     $conf->get('resource.datastore'),
-            $conf->get('resource.ban_file'),
+                     $conf->get('resource.ban_file'),
-            $conf->get('resource.log'),
+                     $conf->get('resource.log'),
-            $conf->get('resource.update_check'),
+                     $conf->get('resource.update_check'),
-        ) as $path) {
+                 ) as $path) {
-            if (! is_file(realpath($path))) {
+            if (!is_file(realpath($path))) {
                # the file may not exist yet
                continue;
            }
-            if (! is_readable(realpath($path))) {
+            if (!is_readable(realpath($path))) {
-                $errors[] = '"'.$path.'" '. t('file is not readable');
+                $errors[] = '"' . $path . '" ' . t('file is not readable');
            }
-            if (! is_writable(realpath($path))) {
+            if (!is_writable(realpath($path))) {
-                $errors[] = '"'.$path.'" '. t('file is not writable');
+                $errors[] = '"' . $path . '" ' . t('file is not writable');
            }
        }
diff --git a/application/FileUtils.php b/application/FileUtils.php
index b89ea12b..30560bfc 100644
--- a/application/FileUtils.php
+++ b/application/FileUtils.php
@@ -1,6 +1,8 @@
 <?php
-require_once 'exceptions/IOException.php';
+namespace Shaarli;
+use Shaarli\Exceptions\IOException;
 /**
 * Class FileUtils
@@ -44,7 +46,7 @@ class FileUtils
        return file_put_contents(
            $file,
-            self::$phpPrefix.base64_encode(gzdeflate(serialize($content))).self::$phpSuffix
+            self::$phpPrefix . base64_encode(gzdeflate(serialize($content))) . self::$phpSuffix
        );
    }
@@ -62,7 +64,7 @@ class FileUtils
    {
        // Note that gzinflate is faster than gzuncompress.
        // See: http://www.php.net/manual/en/function.gzdeflate.php#96439
-        if (! is_readable($file)) {
+        if (!is_readable($file)) {
            return $default;
        }
diff --git a/application/History.php b/application/History.php
index 35ec016a..a5846652 100644
--- a/application/History.php
+++ b/application/History.php
@@ -1,4 +1,8 @@
 <?php
+namespace Shaarli;
+use DateTime;
+use Exception;
 /**
 * Class History
@@ -66,7 +70,7 @@ class History
     * History constructor.
     *
     * @param string $historyFilePath History file path.
-     * @param int    $retentionTime   History content rentention time in seconds.
+     * @param int    $retentionTime   History content retention time in seconds.
     *
     * @throws Exception if something goes wrong.
     */
@@ -166,11 +170,11 @@ class History
     */
    protected function check()
    {
-        if (! is_file($this->historyFilePath)) {
+        if (!is_file($this->historyFilePath)) {
            FileUtils::writeFlatDB($this->historyFilePath, []);
        }
-        if (! is_writable($this->historyFilePath)) {
+        if (!is_writable($this->historyFilePath)) {
            throw new Exception(t('History file isn\'t readable or writable'));
        }
    }
@@ -191,7 +195,7 @@ class History
     */
    protected function write()
    {
-        $comparaison = new DateTime('-'. $this->retentionTime . ' seconds');
+        $comparaison = new DateTime('-' . $this->retentionTime . ' seconds');
        foreach ($this->history as $key => $value) {
            if ($value['datetime'] < $comparaison) {
                unset($this->history[$key]);
diff --git a/application/Languages.php b/application/Languages.php
index b9c5d0e8..5cda802e 100644
--- a/application/Languages.php
+++ b/application/Languages.php
@@ -3,7 +3,6 @@
 namespace Shaarli;
 use Gettext\GettextTranslator;
-use Gettext\Merge;
 use Gettext\Translations;
 use Gettext\Translator;
 use Gettext\TranslatorInterface;
diff --git a/application/Router.php b/application/Router.php
index beb3165b..d7187487 100644
--- a/application/Router.php
+++ b/application/Router.php
@@ -1,4 +1,5 @@
 <?php
+namespace Shaarli;
 /**
 * Class Router
@@ -37,6 +38,8 @@ class Router
    public static $PAGE_DELETELINK = 'delete_link';
+    public static $PAGE_CHANGE_VISIBILITY = 'change_visibility';
    public static $PAGE_PINLINK = 'pin';
    public static $PAGE_EXPORT = 'export';
@@ -75,43 +78,43 @@ class Router
            return self::$PAGE_LINKLIST;
        }
-        if (startsWith($query, 'do='. self::$PAGE_LOGIN) && $loggedIn === false) {
+        if (startsWith($query, 'do=' . self::$PAGE_LOGIN) && $loggedIn === false) {
            return self::$PAGE_LOGIN;
        }
-        if (startsWith($query, 'do='. self::$PAGE_PICWALL)) {
+        if (startsWith($query, 'do=' . self::$PAGE_PICWALL)) {
            return self::$PAGE_PICWALL;
        }
-        if (startsWith($query, 'do='. self::$PAGE_TAGCLOUD)) {
+        if (startsWith($query, 'do=' . self::$PAGE_TAGCLOUD)) {
            return self::$PAGE_TAGCLOUD;
        }
-        if (startsWith($query, 'do='. self::$PAGE_TAGLIST)) {
+        if (startsWith($query, 'do=' . self::$PAGE_TAGLIST)) {
            return self::$PAGE_TAGLIST;
        }
-        if (startsWith($query, 'do='. self::$PAGE_OPENSEARCH)) {
+        if (startsWith($query, 'do=' . self::$PAGE_OPENSEARCH)) {
            return self::$PAGE_OPENSEARCH;
        }
-        if (startsWith($query, 'do='. self::$PAGE_DAILY)) {
+        if (startsWith($query, 'do=' . self::$PAGE_DAILY)) {
            return self::$PAGE_DAILY;
        }
-        if (startsWith($query, 'do='. self::$PAGE_FEED_ATOM)) {
+        if (startsWith($query, 'do=' . self::$PAGE_FEED_ATOM)) {
            return self::$PAGE_FEED_ATOM;
        }
-        if (startsWith($query, 'do='. self::$PAGE_FEED_RSS)) {
+        if (startsWith($query, 'do=' . self::$PAGE_FEED_RSS)) {
            return self::$PAGE_FEED_RSS;
        }
-        if (startsWith($query, 'do='. self::$PAGE_THUMBS_UPDATE)) {
+        if (startsWith($query, 'do=' . self::$PAGE_THUMBS_UPDATE)) {
            return self::$PAGE_THUMBS_UPDATE;
        }
-        if (startsWith($query, 'do='. self::$AJAX_THUMB_UPDATE)) {
+        if (startsWith($query, 'do=' . self::$AJAX_THUMB_UPDATE)) {
            return self::$AJAX_THUMB_UPDATE;
        }
@@ -120,23 +123,23 @@ class Router
            return self::$PAGE_LINKLIST;
        }
-        if (startsWith($query, 'do='. self::$PAGE_TOOLS)) {
+        if (startsWith($query, 'do=' . self::$PAGE_TOOLS)) {
            return self::$PAGE_TOOLS;
        }
-        if (startsWith($query, 'do='. self::$PAGE_CHANGEPASSWORD)) {
+        if (startsWith($query, 'do=' . self::$PAGE_CHANGEPASSWORD)) {
            return self::$PAGE_CHANGEPASSWORD;
        }
-        if (startsWith($query, 'do='. self::$PAGE_CONFIGURE)) {
+        if (startsWith($query, 'do=' . self::$PAGE_CONFIGURE)) {
            return self::$PAGE_CONFIGURE;
        }
-        if (startsWith($query, 'do='. self::$PAGE_CHANGETAG)) {
+        if (startsWith($query, 'do=' . self::$PAGE_CHANGETAG)) {
            return self::$PAGE_CHANGETAG;
        }
-        if (startsWith($query, 'do='. self::$PAGE_ADDLINK)) {
+        if (startsWith($query, 'do=' . self::$PAGE_ADDLINK)) {
            return self::$PAGE_ADDLINK;
        }
@@ -148,27 +151,31 @@ class Router
            return self::$PAGE_DELETELINK;
        }
-        if (startsWith($query, 'do='. self::$PAGE_PINLINK)) {
+        if (isset($get[self::$PAGE_CHANGE_VISIBILITY])) {
+            return self::$PAGE_CHANGE_VISIBILITY;
+        }
+        if (startsWith($query, 'do=' . self::$PAGE_PINLINK)) {
            return self::$PAGE_PINLINK;
        }
-        if (startsWith($query, 'do='. self::$PAGE_EXPORT)) {
+        if (startsWith($query, 'do=' . self::$PAGE_EXPORT)) {
            return self::$PAGE_EXPORT;
        }
-        if (startsWith($query, 'do='. self::$PAGE_IMPORT)) {
+        if (startsWith($query, 'do=' . self::$PAGE_IMPORT)) {
            return self::$PAGE_IMPORT;
        }
-        if (startsWith($query, 'do='. self::$PAGE_PLUGINSADMIN)) {
+        if (startsWith($query, 'do=' . self::$PAGE_PLUGINSADMIN)) {
            return self::$PAGE_PLUGINSADMIN;
        }
-        if (startsWith($query, 'do='. self::$PAGE_SAVE_PLUGINSADMIN)) {
+        if (startsWith($query, 'do=' . self::$PAGE_SAVE_PLUGINSADMIN)) {
            return self::$PAGE_SAVE_PLUGINSADMIN;
        }
-        if (startsWith($query, 'do='. self::$GET_TOKEN)) {
+        if (startsWith($query, 'do=' . self::$GET_TOKEN)) {
            return self::$GET_TOKEN;
        }
diff --git a/application/Thumbnailer.php b/application/Thumbnailer.php
index 167d6296..d5f5ac28 100644
--- a/application/Thumbnailer.php
+++ b/application/Thumbnailer.php
@@ -3,9 +3,9 @@
 namespace Shaarli;
 use Shaarli\Config\ConfigManager;
+use WebThumbnailer\Application\ConfigManager as WTConfigManager;
 use WebThumbnailer\Exception\WebThumbnailerException;
 use WebThumbnailer\WebThumbnailer;
-use WebThumbnailer\Application\ConfigManager as WTConfigManager;
 /**
 * Class Thumbnailer
diff --git a/application/api/ApiMiddleware.php b/application/api/ApiMiddleware.php
index 66eac133..2d55bda6 100644
--- a/application/api/ApiMiddleware.php
+++ b/application/api/ApiMiddleware.php
@@ -1,9 +1,8 @@
 <?php
 namespace Shaarli\Api;
-use Shaarli\Api\Exceptions\ApiException;
 use Shaarli\Api\Exceptions\ApiAuthorizationException;
+use Shaarli\Api\Exceptions\ApiException;
 use Shaarli\Config\ConfigManager;
 use Slim\Container;
 use Slim\Http\Request;
@@ -127,12 +126,10 @@ class ApiMiddleware
     */
    protected function setLinkDb($conf)
    {
-        $linkDb = new \LinkDB(
+        $linkDb = new \Shaarli\Bookmark\LinkDB(
            $conf->get('resource.datastore'),
            true,
-            $conf->get('privacy.hide_public_links'),
+            $conf->get('privacy.hide_public_links')
-            $conf->get('redirector.url'),
-            $conf->get('redirector.encode_url')
        );
        $this->container['db'] = $linkDb;
    }
diff --git a/application/api/ApiUtils.php b/application/api/ApiUtils.php
index fc5ecaf1..1e3ac02e 100644
--- a/application/api/ApiUtils.php
+++ b/application/api/ApiUtils.php
@@ -1,8 +1,8 @@
 <?php
 namespace Shaarli\Api;
-use Shaarli\Base64Url;
 use Shaarli\Api\Exceptions\ApiAuthorizationException;
+use Shaarli\Http\Base64Url;
 /**
 * REST API utilities
@@ -12,7 +12,7 @@ class ApiUtils
    /**
     * Validates a JWT token authenticity.
     *
-     * @param string $token JWT token extracted from the headers.
+     * @param string $token  JWT token extracted from the headers.
     * @param string $secret API secret set in the settings.
     *
     * @throws ApiAuthorizationException the token is not valid.
@@ -50,7 +50,7 @@ class ApiUtils
    /**
     * Format a Link for the REST API.
     *
-     * @param array $link Link data read from the datastore.
+     * @param array  $link     Link data read from the datastore.
     * @param string $indexUrl Shaarli's index URL (used for relative URL).
     *
     * @return array Link data formatted for the REST API.
@@ -59,7 +59,7 @@ class ApiUtils
    {
        $out['id'] = $link['id'];
        // Not an internal link
-        if ($link['url'][0] != '?') {
+        if (! is_note($link['url'])) {
            $out['url'] = $link['url'];
        } else {
            $out['url'] = $indexUrl . $link['url'];
diff --git a/application/api/controllers/ApiController.php b/application/api/controllers/ApiController.php
index 9edefcf6..a6e7cbab 100644
--- a/application/api/controllers/ApiController.php
+++ b/application/api/controllers/ApiController.php
@@ -2,8 +2,9 @@
 namespace Shaarli\Api\Controllers;
+use Shaarli\Bookmark\LinkDB;
 use Shaarli\Config\ConfigManager;
-use \Slim\Container;
+use Slim\Container;
 /**
 * Abstract Class ApiController
@@ -25,12 +26,12 @@ abstract class ApiController
    protected $conf;
    /**
-     * @var \LinkDB
+     * @var LinkDB
     */
    protected $linkDb;
    /**
-     * @var \History
+     * @var HistoryController
     */
    protected $history;
diff --git a/application/api/controllers/History.php b/application/api/controllers/HistoryController.php
index 4582e8b2..9afcfa26 100644
--- a/application/api/controllers/History.php
+++ b/application/api/controllers/HistoryController.php
@@ -14,7 +14,7 @@ use Slim\Http\Response;
 *
 * @package Shaarli\Api\Controllers
 */
-class History extends ApiController
+class HistoryController extends ApiController
 {
    /**
     * Service providing operation regarding Shaarli datastore and settings.
diff --git a/application/api/controllers/Tags.php b/application/api/controllers/Tags.php
index 6dd78750..82f3ef74 100644
--- a/application/api/controllers/Tags.php
+++ b/application/api/controllers/Tags.php
@@ -4,7 +4,6 @@ namespace Shaarli\Api\Controllers;
 use Shaarli\Api\ApiUtils;
 use Shaarli\Api\Exceptions\ApiBadParametersException;
-use Shaarli\Api\Exceptions\ApiLinkNotFoundException;
 use Shaarli\Api\Exceptions\ApiTagNotFoundException;
 use Slim\Http\Request;
 use Slim\Http\Response;
diff --git a/application/api/exceptions/ApiLinkNotFoundException.php b/application/api/exceptions/ApiLinkNotFoundException.php
index c727f4f0..7c2bb56e 100644
--- a/application/api/exceptions/ApiLinkNotFoundException.php
+++ b/application/api/exceptions/ApiLinkNotFoundException.php
@@ -2,8 +2,6 @@
 namespace Shaarli\Api\Exceptions;
-use Slim\Http\Response;
 /**
 * Class ApiLinkNotFoundException
 *
diff --git a/application/api/exceptions/ApiTagNotFoundException.php b/application/api/exceptions/ApiTagNotFoundException.php
index eee152fe..66ace8bf 100644
--- a/application/api/exceptions/ApiTagNotFoundException.php
+++ b/application/api/exceptions/ApiTagNotFoundException.php
@@ -2,8 +2,6 @@
 namespace Shaarli\Api\Exceptions;
-use Slim\Http\Response;
 /**
 * Class ApiTagNotFoundException
 *
diff --git a/application/LinkDB.php b/application/bookmark/LinkDB.php
index 803757ca..76ba95f0 100644
--- a/application/LinkDB.php
+++ b/application/bookmark/LinkDB.php
@@ -1,4 +1,15 @@
 <?php
+namespace Shaarli\Bookmark;
+use ArrayAccess;
+use Countable;
+use DateTime;
+use Iterator;
+use Shaarli\Bookmark\Exception\LinkNotFoundException;
+use Shaarli\Exceptions\IOException;
+use Shaarli\FileUtils;
 /**
 * Data storage for links.
 *
@@ -18,10 +29,10 @@
 *  - private:  Is this link private? 0=no, other value=yes
 *  - tags:     tags attached to this entry (separated by spaces)
 *  - title     Title of the link
- *  - url       URL of the link. Used for displayable links (no redirector, relative, etc.).
+ *  - url       URL of the link. Used for displayable links.
- *              Can be absolute or relative.
+ *              Can be absolute or relative in the database but the relative links
- *              Relative URLs are permalinks (e.g.'?m-ukcw')
+ *              will be converted to absolute ones in templates.
- *  - real_url  Absolute processed URL.
+ *  - real_url  Raw URL in stored in the DB (absolute or relative).
 *  - shorturl  Permalink smallhash
 *
 * Implements 3 interfaces:
@@ -77,19 +88,6 @@ class LinkDB implements Iterator, Countable, ArrayAccess
    // Hide public links
    private $hidePublicLinks;
-    // link redirector set in user settings.
-    private $redirector;
-    /**
-     * Set this to `true` to urlencode link behind redirector link, `false` to leave it untouched.
-     *
-     * Example:
-     *   anonym.to needs clean URL while dereferer.org needs urlencoded URL.
-     *
-     * @var boolean $redirectorEncode parameter: true or false
-     */
-    private $redirectorEncode;
    /**
     * Creates a new LinkDB
     *
@@ -98,21 +96,16 @@ class LinkDB implements Iterator, Countable, ArrayAccess
     * @param string  $datastore        datastore file path.
     * @param boolean $isLoggedIn       is the user logged in?
     * @param boolean $hidePublicLinks  if true all links are private.
-     * @param string  $redirector       link redirector set in user settings.
-     * @param boolean $redirectorEncode Enable urlencode on redirected urls (default: true).
     */
    public function __construct(
        $datastore,
        $isLoggedIn,
-        $hidePublicLinks,
+        $hidePublicLinks
-        $redirector = '',
-        $redirectorEncode = true
    ) {
        $this->datastore = $datastore;
        $this->loggedIn = $isLoggedIn;
        $this->hidePublicLinks = $hidePublicLinks;
-        $this->redirector = $redirector;
-        $this->redirectorEncode = $redirectorEncode === true;
        $this->check();
        $this->read();
    }
@@ -137,7 +130,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
        if (!isset($value['id']) || empty($value['url'])) {
            die(t('Internal Error: A link should always have an id and URL.'));
        }
-        if (($offset !== null && ! is_int($offset)) || ! is_int($value['id'])) {
+        if (($offset !== null && !is_int($offset)) || !is_int($value['id'])) {
            die(t('You must specify an integer as a key.'));
        }
        if ($offset !== null && $offset !== $value['id']) {
@@ -247,19 +240,19 @@ class LinkDB implements Iterator, Countable, ArrayAccess
        $this->links = array();
        $link = array(
            'id' => 1,
-            'title'=> t('The personal, minimalist, super-fast, database free, bookmarking service'),
+            'title' => t('The personal, minimalist, super-fast, database free, bookmarking service'),
-            'url'=>'https://shaarli.readthedocs.io',
+            'url' => 'https://shaarli.readthedocs.io',
-            'description'=>t(
+            'description' => t(
                'Welcome to Shaarli! This is your first public bookmark. '
-                .'To edit or delete me, you must first login.
+                . 'To edit or delete me, you must first login.
 To learn how to use Shaarli, consult the link "Documentation" at the bottom of this page.
 You use the community supported version of the original Shaarli project, by Sebastien Sauvage.'
            ),
-            'private'=>0,
+            'private' => 0,
-            'created'=> new DateTime(),
+            'created' => new DateTime(),
-            'tags'=>'opensource software',
+            'tags' => 'opensource software',
            'sticky' => false,
        );
        $link['shorturl'] = link_small_hash($link['created'], $link['id']);
@@ -267,12 +260,12 @@ You use the community supported version of the original Shaarli project, by Seba
        $link = array(
            'id' => 0,
-            'title'=> t('My secret stuff... - Pastebin.com'),
+            'title' => t('My secret stuff... - Pastebin.com'),
-            'url'=>'http://sebsauvage.net/paste/?8434b27936c09649#bR7XsXhoTiLcqCpQbmOpBi3rq2zzQUC5hBI7ZT1O3x8=',
+            'url' => 'http://sebsauvage.net/paste/?8434b27936c09649#bR7XsXhoTiLcqCpQbmOpBi3rq2zzQUC5hBI7ZT1O3x8=',
-            'description'=> t('Shhhh! I\'m a private link only YOU can see. You can delete me too.'),
+            'description' => t('Shhhh! I\'m a private link only YOU can see. You can delete me too.'),
-            'private'=>1,
+            'private' => 1,
-            'created'=> new DateTime('1 minute ago'),
+            'created' => new DateTime('1 minute ago'),
-            'tags'=>'secretstuff',
+            'tags' => 'secretstuff',
            'sticky' => false,
        );
        $link['shorturl'] = link_small_hash($link['created'], $link['id']);
@@ -299,7 +292,7 @@ You use the community supported version of the original Shaarli project, by Seba
        $toremove = array();
        foreach ($this->links as $key => &$link) {
-            if (! $this->loggedIn && $link['private'] != 0) {
+            if (!$this->loggedIn && $link['private'] != 0) {
                // Transition for not upgraded databases.
                unset($this->links[$key]);
                continue;
@@ -309,29 +302,19 @@ You use the community supported version of the original Shaarli project, by Seba
            sanitizeLink($link);
            // Remove private tags if the user is not logged in.
-            if (! $this->loggedIn) {
+            if (!$this->loggedIn) {
                $link['tags'] = preg_replace('/(^|\s+)\.[^($|\s)]+\s*/', ' ', $link['tags']);
            }
-            // Do not use the redirector for internal links (Shaarli note URL starting with a '?').
+            $link['real_url'] = $link['url'];
-            if (!empty($this->redirector) && !startsWith($link['url'], '?')) {
-                $link['real_url'] = $this->redirector;
-                if ($this->redirectorEncode) {
-                    $link['real_url'] .= urlencode(unescape($link['url']));
-                } else {
-                    $link['real_url'] .= $link['url'];
-                }
-            } else {
-                $link['real_url'] = $link['url'];
-            }
            $link['sticky'] = isset($link['sticky']) ? $link['sticky'] : false;
            // To be able to load links before running the update, and prepare the update
-            if (! isset($link['created'])) {
+            if (!isset($link['created'])) {
                $link['id'] = $link['linkdate'];
                $link['created'] = DateTime::createFromFormat(self::LINK_DATE_FORMAT, $link['linkdate']);
-                if (! empty($link['updated'])) {
+                if (!empty($link['updated'])) {
                    $link['updated'] = DateTime::createFromFormat(self::LINK_DATE_FORMAT, $link['updated']);
                }
                $link['shorturl'] = smallHash($link['linkdate']);
@@ -417,12 +400,12 @@ You use the community supported version of the original Shaarli project, by Seba
    /**
     * Filter links according to search parameters.
     *
-     * @param array  $filterRequest Search request content. Supported keys:
+     * @param array  $filterRequest  Search request content. Supported keys:
     *                                - searchtags: list of tags
     *                                - searchterm: term search
-     * @param bool   $casesensitive Optional: Perform case sensitive filter
+     * @param bool   $casesensitive  Optional: Perform case sensitive filter
-     * @param string $visibility    return only all/private/public links
+     * @param string $visibility     return only all/private/public links
-     * @param string $untaggedonly  return only untagged links
+     * @param bool   $untaggedonly   return only untagged links
     *
     * @return array filtered links, all links if no suitable filter was provided.
     */
@@ -432,6 +415,7 @@ You use the community supported version of the original Shaarli project, by Seba
        $visibility = 'all',
        $untaggedonly = false
    ) {
        // Filter link database according to parameters.
        $searchtags = isset($filterRequest['searchtags']) ? escape($filterRequest['searchtags']) : '';
        $searchterm = isset($filterRequest['searchterm']) ? escape($filterRequest['searchterm']) : '';
@@ -447,8 +431,8 @@ You use the community supported version of the original Shaarli project, by Seba
    /**
     * Returns the list tags appearing in the links with the given tags
     *
-     * @param array $filteringTags tags selecting the links to consider
+     * @param array  $filteringTags tags selecting the links to consider
-     * @param string $visibility   process only all/private/public links
+     * @param string $visibility    process only all/private/public links
     *
     * @return array tag => linksCount
     */
diff --git a/application/LinkFilter.php b/application/bookmark/LinkFilter.php
index 8f147974..9b966307 100644
--- a/application/LinkFilter.php
+++ b/application/bookmark/LinkFilter.php
@@ -1,5 +1,10 @@
 <?php
+namespace Shaarli\Bookmark;
+use Exception;
+use Shaarli\Bookmark\Exception\LinkNotFoundException;
 /**
 * Class LinkFilter.
 *
@@ -10,22 +15,22 @@ class LinkFilter
    /**
     * @var string permalinks.
     */
-    public static $FILTER_HASH   = 'permalink';
+    public static $FILTER_HASH = 'permalink';
    /**
     * @var string text search.
     */
-    public static $FILTER_TEXT   = 'fulltext';
+    public static $FILTER_TEXT = 'fulltext';
    /**
     * @var string tag filter.
     */
-    public static $FILTER_TAG    = 'tags';
+    public static $FILTER_TAG = 'tags';
    /**
     * @var string filter by day.
     */
-    public static $FILTER_DAY    = 'FILTER_DAY';
+    public static $FILTER_DAY = 'FILTER_DAY';
    /**
     * @var string Allowed characters for hashtags (regex syntax).
@@ -58,7 +63,7 @@ class LinkFilter
     */
    public function filter($type, $request, $casesensitive = false, $visibility = 'all', $untaggedonly = false)
    {
-        if (! in_array($visibility, ['all', 'public', 'private'])) {
+        if (!in_array($visibility, ['all', 'public', 'private'])) {
            $visibility = 'all';
        }
@@ -117,7 +122,7 @@ class LinkFilter
        foreach ($this->links as $key => $value) {
            if ($value['private'] && $visibility === 'private') {
                $out[$key] = $value;
-            } elseif (! $value['private'] && $visibility === 'public') {
+            } elseif (!$value['private'] && $visibility === 'public') {
                $out[$key] = $value;
            }
        }
@@ -132,7 +137,7 @@ class LinkFilter
     *
     * @return array $filtered array containing permalink data.
     *
-     * @throws LinkNotFoundException if the smallhash doesn't match any link.
+     * @throws \Shaarli\Bookmark\Exception\LinkNotFoundException if the smallhash doesn't match any link.
     */
    private function filterSmallHash($smallHash)
    {
@@ -169,7 +174,7 @@ class LinkFilter
     *  - see https://github.com/shaarli/Shaarli/issues/75 for examples
     *
     * @param string $searchterms search query.
-     * @param string $visibility Optional: return only all/private/public links.
+     * @param string $visibility  Optional: return only all/private/public links.
     *
     * @return array search results.
     */
@@ -207,7 +212,7 @@ class LinkFilter
        foreach ($this->links as $id => $link) {
            // ignore non private links when 'privatonly' is on.
            if ($visibility !== 'all') {
-                if (! $link['private'] && $visibility === 'private') {
+                if (!$link['private'] && $visibility === 'private') {
                    continue;
                } elseif ($link['private'] && $visibility === 'public') {
                    continue;
@@ -250,7 +255,9 @@ class LinkFilter
    /**
     * generate a regex fragment out of a tag
+     *
     * @param string $tag to to generate regexs from. may start with '-' to negate, contain '*' as wildcard
+     *
     * @return string generated regex fragment
     */
    private static function tag2regex($tag)
@@ -334,7 +341,7 @@ class LinkFilter
            // check level of visibility
            // ignore non private links when 'privateonly' is on.
            if ($visibility !== 'all') {
-                if (! $link['private'] && $visibility === 'private') {
+                if (!$link['private'] && $visibility === 'private') {
                    continue;
                } elseif ($link['private'] && $visibility === 'public') {
                    continue;
@@ -377,7 +384,7 @@ class LinkFilter
        $filtered = [];
        foreach ($this->links as $key => $link) {
            if ($visibility !== 'all') {
-                if (! $link['private'] && $visibility === 'private') {
+                if (!$link['private'] && $visibility === 'private') {
                    continue;
                } elseif ($link['private'] && $visibility === 'public') {
                    continue;
@@ -406,7 +413,7 @@ class LinkFilter
     */
    public function filterDay($day)
    {
-        if (! checkDateFormat('Ymd', $day)) {
+        if (!checkDateFormat('Ymd', $day)) {
            throw new Exception('Invalid date format');
        }
@@ -440,14 +447,3 @@ class LinkFilter
        return preg_split('/\s+/', $tagsOut, -1, PREG_SPLIT_NO_EMPTY);
    }
 }
-class LinkNotFoundException extends Exception
-{
-    /**
-     * LinkNotFoundException constructor.
-     */
-    public function __construct()
-    {
-        $this->message =  t('The link you are trying to reach does not exist or has been deleted.');
-    }
-}
diff --git a/application/LinkUtils.php b/application/bookmark/LinkUtils.php
index d56e019f..77eb2d95 100644
--- a/application/LinkUtils.php
+++ b/application/bookmark/LinkUtils.php
@@ -1,17 +1,31 @@
 <?php
+use Shaarli\Bookmark\LinkDB;
 /**
 * Get cURL callback function for CURLOPT_WRITEFUNCTION
 *
 * @param string $charset     to extract from the downloaded page (reference)
 * @param string $title       to extract from the downloaded page (reference)
- * @param string $curlGetInfo Optionnaly overrides curl_getinfo function
+ * @param string $description to extract from the downloaded page (reference)
+ * @param string $keywords    to extract from the downloaded page (reference)
+ * @param bool   $retrieveDescription Automatically tries to retrieve description and keywords from HTML content
+ * @param string $curlGetInfo Optionally overrides curl_getinfo function
 *
 * @return Closure
 */
-function get_curl_download_callback(&$charset, &$title, $curlGetInfo = 'curl_getinfo')
+function get_curl_download_callback(
-{
+    &$charset,
+    &$title,
+    &$description,
+    &$keywords,
+    $retrieveDescription,
+    $curlGetInfo = 'curl_getinfo'
+) {
    $isRedirected = false;
+    $currentChunk = 0;
+    $foundChunk = null;
    /**
     * cURL callback function for CURLOPT_WRITEFUNCTION (called during the download).
     *
@@ -23,7 +37,18 @@ function get_curl_download_callback(&$charset, &$title, $curlGetInfo = 'curl_get
     *
     * @return int|bool length of $data or false if we need to stop the download
     */
-    return function (&$ch, $data) use ($curlGetInfo, &$charset, &$title, &$isRedirected) {
+    return function (&$ch, $data) use (
+        $retrieveDescription,
+        $curlGetInfo,
+        &$charset,
+        &$title,
+        &$description,
+        &$keywords,
+        &$isRedirected,
+        &$currentChunk,
+        &$foundChunk
+    ) {
+        $currentChunk++;
        $responseCode = $curlGetInfo($ch, CURLINFO_RESPONSE_CODE);
        if (!empty($responseCode) && in_array($responseCode, [301, 302])) {
            $isRedirected = true;
@@ -48,9 +73,34 @@ function get_curl_download_callback(&$charset, &$title, $curlGetInfo = 'curl_get
        }
        if (empty($title)) {
            $title = html_extract_title($data);
+            $foundChunk = ! empty($title) ? $currentChunk : $foundChunk;
+        }
+        if ($retrieveDescription && empty($description)) {
+            $description = html_extract_tag('description', $data);
+            $foundChunk = ! empty($description) ? $currentChunk : $foundChunk;
        }
+        if ($retrieveDescription && empty($keywords)) {
+            $keywords = html_extract_tag('keywords', $data);
+            if (! empty($keywords)) {
+                $foundChunk = $currentChunk;
+                // Keywords use the format tag1, tag2 multiple words, tag
+                // So we format them to match Shaarli's separator and glue multiple words with '-'
+                $keywords = implode(' ', array_map(function($keyword) {
+                    return implode('-', preg_split('/\s+/', trim($keyword)));
+                }, explode(',', $keywords)));
+            }
+        }
        // We got everything we want, stop the download.
-        if (!empty($responseCode) && !empty($contentType) && !empty($charset) && !empty($title)) {
+        // If we already found either the title, description or keywords,
+        // it's highly unlikely that we'll found the other metas further than
+        // in the same chunk of data or the next one. So we also stop the download after that.
+        if ((!empty($responseCode) && !empty($contentType) && !empty($charset)) && $foundChunk !== null
+            && (! $retrieveDescription
+                || $foundChunk < $currentChunk
+                || (!empty($title) && !empty($description) && !empty($keywords))
+            )
+        ) {
            return false;
        }
@@ -109,6 +159,35 @@ function html_extract_charset($html)
 }
 /**
+ * Extract meta tag from HTML content in either:
+ *   - OpenGraph: <meta property="og:[tag]" ...>
+ *   - Meta tag: <meta name="[tag]" ...>
+ *
+ * @param string $tag  Name of the tag to retrieve.
+ * @param string $html HTML content where to look for charset.
+ *
+ * @return bool|string Charset string if found, false otherwise.
+ */
+function html_extract_tag($tag, $html)
+{
+    $propertiesKey = ['property', 'name', 'itemprop'];
+    $properties = implode('|', $propertiesKey);
+    // Try to retrieve OpenGraph image.
+    $ogRegex = '#<meta[^>]+(?:'. $properties .')=["\']?(?:og:)?'. $tag .'["\'\s][^>]*content=["\']?(.*?)["\'/>]#';
+    // If the attributes are not in the order property => content (e.g. Github)
+    // New regex to keep this readable... more or less.
+    $ogRegexReverse = '#<meta[^>]+content=["\']([^"\']+)[^>]+(?:'. $properties .')=["\']?(?:og)?:'. $tag .'["\'\s/>]#';
+    if (preg_match($ogRegex, $html, $matches) > 0
+        || preg_match($ogRegexReverse, $html, $matches) > 0
+    ) {
+        return $matches[1];
+    }
+    return false;
+}
+/**
 * Count private links in given linklist.
 *
 * @param array|Countable $links Linklist.
@@ -131,29 +210,15 @@ function count_private($links)
 * In a string, converts URLs to clickable links.
 *
 * @param string $text       input string.
- * @param string $redirector if a redirector is set, use it to gerenate links.
- * @param bool   $urlEncode  Use `urlencode()` on the URL after the redirector or not.
 *
 * @return string returns $text with all links converted to HTML links.
 *
 * @see Function inspired from http://www.php.net/manual/en/function.preg-replace.php#85722
 */
-function text2clickable($text, $redirector = '', $urlEncode = true)
+function text2clickable($text)
 {
    $regex = '!(((?:https?|ftp|file)://|apt:|magnet:)\S+[a-z0-9\(\)]/?)!si';
+    return preg_replace($regex, '<a href="$1">$1</a>', $text);
-    if (empty($redirector)) {
-        return preg_replace($regex, '<a href="$1">$1</a>', $text);
-    }
-    // Redirector is set, urlencode the final URL.
-    return preg_replace_callback(
-        $regex,
-        function ($matches) use ($redirector, $urlEncode) {
-            $url = $urlEncode ? urlencode($matches[1]) : $matches[1];
-            return '<a href="' . $redirector . $url .'">'. $matches[1] .'</a>';
-        },
-        $text
-    );
 }
 /**
@@ -195,15 +260,13 @@ function space2nbsp($text)
 * Format Shaarli's description
 *
 * @param string $description shaare's description.
- * @param string $redirector  if a redirector is set, use it to gerenate links.
- * @param bool   $urlEncode  Use `urlencode()` on the URL after the redirector or not.
 * @param string $indexUrl    URL to Shaarli's index.
 * @return string formatted description.
 */
-function format_description($description, $redirector = '', $urlEncode = true, $indexUrl = '')
+function format_description($description, $indexUrl = '')
 {
-    return nl2br(space2nbsp(hashtag_autolink(text2clickable($description, $redirector, $urlEncode), $indexUrl)));
+    return nl2br(space2nbsp(hashtag_autolink(text2clickable($description), $indexUrl)));
 }
 /**
@@ -218,3 +281,16 @@ function link_small_hash($date, $id)
 {
    return smallHash($date->format(LinkDB::LINK_DATE_FORMAT) . $id);
 }
+/**
+ * Returns whether or not the link is an internal note.
+ * Its URL starts by `?` because it's actually a permalink.
+ *
+ * @param string $linkUrl
+ *
+ * @return bool true if internal note, false otherwise.
+ */
+function is_note($linkUrl)
+{
+    return isset($linkUrl[0]) && $linkUrl[0] === '?';
+}
diff --git a/application/bookmark/exception/LinkNotFoundException.php b/application/bookmark/exception/LinkNotFoundException.php
new file mode 100644
index 00000000..f9414428
--- /dev/null
+++ b/application/bookmark/exception/LinkNotFoundException.php
@@ -0,0 +1,15 @@
+<?php
+namespace Shaarli\Bookmark\Exception;
+use Exception;
+class LinkNotFoundException extends Exception
+{
+    /**
+     * LinkNotFoundException constructor.
+     */
+    public function __construct()
+    {
+        $this->message = t('The link you are trying to reach does not exist or has been deleted.');
+    }
+}
diff --git a/application/config/ConfigJson.php b/application/config/ConfigJson.php
index 8c8d5610..4509357c 100644
--- a/application/config/ConfigJson.php
+++ b/application/config/ConfigJson.php
@@ -47,7 +47,7 @@ class ConfigJson implements ConfigIO
        $print = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0;
        $data = self::getPhpHeaders() . json_encode($conf, $print) . self::getPhpSuffix();
        if (!file_put_contents($filepath, $data)) {
-            throw new \IOException(
+            throw new \Shaarli\Exceptions\IOException(
                $filepath,
                t('Shaarli could not create the config file. '.
                  'Please make sure Shaarli has the right to write in the folder is it installed in.')
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php
index 32aaea48..c95e6800 100644
--- a/application/config/ConfigManager.php
+++ b/application/config/ConfigManager.php
@@ -207,7 +207,7 @@ class ConfigManager
     *
     * @throws MissingFieldConfigException: a mandatory field has not been provided in $conf.
     * @throws UnauthorizedConfigException: user is not authorize to change configuration.
-     * @throws \IOException: an error occurred while writing the new config file.
+     * @throws \Shaarli\Exceptions\IOException: an error occurred while writing the new config file.
     */
    public function write($isLoggedIn)
    {
@@ -221,7 +221,6 @@ class ConfigManager
            'general.title',
            'general.header_link',
            'privacy.default_private_links',
-            'redirector.url',
        );
        // Only logged in user can alter config.
@@ -366,6 +365,7 @@ class ConfigManager
        $this->setEmpty('general.links_per_page', 20);
        $this->setEmpty('general.enabled_plugins', self::$DEFAULT_PLUGINS);
        $this->setEmpty('general.default_note_title', 'Note: ');
+        $this->setEmpty('general.retrieve_description', false);
        $this->setEmpty('updates.check_updates', false);
        $this->setEmpty('updates.check_updates_branch', 'stable');
@@ -381,9 +381,6 @@ class ConfigManager
        // default state of the 'remember me' checkbox of the login form
        $this->setEmpty('privacy.remember_user_default', true);
-        $this->setEmpty('redirector.url', '');
-        $this->setEmpty('redirector.encode_url', true);
        $this->setEmpty('thumbnails.width', '125');
        $this->setEmpty('thumbnails.height', '90');
diff --git a/application/config/ConfigPhp.php b/application/config/ConfigPhp.php
index 9625fe1a..cad34594 100644
--- a/application/config/ConfigPhp.php
+++ b/application/config/ConfigPhp.php
@@ -27,7 +27,7 @@ class ConfigPhp implements ConfigIO
    /**
     * Map legacy config keys with the new ones.
     * If ConfigPhp is used, getting <newkey> will actually look for <legacykey>.
-     * The Updater will use this array to transform keys when switching to JSON.
+     * The updater will use this array to transform keys when switching to JSON.
     *
     * @var array current key => legacy key.
     */
@@ -124,7 +124,7 @@ class ConfigPhp implements ConfigIO
        if (!file_put_contents($filepath, $configStr)
            || strcmp(file_get_contents($filepath), $configStr) != 0
        ) {
-            throw new \IOException(
+            throw new \Shaarli\Exceptions\IOException(
                $filepath,
                t('Shaarli could not create the config file. '.
                  'Please make sure Shaarli has the right to write in the folder is it installed in.')
diff --git a/application/exceptions/IOException.php b/application/exceptions/IOException.php
index 18e46b77..2aa25e5c 100644
--- a/application/exceptions/IOException.php
+++ b/application/exceptions/IOException.php
@@ -1,4 +1,7 @@
 <?php
+namespace Shaarli\Exceptions;
+use Exception;
 /**
 * Exception class thrown when a filesystem access failure happens
@@ -17,6 +20,6 @@ class IOException extends Exception
    {
        $this->path = $path;
        $this->message = empty($message) ? t('Error accessing') : $message;
-        $this->message .= ' "' . $this->path .'"';
+        $this->message .= ' "' . $this->path . '"';
    }
 }
diff --git a/application/Cache.php b/application/feed/Cache.php
index e5d43e61..e5d43e61 100644
--- a/application/Cache.php
+++ b/application/feed/Cache.php
diff --git a/application/CachedPage.php b/application/feed/CachedPage.php
index e11cc52d..d809bdd9 100644
--- a/application/CachedPage.php
+++ b/application/feed/CachedPage.php
@@ -1,4 +1,7 @@
 <?php
+namespace Shaarli\Feed;
 /**
 * Simple cache system, mainly for the RSS/ATOM feeds
 */
@@ -24,7 +27,7 @@ class CachedPage
    {
        // TODO: check write access to the cache directory
        $this->cacheDir = $cacheDir;
-        $this->filename = $this->cacheDir.'/'.sha1($url).'.cache';
+        $this->filename = $this->cacheDir . '/' . sha1($url) . '.cache';
        $this->shouldBeCached = $shouldBeCached;
    }
diff --git a/application/FeedBuilder.php b/application/feed/FeedBuilder.php
index 73fafcbe..7c859474 100644
--- a/application/FeedBuilder.php
+++ b/application/feed/FeedBuilder.php
@@ -1,4 +1,7 @@
 <?php
+namespace Shaarli\Feed;
+use DateTime;
 /**
 * FeedBuilder class.
@@ -28,7 +31,7 @@ class FeedBuilder
    public static $DEFAULT_NB_LINKS = 50;
    /**
-     * @var LinkDB instance.
+     * @var \Shaarli\Bookmark\LinkDB instance.
     */
    protected $linkDB;
@@ -38,12 +41,12 @@ class FeedBuilder
    protected $feedType;
    /**
-     * @var array $_SERVER.
+     * @var array $_SERVER
     */
    protected $serverInfo;
    /**
-     * @var array $_GET.
+     * @var array $_GET
     */
    protected $userInput;
@@ -75,11 +78,12 @@ class FeedBuilder
    /**
     * Feed constructor.
     *
-     * @param LinkDB  $linkDB        LinkDB instance.
+     * @param \Shaarli\Bookmark\LinkDB $linkDB     LinkDB instance.
-     * @param string  $feedType      Type of feed.
+     * @param string                   $feedType   Type of feed.
-     * @param array   $serverInfo    $_SERVER.
+     * @param array                    $serverInfo $_SERVER.
-     * @param array   $userInput     $_GET.
+     * @param array                    $userInput  $_GET.
-     * @param boolean $isLoggedIn True if the user is currently logged in, false otherwise.
+     * @param boolean                  $isLoggedIn True if the user is currently logged in,
+     *                                             false otherwise.
     */
    public function __construct($linkDB, $feedType, $serverInfo, $userInput, $isLoggedIn)
    {
@@ -124,7 +128,7 @@ class FeedBuilder
        $data['show_dates'] = !$this->hideDates || $this->isLoggedIn;
        // Remove leading slash from REQUEST_URI.
        $data['self_link'] = escape(server_url($this->serverInfo))
-                           . escape($this->serverInfo['REQUEST_URI']);
+            . escape($this->serverInfo['REQUEST_URI']);
        $data['index_url'] = $pageaddr;
        $data['usepermalinks'] = $this->usePermalinks === true;
        $data['links'] = $linkDisplayed;
@@ -142,18 +146,18 @@ class FeedBuilder
     */
    protected function buildItem($link, $pageaddr)
    {
-        $link['guid'] = $pageaddr .'?'. $link['shorturl'];
+        $link['guid'] = $pageaddr . '?' . $link['shorturl'];
-        // Check for both signs of a note: starting with ? and 7 chars long.
+        // Prepend the root URL for notes
-        if ($link['url'][0] === '?' && strlen($link['url']) === 7) {
+        if (is_note($link['url'])) {
            $link['url'] = $pageaddr . $link['url'];
        }
        if ($this->usePermalinks === true) {
-            $permalink = '<a href="'. $link['url'] .'" title="'. t('Direct link') .'">'. t('Direct link') .'</a>';
+            $permalink = '<a href="' . $link['url'] . '" title="' . t('Direct link') . '">' . t('Direct link') . '</a>';
        } else {
-            $permalink = '<a href="'. $link['guid'] .'" title="'. t('Permalink') .'">'. t('Permalink') .'</a>';
+            $permalink = '<a href="' . $link['guid'] . '" title="' . t('Permalink') . '">' . t('Permalink') . '</a>';
        }
-        $link['description']  = format_description($link['description'], '', false, $pageaddr);
+        $link['description'] = format_description($link['description'], $pageaddr);
-        $link['description'] .= PHP_EOL .'<br>&#8212; '. $permalink;
+        $link['description'] .= PHP_EOL . '<br>&#8212; ' . $permalink;
        $pubDate = $link['created'];
        $link['pub_iso_date'] = $this->getIsoDate($pubDate);
@@ -164,7 +168,6 @@ class FeedBuilder
            $link['up_iso_date'] = $this->getIsoDate($upDate, DateTime::ATOM);
        } else {
            $link['up_iso_date'] = $this->getIsoDate($pubDate, DateTime::ATOM);
-            ;
        }
        // Save the more recent item.
@@ -223,11 +226,11 @@ class FeedBuilder
    public function getTypeLanguage()
    {
        // Use the locale do define the language, if available.
-        if (! empty($this->locale) && preg_match('/^\w{2}[_\-]\w{2}/', $this->locale)) {
+        if (!empty($this->locale) && preg_match('/^\w{2}[_\-]\w{2}/', $this->locale)) {
-            $length = ($this->feedType == self::$FEED_RSS) ? 5 : 2;
+            $length = ($this->feedType === self::$FEED_RSS) ? 5 : 2;
            return str_replace('_', '-', substr($this->locale, 0, $length));
        }
-        return ($this->feedType == self::$FEED_RSS) ? 'en-en' : 'en';
+        return ($this->feedType === self::$FEED_RSS) ? 'en-en' : 'en';
    }
    /**
@@ -287,7 +290,7 @@ class FeedBuilder
        }
        $intNb = intval($this->userInput['nb']);
-        if (! is_int($intNb) || $intNb == 0) {
+        if (!is_int($intNb) || $intNb == 0) {
            return self::$DEFAULT_NB_LINKS;
        }
diff --git a/application/Base64Url.php b/application/http/Base64Url.php
index 54d0fcd5..33fa7c1f 100644
--- a/application/Base64Url.php
+++ b/application/http/Base64Url.php
@@ -1,6 +1,6 @@
 <?php
-namespace Shaarli;
+namespace Shaarli\Http;
 /**
 * URL-safe Base64 operations
diff --git a/application/HttpUtils.php b/application/http/HttpUtils.php
index 9c438160..2ea9195d 100644
--- a/application/HttpUtils.php
+++ b/application/http/HttpUtils.php
@@ -1,4 +1,7 @@
 <?php
+use Shaarli\Http\Url;
 /**
 * GET an HTTP URL to retrieve its content
 * Uses the cURL library or a fallback method
@@ -38,7 +41,7 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304, $curlWriteF
    $cleanUrl = $urlObj->idnToAscii();
    if (!filter_var($cleanUrl, FILTER_VALIDATE_URL) || !$urlObj->isHttp()) {
-        return array(array(0 => 'Invalid HTTP Url'), false);
+        return array(array(0 => 'Invalid HTTP UrlUtils'), false);
    }
    $userAgent =
diff --git a/application/Url.php b/application/http/Url.php
index 3b7f19c2..90444a2f 100644
--- a/application/Url.php
+++ b/application/http/Url.php
@@ -1,91 +1,6 @@
 <?php
-/**
- * Converts an array-represented URL to a string
- *
- * Source: http://php.net/manual/en/function.parse-url.php#106731
- *
- * @see http://php.net/manual/en/function.parse-url.php
- *
- * @param array $parsedUrl an array-represented URL
- *
- * @return string the string representation of the URL
- */
-function unparse_url($parsedUrl)
-{
-    $scheme   = isset($parsedUrl['scheme']) ? $parsedUrl['scheme'].'://' : '';
-    $host     = isset($parsedUrl['host']) ? $parsedUrl['host'] : '';
-    $port     = isset($parsedUrl['port']) ? ':'.$parsedUrl['port'] : '';
-    $user     = isset($parsedUrl['user']) ? $parsedUrl['user'] : '';
-    $pass     = isset($parsedUrl['pass']) ? ':'.$parsedUrl['pass']  : '';
-    $pass     = ($user || $pass) ? "$pass@" : '';
-    $path     = isset($parsedUrl['path']) ? $parsedUrl['path'] : '';
-    $query    = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : '';
-    $fragment = isset($parsedUrl['fragment']) ? '#'.$parsedUrl['fragment'] : '';
-    return "$scheme$user$pass$host$port$path$query$fragment";
+namespace Shaarli\Http;
-}
-/**
- * Removes undesired query parameters and fragments
- *
- * @param string url Url to be cleaned
- *
- * @return string the string representation of this URL after cleanup
- */
-function cleanup_url($url)
-{
-    $obj_url = new Url($url);
-    return $obj_url->cleanup();
-}
-/**
- * Get URL scheme.
- *
- * @param string url Url for which the scheme is requested
- *
- * @return mixed the URL scheme or false if none is provided.
- */
-function get_url_scheme($url)
-{
-    $obj_url = new Url($url);
-    return $obj_url->getScheme();
-}
-/**
- * Adds a trailing slash at the end of URL if necessary.
- *
- * @param string $url URL to check/edit.
- *
- * @return string $url URL with a end trailing slash.
- */
-function add_trailing_slash($url)
-{
-    return $url . (!endsWith($url, '/') ? '/' : '');
-}
-/**
- * Replace not whitelisted protocols by 'http://' from given URL.
- *
- * @param string $url       URL to clean
- * @param array  $protocols List of allowed protocols (aside from http(s)).
- *
- * @return string URL with allowed protocol
- */
-function whitelist_protocols($url, $protocols)
-{
-    if (startsWith($url, '?') || startsWith($url, '/')) {
-        return $url;
-    }
-    $protocols = array_merge(['http', 'https'], $protocols);
-    $protocol = preg_match('#^(\w+):/?/?#', $url, $match);
-    // Protocol not allowed: we remove it and replace it with http
-    if ($protocol === 1 && ! in_array($match[1], $protocols)) {
-        $url = str_replace($match[0], 'http://', $url);
-    } elseif ($protocol !== 1) {
-        $url = 'http://' . $url;
-    }
-    return $url;
-}
 /**
 * URL representation and cleanup utilities
@@ -182,7 +97,7 @@ class Url
        }
        return $input;
    }
-    
    /**
     * Returns a string representation of this URL
     */
@@ -196,7 +111,7 @@ class Url
     */
    protected function cleanupQuery()
    {
-        if (! isset($this->parts['query'])) {
+        if (!isset($this->parts['query'])) {
            return;
        }
@@ -224,7 +139,7 @@ class Url
     */
    protected function cleanupFragment()
    {
-        if (! isset($this->parts['fragment'])) {
+        if (!isset($this->parts['fragment'])) {
            return;
        }
@@ -257,7 +172,7 @@ class Url
    public function idnToAscii()
    {
        $out = $this->cleanup();
-        if (! function_exists('idn_to_ascii') || ! isset($this->parts['host'])) {
+        if (!function_exists('idn_to_ascii') || !isset($this->parts['host'])) {
            return $out;
        }
        $asciiHost = idn_to_ascii($this->parts['host'], 0, INTL_IDNA_VARIANT_UTS46);
@@ -291,7 +206,7 @@ class Url
    }
    /**
-     * Test if the Url is an HTTP one.
+     * Test if the UrlUtils is an HTTP one.
     *
     * @return true is HTTP, false otherwise.
     */
diff --git a/application/http/UrlUtils.php b/application/http/UrlUtils.php
new file mode 100644
index 00000000..4bc84b82
--- /dev/null
+++ b/application/http/UrlUtils.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Converts an array-represented URL to a string
+ *
+ * Source: http://php.net/manual/en/function.parse-url.php#106731
+ *
+ * @see http://php.net/manual/en/function.parse-url.php
+ *
+ * @param array $parsedUrl an array-represented URL
+ *
+ * @return string the string representation of the URL
+ */
+function unparse_url($parsedUrl)
+{
+    $scheme   = isset($parsedUrl['scheme']) ? $parsedUrl['scheme'].'://' : '';
+    $host     = isset($parsedUrl['host']) ? $parsedUrl['host'] : '';
+    $port     = isset($parsedUrl['port']) ? ':'.$parsedUrl['port'] : '';
+    $user     = isset($parsedUrl['user']) ? $parsedUrl['user'] : '';
+    $pass     = isset($parsedUrl['pass']) ? ':'.$parsedUrl['pass']  : '';
+    $pass     = ($user || $pass) ? "$pass@" : '';
+    $path     = isset($parsedUrl['path']) ? $parsedUrl['path'] : '';
+    $query    = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : '';
+    $fragment = isset($parsedUrl['fragment']) ? '#'.$parsedUrl['fragment'] : '';
+    return "$scheme$user$pass$host$port$path$query$fragment";
+}
+/**
+ * Removes undesired query parameters and fragments
+ *
+ * @param string url UrlUtils to be cleaned
+ *
+ * @return string the string representation of this URL after cleanup
+ */
+function cleanup_url($url)
+{
+    $obj_url = new \Shaarli\Http\Url($url);
+    return $obj_url->cleanup();
+}
+/**
+ * Get URL scheme.
+ *
+ * @param string url UrlUtils for which the scheme is requested
+ *
+ * @return mixed the URL scheme or false if none is provided.
+ */
+function get_url_scheme($url)
+{
+    $obj_url = new \Shaarli\Http\Url($url);
+    return $obj_url->getScheme();
+}
+/**
+ * Adds a trailing slash at the end of URL if necessary.
+ *
+ * @param string $url URL to check/edit.
+ *
+ * @return string $url URL with a end trailing slash.
+ */
+function add_trailing_slash($url)
+{
+    return $url . (!endsWith($url, '/') ? '/' : '');
+}
+/**
+ * Replace not whitelisted protocols by 'http://' from given URL.
+ *
+ * @param string $url       URL to clean
+ * @param array  $protocols List of allowed protocols (aside from http(s)).
+ *
+ * @return string URL with allowed protocol
+ */
+function whitelist_protocols($url, $protocols)
+{
+    if (startsWith($url, '?') || startsWith($url, '/')) {
+        return $url;
+    }
+    $protocols = array_merge(['http', 'https'], $protocols);
+    $protocol = preg_match('#^(\w+):/?/?#', $url, $match);
+    // Protocol not allowed: we remove it and replace it with http
+    if ($protocol === 1 && ! in_array($match[1], $protocols)) {
+        $url = str_replace($match[0], 'http://', $url);
+    } elseif ($protocol !== 1) {
+        $url = 'http://' . $url;
+    }
+    return $url;
+}
diff --git a/application/NetscapeBookmarkUtils.php b/application/netscape/NetscapeBookmarkUtils.php
index 84dd2b20..28665941 100644
--- a/application/NetscapeBookmarkUtils.php
+++ b/application/netscape/NetscapeBookmarkUtils.php
@@ -1,9 +1,16 @@
 <?php
+namespace Shaarli\Netscape;
+use DateTime;
+use DateTimeZone;
+use Exception;
+use Katzgrau\KLogger\Logger;
 use Psr\Log\LogLevel;
+use Shaarli\Bookmark\LinkDB;
 use Shaarli\Config\ConfigManager;
+use Shaarli\History;
 use Shaarli\NetscapeBookmarkParser\NetscapeBookmarkParser;
-use Katzgrau\KLogger\Logger;
 /**
 * Utilities to import and export bookmarks using the Netscape format
@@ -31,8 +38,8 @@ class NetscapeBookmarkUtils
    public static function filterAndFormat($linkDb, $selection, $prependNoteUrl, $indexUrl)
    {
        // see tpl/export.html for possible values
-        if (! in_array($selection, array('all', 'public', 'private'))) {
+        if (!in_array($selection, array('all', 'public', 'private'))) {
-            throw new Exception(t('Invalid export selection:') .' "'.$selection.'"');
+            throw new Exception(t('Invalid export selection:') . ' "' . $selection . '"');
        }
        $bookmarkLinks = array();
@@ -47,7 +54,7 @@ class NetscapeBookmarkUtils
            $link['timestamp'] = $date->getTimestamp();
            $link['taglist'] = str_replace(' ', ',', $link['tags']);
-            if (startsWith($link['url'], '?') && $prependNoteUrl) {
+            if (is_note($link['url']) && $prependNoteUrl) {
                $link['url'] = $indexUrl . $link['url'];
            }
@@ -84,7 +91,7 @@ class NetscapeBookmarkUtils
            $status .= vsprintf(
                t(
                    'was successfully processed in %d seconds: '
-                    .'%d links imported, %d links overwritten, %d links skipped.'
+                    . '%d links imported, %d links overwritten, %d links skipped.'
                ),
                [$duration, $importCount, $overwriteCount, $skipCount]
            );
@@ -95,11 +102,11 @@ class NetscapeBookmarkUtils
    /**
     * Imports Web bookmarks from an uploaded Netscape bookmark dump
     *
-     * @param array         $post      Server $_POST parameters
+     * @param array         $post    Server $_POST parameters
-     * @param array         $files     Server $_FILES parameters
+     * @param array         $files   Server $_FILES parameters
-     * @param LinkDB        $linkDb    Loaded LinkDB instance
+     * @param LinkDB        $linkDb  Loaded LinkDB instance
-     * @param ConfigManager $conf      instance
+     * @param ConfigManager $conf    instance
-     * @param History       $history   History instance
+     * @param History       $history History instance
     *
     * @return string Summary of the bookmark import status
     */
@@ -115,7 +122,7 @@ class NetscapeBookmarkUtils
        }
        // Overwrite existing links?
-        $overwrite = ! empty($post['overwrite']);
+        $overwrite = !empty($post['overwrite']);
        // Add tags to all imported links?
        if (empty($post['default_tags'])) {
@@ -138,7 +145,7 @@ class NetscapeBookmarkUtils
        );
        $logger = new Logger(
            $conf->get('resource.data_dir'),
-            ! $conf->get('dev.debug') ? LogLevel::INFO : LogLevel::DEBUG,
+            !$conf->get('dev.debug') ? LogLevel::INFO : LogLevel::DEBUG,
            [
                'prefix' => 'import.',
                'extension' => 'log',
@@ -193,7 +200,7 @@ class NetscapeBookmarkUtils
            }
            // Add a new link - @ used for UNIX timestamps
-            $newLinkDate = new DateTime('@'.strval($bkm['time']));
+            $newLinkDate = new DateTime('@' . strval($bkm['time']));
            $newLinkDate->setTimezone(new DateTimeZone(date_default_timezone_get()));
            $newLink['created'] = $newLinkDate;
            $newLink['id'] = $linkDb->getNextId();
diff --git a/application/PluginManager.php b/application/plugin/PluginManager.php
index 1ed4db4b..f7b24a8e 100644
--- a/application/PluginManager.php
+++ b/application/plugin/PluginManager.php
@@ -1,4 +1,8 @@
 <?php
+namespace Shaarli\Plugin;
+use Shaarli\Config\ConfigManager;
+use Shaarli\Plugin\Exception\PluginFileNotFoundException;
 /**
 * Class PluginManager
@@ -9,12 +13,14 @@ class PluginManager
 {
    /**
     * List of authorized plugins from configuration file.
+     *
     * @var array $authorizedPlugins
     */
    private $authorizedPlugins;
    /**
     * List of loaded plugins.
+     *
     * @var array $loadedPlugins
     */
    private $loadedPlugins = array();
@@ -31,12 +37,14 @@ class PluginManager
    /**
     * Plugins subdirectory.
+     *
     * @var string $PLUGINS_PATH
     */
    public static $PLUGINS_PATH = 'plugins';
    /**
     * Plugins meta files extension.
+     *
     * @var string $META_EXT
     */
    public static $META_EXT = 'meta';
@@ -84,9 +92,9 @@ class PluginManager
    /**
     * Execute all plugins registered hook.
     *
-     * @param string        $hook   name of the hook to trigger.
+     * @param string $hook   name of the hook to trigger.
-     * @param array         $data   list of data to manipulate passed by reference.
+     * @param array  $data   list of data to manipulate passed by reference.
-     * @param array         $params additional parameters such as page target.
+     * @param array  $params additional parameters such as page target.
     *
     * @return void
     */
@@ -118,7 +126,7 @@ class PluginManager
     * @param string $pluginName plugin's name.
     *
     * @return void
-     * @throws PluginFileNotFoundException - plugin files not found.
+     * @throws \Shaarli\Plugin\Exception\PluginFileNotFoundException - plugin files not found.
     */
    private function loadPlugin($dir, $pluginName)
    {
@@ -204,8 +212,8 @@ class PluginManager
                $metaData[$plugin]['parameters'][$param]['value'] = '';
                // Optional parameter description in parameter.PARAM_NAME=
-                if (isset($metaData[$plugin]['parameter.'. $param])) {
+                if (isset($metaData[$plugin]['parameter.' . $param])) {
-                    $metaData[$plugin]['parameters'][$param]['desc'] = t($metaData[$plugin]['parameter.'. $param]);
+                    $metaData[$plugin]['parameters'][$param]['desc'] = t($metaData[$plugin]['parameter.' . $param]);
                }
            }
        }
@@ -223,22 +231,3 @@ class PluginManager
        return $this->errors;
    }
 }
-/**
- * Class PluginFileNotFoundException
- *
- * Raise when plugin files can't be found.
- */
-class PluginFileNotFoundException extends Exception
-{
-    /**
-     * Construct exception with plugin name.
-     * Generate message.
-     *
-     * @param string $pluginName name of the plugin not found
-     */
-    public function __construct($pluginName)
-    {
-        $this->message = sprintf(t('Plugin "%s" files not found.'), $pluginName);
-    }
-}
diff --git a/application/plugin/exception/PluginFileNotFoundException.php b/application/plugin/exception/PluginFileNotFoundException.php
new file mode 100644
index 00000000..e5386f02
--- /dev/null
+++ b/application/plugin/exception/PluginFileNotFoundException.php
@@ -0,0 +1,23 @@
+<?php
+namespace Shaarli\Plugin\Exception;
+use Exception;
+/**
+ * Class PluginFileNotFoundException
+ *
+ * Raise when plugin files can't be found.
+ */
+class PluginFileNotFoundException extends Exception
+{
+    /**
+     * Construct exception with plugin name.
+     * Generate message.
+     *
+     * @param string $pluginName name of the plugin not found
+     */
+    public function __construct($pluginName)
+    {
+        $this->message = sprintf(t('Plugin "%s" files not found.'), $pluginName);
+    }
+}
diff --git a/application/PageBuilder.php b/application/render/PageBuilder.php
index 2ca95832..3f86fc26 100644
--- a/application/PageBuilder.php
+++ b/application/render/PageBuilder.php
@@ -1,5 +1,11 @@
 <?php
+namespace Shaarli\Render;
+use Exception;
+use RainTPL;
+use Shaarli\ApplicationUtils;
+use Shaarli\Bookmark\LinkDB;
 use Shaarli\Config\ConfigManager;
 use Shaarli\Thumbnailer;
@@ -37,7 +43,9 @@ class PageBuilder
     */
    protected $token;
-    /** @var bool $isLoggedIn Whether the user is logged in **/
+    /**
+     * @var bool $isLoggedIn Whether the user is logged in
+     */
    protected $isLoggedIn = false;
    /**
@@ -101,7 +109,7 @@ class PageBuilder
            ApplicationUtils::getVersionHash(SHAARLI_VERSION, $this->conf->get('credentials.salt'))
        );
        $this->tpl->assign('index_url', index_url($_SERVER));
-        $visibility = ! empty($_SESSION['visibility']) ? $_SESSION['visibility'] : '';
+        $visibility = !empty($_SESSION['visibility']) ? $_SESSION['visibility'] : '';
        $this->tpl->assign('visibility', $visibility);
        $this->tpl->assign('untaggedonly', !empty($_SESSION['untaggedonly']));
        $this->tpl->assign('pagetitle', $this->conf->get('general.title', 'Shaarli'));
@@ -115,6 +123,8 @@ class PageBuilder
        $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false));
        $this->tpl->assign('token', $this->token);
+        $this->tpl->assign('language', $this->conf->get('translation.language'));
        if ($this->linkDB !== null) {
            $this->tpl->assign('tags', $this->linkDB->linksCountPerTag());
        }
@@ -126,7 +136,7 @@ class PageBuilder
        $this->tpl->assign('thumbnails_width', $this->conf->get('thumbnails.width'));
        $this->tpl->assign('thumbnails_height', $this->conf->get('thumbnails.height'));
-        if (! empty($_SESSION['warnings'])) {
+        if (!empty($_SESSION['warnings'])) {
            $this->tpl->assign('global_warnings', $_SESSION['warnings']);
            unset($_SESSION['warnings']);
        }
@@ -189,16 +199,16 @@ class PageBuilder
    /**
     * Render a 404 page (uses the template : tpl/404.tpl)
-     * usage : $PAGE->render404('The link was deleted')
+     * usage: $PAGE->render404('The link was deleted')
     *
-     * @param string $message A messate to display what is not found
+     * @param string $message A message to display what is not found
     */
    public function render404($message = '')
    {
        if (empty($message)) {
            $message = t('The page you are trying to reach does not exist or has been deleted.');
        }
-        header($_SERVER['SERVER_PROTOCOL'] .' '. t('404 Not Found'));
+        header($_SERVER['SERVER_PROTOCOL'] . ' ' . t('404 Not Found'));
        $this->tpl->assign('error_message', $message);
        $this->renderPage('404');
    }
diff --git a/application/ThemeUtils.php b/application/render/ThemeUtils.php
index 16f2f6a2..86096c64 100644
--- a/application/ThemeUtils.php
+++ b/application/render/ThemeUtils.php
@@ -1,6 +1,6 @@
 <?php
-namespace Shaarli;
+namespace Shaarli\Render;
 /**
 * Class ThemeUtils
diff --git a/application/security/BanManager.php b/application/security/BanManager.php
new file mode 100644
index 00000000..68190c54
--- /dev/null
+++ b/application/security/BanManager.php
@@ -0,0 +1,213 @@
+<?php
+namespace Shaarli\Security;
+use Shaarli\FileUtils;
+/**
+ * Class BanManager
+ *
+ * Failed login attempts will store the associated IP address.
+ * After N failed attempts, the IP will be prevented from log in for duration D.
+ * Both N and D can be set in the configuration file.
+ *
+ * @package Shaarli\Security
+ */
+class BanManager
+{
+    /** @var array List of allowed proxies IP */
+    protected $trustedProxies;
+    /** @var int Number of allowed failed attempt before the ban */
+    protected $nbAttempts;
+    /** @var  int Ban duration in seconds */
+    protected $banDuration;
+    /** @var string Path to the file containing IP bans and failures */
+    protected $banFile;
+    /** @var string Path to the log file, used to log bans */
+    protected $logFile;
+    /** @var array List of IP with their associated number of failed attempts */
+    protected $failures = [];
+    /** @var array List of banned IP with their associated unban timestamp */
+    protected $bans = [];
+    /**
+     * BanManager constructor.
+     *
+     * @param array  $trustedProxies List of allowed proxies IP
+     * @param int    $nbAttempts     Number of allowed failed attempt before the ban
+     * @param int    $banDuration    Ban duration in seconds
+     * @param string $banFile        Path to the file containing IP bans and failures
+     * @param string $logFile        Path to the log file, used to log bans
+     */
+    public function __construct($trustedProxies, $nbAttempts, $banDuration, $banFile, $logFile) {
+        $this->trustedProxies = $trustedProxies;
+        $this->nbAttempts = $nbAttempts;
+        $this->banDuration = $banDuration;
+        $this->banFile = $banFile;
+        $this->logFile = $logFile;
+        $this->readBanFile();
+    }
+    /**
+     * Handle a failed login and ban the IP after too many failed attempts
+     *
+     * @param array $server The $_SERVER array
+     */
+    public function handleFailedAttempt($server)
+    {
+        $ip = $this->getIp($server);
+        // the IP is behind a trusted forward proxy, but is not forwarded
+        // in the HTTP headers, so we do nothing
+        if (empty($ip)) {
+            return;
+        }
+        // increment the fail count for this IP
+        if (isset($this->failures[$ip])) {
+            $this->failures[$ip]++;
+        } else {
+            $this->failures[$ip] = 1;
+        }
+        if ($this->failures[$ip] >= $this->nbAttempts) {
+            $this->bans[$ip] = time() + $this->banDuration;
+            logm(
+                $this->logFile,
+                $server['REMOTE_ADDR'],
+                'IP address banned from login: '. $ip
+            );
+        }
+        $this->writeBanFile();
+    }
+    /**
+     * Remove failed attempts for the provided client.
+     *
+     * @param array $server $_SERVER
+     */
+    public function clearFailures($server)
+    {
+        $ip = $this->getIp($server);
+        // the IP is behind a trusted forward proxy, but is not forwarded
+        // in the HTTP headers, so we do nothing
+        if (empty($ip)) {
+            return;
+        }
+        if (isset($this->failures[$ip])) {
+            unset($this->failures[$ip]);
+        }
+        $this->writeBanFile();
+    }
+    /**
+     * Check whether the client IP is banned or not.
+     *
+     * @param array $server $_SERVER
+     *
+     * @return bool True if the IP is banned, false otherwise
+     */
+    public function isBanned($server)
+    {
+        $ip = $this->getIp($server);
+        // the IP is behind a trusted forward proxy, but is not forwarded
+        // in the HTTP headers, so we allow the authentication attempt.
+        if (empty($ip)) {
+            return false;
+        }
+        // the user is not banned
+        if (! isset($this->bans[$ip])) {
+            return false;
+        }
+        // the user is still banned
+        if ($this->bans[$ip] > time()) {
+            return true;
+        }
+        // the ban has expired, the user can attempt to log in again
+        if (isset($this->failures[$ip])) {
+            unset($this->failures[$ip]);
+        }
+        unset($this->bans[$ip]);
+        logm($this->logFile, $server['REMOTE_ADDR'], 'Ban lifted for: '. $ip);
+        $this->writeBanFile();
+        return false;
+    }
+    /**
+     * Retrieve the IP from $_SERVER.
+     * If the actual IP is behind an allowed reverse proxy,
+     * we try to extract the forwarded IP from HTTP headers.
+     *
+     * @param array $server $_SERVER
+     *
+     * @return string|bool The IP or false if none could be extracted
+     */
+    protected function getIp($server)
+    {
+        $ip = $server['REMOTE_ADDR'];
+        if (! in_array($ip, $this->trustedProxies)) {
+            return $ip;
+        }
+        return getIpAddressFromProxy($server, $this->trustedProxies);
+    }
+    /**
+     * Read a file containing banned IPs
+     */
+    protected function readBanFile()
+    {
+        $data = FileUtils::readFlatDB($this->banFile);
+        if (isset($data['failures']) && is_array($data['failures'])) {
+            $this->failures = $data['failures'];
+        }
+        if (isset($data['bans']) && is_array($data['bans'])) {
+            $this->bans = $data['bans'];
+        }
+    }
+    /**
+     * Write the banned IPs to a file
+     */
+    protected function writeBanFile()
+    {
+        return FileUtils::writeFlatDB(
+            $this->banFile,
+            [
+                'failures' => $this->failures,
+                'bans' => $this->bans,
+            ]
+        );
+    }
+    /**
+     * Get the Failures (for UT purpose).
+     *
+     * @return array
+     */
+    public function getFailures()
+    {
+        return $this->failures;
+    }
+    /**
+     * Get the Bans (for UT purpose).
+     *
+     * @return array
+     */
+    public function getBans()
+    {
+        return $this->bans;
+    }
+}
diff --git a/application/security/LoginManager.php b/application/security/LoginManager.php
index 0f315483..0b0ce0b1 100644
--- a/application/security/LoginManager.php
+++ b/application/security/LoginManager.php
@@ -20,8 +20,8 @@ class LoginManager
    /** @var SessionManager Session Manager instance **/
    protected $sessionManager = null;
-    /** @var string Path to the file containing IP bans */
+    /** @var BanManager Ban Manager instance **/
-    protected $banFile = '';
+    protected $banManager;
    /** @var bool Whether the user is logged in **/
    protected $isLoggedIn = false;
@@ -35,17 +35,21 @@ class LoginManager
    /**
     * Constructor
     *
-     * @param array          $globals        The $GLOBALS array (reference)
     * @param ConfigManager  $configManager  Configuration Manager instance
     * @param SessionManager $sessionManager SessionManager instance
     */
-    public function __construct(& $globals, $configManager, $sessionManager)
+    public function __construct($configManager, $sessionManager)
    {
-        $this->globals = &$globals;
        $this->configManager = $configManager;
        $this->sessionManager = $sessionManager;
-        $this->banFile = $this->configManager->get('resource.ban_file', 'data/ipbans.php');
+        $this->banManager = new BanManager(
-        $this->readBanFile();
+            $this->configManager->get('security.trusted_proxies', []),
+            $this->configManager->get('security.ban_after'),
+            $this->configManager->get('security.ban_duration'),
+            $this->configManager->get('resource.ban_file', 'data/ipbans.php'),
+            $this->configManager->get('resource.log')
+        );
        if ($this->configManager->get('security.open_shaarli') === true) {
            $this->openShaarli = true;
        }
@@ -58,6 +62,9 @@ class LoginManager
     */
    public function generateStaySignedInToken($clientIpAddress)
    {
+        if ($this->configManager->get('security.session_protection_disabled') === true) {
+            $clientIpAddress = '';
+        }
        $this->staySignedInToken = sha1(
            $this->configManager->get('credentials.hash')
            . $clientIpAddress
@@ -155,65 +162,13 @@ class LoginManager
    }
    /**
-     * Read a file containing banned IPs
-     */
-    protected function readBanFile()
-    {
-        if (! file_exists($this->banFile)) {
-            return;
-        }
-        include $this->banFile;
-    }
-    /**
-     * Write the banned IPs to a file
-     */
-    protected function writeBanFile()
-    {
-        if (! array_key_exists('IPBANS', $this->globals)) {
-            return;
-        }
-        file_put_contents(
-            $this->banFile,
-            "<?php\n\$GLOBALS['IPBANS']=" . var_export($this->globals['IPBANS'], true) . ";\n?>"
-        );
-    }
-    /**
     * Handle a failed login and ban the IP after too many failed attempts
     *
     * @param array $server The $_SERVER array
     */
    public function handleFailedLogin($server)
    {
-        $ip = $server['REMOTE_ADDR'];
+        $this->banManager->handleFailedAttempt($server);
-        $trusted = $this->configManager->get('security.trusted_proxies', []);
-        if (in_array($ip, $trusted)) {
-            $ip = getIpAddressFromProxy($server, $trusted);
-            if (! $ip) {
-                // the IP is behind a trusted forward proxy, but is not forwarded
-                // in the HTTP headers, so we do nothing
-                return;
-            }
-        }
-        // increment the fail count for this IP
-        if (isset($this->globals['IPBANS']['FAILURES'][$ip])) {
-            $this->globals['IPBANS']['FAILURES'][$ip]++;
-        } else {
-            $this->globals['IPBANS']['FAILURES'][$ip] = 1;
-        }
-        if ($this->globals['IPBANS']['FAILURES'][$ip] >= $this->configManager->get('security.ban_after')) {
-            $this->globals['IPBANS']['BANS'][$ip] = time() + $this->configManager->get('security.ban_duration', 1800);
-            logm(
-                $this->configManager->get('resource.log'),
-                $server['REMOTE_ADDR'],
-                'IP address banned from login'
-            );
-        }
-        $this->writeBanFile();
    }
    /**
@@ -223,13 +178,7 @@ class LoginManager
     */
    public function handleSuccessfulLogin($server)
    {
-        $ip = $server['REMOTE_ADDR'];
+        $this->banManager->clearFailures($server);
-        // FIXME unban when behind a trusted proxy?
-        unset($this->globals['IPBANS']['FAILURES'][$ip]);
-        unset($this->globals['IPBANS']['BANS'][$ip]);
-        $this->writeBanFile();
    }
    /**
@@ -241,24 +190,6 @@ class LoginManager
     */
    public function canLogin($server)
    {
-        $ip = $server['REMOTE_ADDR'];
+        return ! $this->banManager->isBanned($server);
-        if (! isset($this->globals['IPBANS']['BANS'][$ip])) {
-            // the user is not banned
-            return true;
-        }
-        if ($this->globals['IPBANS']['BANS'][$ip] > time()) {
-            // the user is still banned
-            return false;
-        }
-        // the ban has expired, the user can attempt to log in again
-        logm($this->configManager->get('resource.log'), $server['REMOTE_ADDR'], 'Ban lifted.');
-        unset($this->globals['IPBANS']['FAILURES'][$ip]);
-        unset($this->globals['IPBANS']['BANS'][$ip]);
-        $this->writeBanFile();
-        return true;
    }
 }
diff --git a/application/Updater.php b/application/updater/Updater.php
index 86a21fc3..30e5247b 100644
--- a/application/Updater.php
+++ b/application/updater/Updater.php
@@ -1,11 +1,24 @@
 <?php
+namespace Shaarli\Updater;
+use Exception;
+use RainTPL;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionMethod;
+use Shaarli\ApplicationUtils;
+use Shaarli\Bookmark\LinkDB;
+use Shaarli\Bookmark\LinkFilter;
 use Shaarli\Config\ConfigJson;
-use Shaarli\Config\ConfigPhp;
 use Shaarli\Config\ConfigManager;
+use Shaarli\Config\ConfigPhp;
+use Shaarli\Exceptions\IOException;
 use Shaarli\Thumbnailer;
+use Shaarli\Updater\Exception\UpdaterException;
 /**
- * Class Updater.
+ * Class updater.
 * Used to update stuff when a new Shaarli's version is reached.
 * Update methods are ran only once, and the stored in a JSON file.
 */
@@ -83,12 +96,12 @@ class Updater
        }
        if ($this->methods === null) {
-            throw new UpdaterException(t('Couldn\'t retrieve Updater class methods.'));
+            throw new UpdaterException(t('Couldn\'t retrieve updater class methods.'));
        }
        foreach ($this->methods as $method) {
            // Not an update method or already done, pass.
-            if (! startsWith($method->getName(), 'updateMethod')
+            if (!startsWith($method->getName(), 'updateMethod')
                || in_array($method->getName(), $this->doneUpdates)
            ) {
                continue;
@@ -139,7 +152,7 @@ class Updater
                }
            }
            $this->conf->write($this->isLoggedIn);
-            unlink($this->conf->get('resource.data_dir').'/options.php');
+            unlink($this->conf->get('resource.data_dir') . '/options.php');
        }
        return true;
@@ -174,10 +187,10 @@ class Updater
        $subConfig = array('config', 'plugins');
        foreach ($subConfig as $sub) {
            foreach ($oldConfig[$sub] as $key => $value) {
-                if (isset($legacyMap[$sub .'.'. $key])) {
+                if (isset($legacyMap[$sub . '.' . $key])) {
-                    $configKey = $legacyMap[$sub .'.'. $key];
+                    $configKey = $legacyMap[$sub . '.' . $key];
                } else {
-                    $configKey = $sub .'.'. $key;
+                    $configKey = $sub . '.' . $key;
                }
                $this->conf->set($configKey, $value);
            }
@@ -205,7 +218,6 @@ class Updater
        try {
            $this->conf->set('general.title', escape($this->conf->get('general.title')));
            $this->conf->set('general.header_link', escape($this->conf->get('general.header_link')));
-            $this->conf->set('redirector.url', escape($this->conf->get('redirector.url')));
            $this->conf->write($this->isLoggedIn);
        } catch (Exception $e) {
            error_log($e->getMessage());
@@ -233,7 +245,7 @@ class Updater
            return true;
        }
-        $save = $this->conf->get('resource.data_dir') .'/datastore.'. date('YmdHis') .'.php';
+        $save = $this->conf->get('resource.data_dir') . '/datastore.' . date('YmdHis') . '.php';
        copy($this->conf->get('resource.datastore'), $save);
        $links = array();
@@ -309,7 +321,7 @@ class Updater
        // We run the update only if this folder still contains the template files.
        $tplDir = $this->conf->get('resource.raintpl_tpl');
        $tplFile = $tplDir . '/linklist.html';
-        if (! file_exists($tplFile)) {
+        if (!file_exists($tplFile)) {
            return true;
        }
@@ -333,7 +345,7 @@ class Updater
     */
    public function updateMethodMoveUserCss()
    {
-        if (! is_file('inc/user.css')) {
+        if (!is_file('inc/user.css')) {
            return true;
        }
@@ -369,11 +381,11 @@ class Updater
     */
    public function updateMethodPiwikUrl()
    {
-        if (! $this->conf->exists('plugins.PIWIK_URL') || startsWith($this->conf->get('plugins.PIWIK_URL'), 'http')) {
+        if (!$this->conf->exists('plugins.PIWIK_URL') || startsWith($this->conf->get('plugins.PIWIK_URL'), 'http')) {
            return true;
        }
-        $this->conf->set('plugins.PIWIK_URL', 'http://'. $this->conf->get('plugins.PIWIK_URL'));
+        $this->conf->set('plugins.PIWIK_URL', 'http://' . $this->conf->get('plugins.PIWIK_URL'));
        $this->conf->write($this->isLoggedIn);
        return true;
@@ -483,11 +495,11 @@ class Updater
            return true;
        }
-        if (! $this->conf->exists('general.download_max_size')) {
+        if (!$this->conf->exists('general.download_max_size')) {
-            $this->conf->set('general.download_max_size', 1024*1024*4);
+            $this->conf->set('general.download_max_size', 1024 * 1024 * 4);
        }
-        if (! $this->conf->exists('general.download_timeout')) {
+        if (!$this->conf->exists('general.download_timeout')) {
            $this->conf->set('general.download_timeout', 30);
        }
@@ -539,97 +551,14 @@ class Updater
        return true;
    }
-}
-/**
- * Class UpdaterException.
- */
-class UpdaterException extends Exception
-{
-    /**
-     * @var string Method where the error occurred.
-     */
-    protected $method;
    /**
-     * @var Exception The parent exception.
+     * Remove redirector settings.
     */
-    protected $previous;
+    public function updateMethodRemoveRedirector()
-    /**
-     * Constructor.
-     *
-     * @param string         $message  Force the error message if set.
-     * @param string         $method   Method where the error occurred.
-     * @param Exception|bool $previous Parent exception.
-     */
-    public function __construct($message = '', $method = '', $previous = false)
    {
-        $this->method = $method;
+        $this->conf->remove('redirector');
-        $this->previous = $previous;
+        $this->conf->write(true);
-        $this->message = $this->buildMessage($message);
+        return true;
-    }
-    /**
-     * Build the exception error message.
-     *
-     * @param string $message Optional given error message.
-     *
-     * @return string The built error message.
-     */
-    private function buildMessage($message)
-    {
-        $out = '';
-        if (! empty($message)) {
-            $out .= $message . PHP_EOL;
-        }
-        if (! empty($this->method)) {
-            $out .= t('An error occurred while running the update ') . $this->method . PHP_EOL;
-        }
-        if (! empty($this->previous)) {
-            $out .= '  '. $this->previous->getMessage();
-        }
-        return $out;
-    }
-}
-/**
- * Read the updates file, and return already done updates.
- *
- * @param string $updatesFilepath Updates file path.
- *
- * @return array Already done update methods.
- */
-function read_updates_file($updatesFilepath)
-{
-    if (! empty($updatesFilepath) && is_file($updatesFilepath)) {
-        $content = file_get_contents($updatesFilepath);
-        if (! empty($content)) {
-            return explode(';', $content);
-        }
-    }
-    return array();
-}
-/**
- * Write updates file.
- *
- * @param string $updatesFilepath Updates file path.
- * @param array  $updates         Updates array to write.
- *
- * @throws Exception Couldn't write version number.
- */
-function write_updates_file($updatesFilepath, $updates)
-{
-    if (empty($updatesFilepath)) {
-        throw new Exception(t('Updates file path is not set, can\'t write updates.'));
-    }
-    $res = file_put_contents($updatesFilepath, implode(';', $updates));
-    if ($res === false) {
-        throw new Exception(t('Unable to write updates in '. $updatesFilepath . '.'));
    }
 }
diff --git a/application/updater/UpdaterUtils.php b/application/updater/UpdaterUtils.php
new file mode 100644
index 00000000..34d4f422
--- /dev/null
+++ b/application/updater/UpdaterUtils.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Read the updates file, and return already done updates.
+ *
+ * @param string $updatesFilepath Updates file path.
+ *
+ * @return array Already done update methods.
+ */
+function read_updates_file($updatesFilepath)
+{
+    if (! empty($updatesFilepath) && is_file($updatesFilepath)) {
+        $content = file_get_contents($updatesFilepath);
+        if (! empty($content)) {
+            return explode(';', $content);
+        }
+    }
+    return array();
+}
+/**
+ * Write updates file.
+ *
+ * @param string $updatesFilepath Updates file path.
+ * @param array  $updates         Updates array to write.
+ *
+ * @throws Exception Couldn't write version number.
+ */
+function write_updates_file($updatesFilepath, $updates)
+{
+    if (empty($updatesFilepath)) {
+        throw new Exception(t('Updates file path is not set, can\'t write updates.'));
+    }
+    $res = file_put_contents($updatesFilepath, implode(';', $updates));
+    if ($res === false) {
+        throw new Exception(t('Unable to write updates in '. $updatesFilepath . '.'));
+    }
+}
diff --git a/application/updater/exception/UpdaterException.php b/application/updater/exception/UpdaterException.php
new file mode 100644
index 00000000..20aceccf
--- /dev/null
+++ b/application/updater/exception/UpdaterException.php
@@ -0,0 +1,60 @@
+<?php
+namespace Shaarli\Updater\Exception;
+use Exception;
+/**
+ * Class UpdaterException.
+ */
+class UpdaterException extends Exception
+{
+    /**
+     * @var string Method where the error occurred.
+     */
+    protected $method;
+    /**
+     * @var Exception The parent exception.
+     */
+    protected $previous;
+    /**
+     * Constructor.
+     *
+     * @param string         $message  Force the error message if set.
+     * @param string         $method   Method where the error occurred.
+     * @param Exception|bool $previous Parent exception.
+     */
+    public function __construct($message = '', $method = '', $previous = false)
+    {
+        $this->method = $method;
+        $this->previous = $previous;
+        $this->message = $this->buildMessage($message);
+    }
+    /**
+     * Build the exception error message.
+     *
+     * @param string $message Optional given error message.
+     *
+     * @return string The built error message.
+     */
+    private function buildMessage($message)
+    {
+        $out = '';
+        if (!empty($message)) {
+            $out .= $message . PHP_EOL;
+        }
+        if (!empty($this->method)) {
+            $out .= t('An error occurred while running the update ') . $this->method . PHP_EOL;
+        }
+        if (!empty($this->previous)) {
+            $out .= '  ' . $this->previous->getMessage();
+        }
+        return $out;
+    }
+}
author	ArthurHoaro <arthur@hoa.ro>	2020-10-13 12:07:13 +0200
committer	ArthurHoaro <arthur@hoa.ro>	2020-10-13 12:07:13 +0200
commit	d9f6275ebca035fec8331652c677981056793ccc (patch)
tree	37a64baf4f0eba6b781040605965383d8aded2cc /application
parent	38672ba0d1c722e5d6d33a58255ceb55e9410e46 (diff)
parent	d63ff87a009313141ae684ec447b902562ff6ee7 (diff)
download	Shaarli-stable.tar.gz Shaarli-stable.tar.zst Shaarli-stable.zip