6 files changed, 47 insertions, 552 deletions

diff --git a/composer.json b/composer.json
index 56dea960..32ca9c28 100644
--- a/composer.json
+++ b/composer.json
@@ -30,6 +30,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/wallabag/kriss_php5"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/wallabag/pagination"
         }
     ],
     "require": {
@@ -40,6 +44,7 @@
         "ezyang/htmlpurifier": "dev-master",
         "mgargano/simplehtmldom": "dev-master",
         "wallabag/PHP-Flash-Messages": "dev-master",
-        "wallabag/kriss_php5": "dev-master"
+        "wallabag/kriss_php5": "dev-master",
+        "wallabag/pagination": "dev-master"
     }
 }
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 48df2b16..00d31c5b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "aaf0d0bb3208c2dfc0b6cc95cbfab5f6",
+    "hash": "01683220c560fe335307baeb1018293c",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -1374,6 +1374,43 @@
             "time": "2015-01-18 21:21:43"
         },
         {
+            "name": "wallabag/pagination",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/wallabag/pagination.git",
+                "reference": "54e442b31c90e50e331cb8ac400537e0eda30deb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/wallabag/pagination/zipball/54e442b31c90e50e331cb8ac400537e0eda30deb",
+                "reference": "54e442b31c90e50e331cb8ac400537e0eda30deb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "paginator.php"
+                ]
+            },
+            "authors": [
+                {
+                    "name": "Nicolas Lœuillet",
+                    "email": "nicolas@loeuillet.org",
+                    "homepage": "http://www.cdetc.fr"
+                }
+            ],
+            "description": "Paginate record sets, not tied in directly to a database.",
+            "homepage": "https://github.com/wallabag/pagination",
+            "support": {
+                "source": "https://github.com/wallabag/pagination/tree/master"
+            },
+            "time": "2015-01-19 09:24:39"
+        },
+        {
             "name": "wallabag/php-flash-messages",
             "version": "dev-master",
             "source": {
@@ -1428,7 +1465,8 @@
         "ezyang/htmlpurifier": 20,
         "mgargano/simplehtmldom": 20,
         "wallabag/php-flash-messages": 20,
-        "wallabag/kriss_php5": 20
+        "wallabag/kriss_php5": 20,
+        "wallabag/pagination": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/inc/3rdparty/Session.class.php b/inc/3rdparty/Session.class.php
deleted file mode 100644
index b56e4c54..00000000
--- a/inc/3rdparty/Session.class.php
+++ /dev/null
@@ -1,346 +0,0 @@
-<?php
-/**
- * Session management class
- *
- * http://www.developpez.net/forums/d51943/php/langage/sessions/
- * http://sebsauvage.net/wiki/doku.php?id=php:session
- * http://sebsauvage.net/wiki/doku.php?id=php:shaarli
- * 
- * Features:
- * - Everything is stored on server-side (we do not trust client-side data,
- *   such as cookie expiration)
- * - IP addresses are checked on each access to prevent session cookie hijacking
- *   (such as Firesheep)
- * - Session expires on user inactivity (Session expiration date is
- *   automatically updated everytime the user accesses a page.)
- * - A unique secret key is generated on server-side for this session
- *   (and never sent over the wire) which can be used to sign forms (HMAC)
- *   (See $_SESSION['uid'])
- * - Token management to prevent XSRF attacks
- * - Brute force protection with ban management
- *
- * TODOs
- * - Replace globals with variables in Session class
- *
- * How to use:
- * - http://tontof.net/kriss/php5/session
- */
-class Session
-{
-    // Personnalize PHP session name
-    public static $sessionName = '';
-    // If the user does not access any page within this time,
-    // his/her session is considered expired (3600 sec. = 1 hour)
-    public static $inactivityTimeout = 3600;
-    // Extra timeout for long sessions (if enabled) (82800 sec. = 23 hours)
-    public static $longSessionTimeout = 7776000; // 7776000 = 90 days
-    // If you get disconnected often or if your IP address changes often.
-    // Let you disable session cookie hijacking protection
-    public static $disableSessionProtection = false;
-    // Ban IP after this many failures.
-    public static $banAfter = 4;
-    // Ban duration for IP address after login failures (in seconds).
-    // (1800 sec. = 30 minutes)
-    public static $banDuration = 1800;
-    // File storage for failures and bans. If empty, no ban management.
-    public static $banFile = '';
-
-    /**
-     * Initialize session
-     */
-    public static function init($longlastingsession = false)
-    {
-        //check if session name is correct
-        if ( (session_id() && !empty(self::$sessionName) && session_name()!=self::$sessionName) || $longlastingsession ) {
-            session_destroy();
-        }
-
-        // Force cookie path (but do not change lifetime)
-        $cookie = session_get_cookie_params();
-        // Default cookie expiration and path.
-        $cookiedir = '';
-        if (dirname($_SERVER['SCRIPT_NAME'])!='/') {
-            $cookiedir = dirname($_SERVER["SCRIPT_NAME"]).'/';
-        }
-        $ssl = false;
-        if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
-            $ssl = true;
-        }
-
-        if ( $longlastingsession ) {
-            session_set_cookie_params(self::$longSessionTimeout, $cookiedir, null, $ssl, true);
-        }
-        else {
-            session_set_cookie_params(0, $cookiedir, null, $ssl, true);
-        }
-        //set server side valid session timeout
-        //WARNING! this may not work in shared session environment. See http://www.php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime about min value: it can be set in any application
-        ini_set('session.gc_maxlifetime', self::$longSessionTimeout);
-
-        // Use cookies to store session.
-        ini_set('session.use_cookies', 1);
-        // Force cookies for session  (phpsessionID forbidden in URL)
-        ini_set('session.use_only_cookies', 1);
-        if ( !session_id() ) {
-            // Prevent php to use sessionID in URL if cookies are disabled.
-            ini_set('session.use_trans_sid', false);
-            if (!empty(self::$sessionName)) {
-                session_name(self::$sessionName);
-            }
-            session_start();
-        }
-    }
-
-    /**
-     * Returns the IP address
-     * (Used to prevent session cookie hijacking.)
-     *
-     * @return string IP addresses
-     */
-    private static function _allIPs()
-    {
-        $ip = $_SERVER["REMOTE_ADDR"];
-        $ip.= isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? '_'.$_SERVER['HTTP_X_FORWARDED_FOR'] : '';
-        $ip.= isset($_SERVER['HTTP_CLIENT_IP']) ? '_'.$_SERVER['HTTP_CLIENT_IP'] : '';
-
-        return $ip;
-    }
-
-    /**
-     * Check that user/password is correct and then init some SESSION variables.
-     *
-     * @param string $login        Login reference
-     * @param string $password     Password reference
-     * @param string $loginTest    Login to compare with login reference
-     * @param string $passwordTest Password to compare with password reference
-     * @param array  $pValues      Array of variables to store in SESSION
-     *
-     * @return true|false          True if login and password are correct, false
-     *                             otherwise
-     */
-    public static function login (
-        $login,
-        $password,
-        $loginTest,
-        $passwordTest,
-        $longlastingsession,
-        $pValues = array())
-    {
-        self::banInit();
-        if (self::banCanLogin()) {
-            if ($login === $loginTest && $password === $passwordTest) {
-                self::banLoginOk();
-
-                self::init($longlastingsession);
-
-                // Generate unique random number to sign forms (HMAC)
-                $_SESSION['uid'] = sha1(uniqid('', true).'_'.mt_rand());
-                $_SESSION['ip'] = self::_allIPs();
-                $_SESSION['username'] = $login;
-                // Set session expiration.
-                $_SESSION['expires_on'] = time() + self::$inactivityTimeout;
-                if ($longlastingsession) {
-                        $_SESSION['longlastingsession'] = self::$longSessionTimeout;
-                        $_SESSION['expires_on'] += $_SESSION['longlastingsession'];
-                }
-                
-                foreach ($pValues as $key => $value) {
-                    $_SESSION[$key] = $value;
-                }
-
-                return true;
-            }
-            self::banLoginFailed();
-        }
-
-        self::init();
-        return false;
-    }
-
-    /**
-     * Unset SESSION variable to force logout
-     */
-    public static function logout()
-    {
-        // unset($_SESSION['uid'],$_SESSION['ip'],$_SESSION['expires_on'],$_SESSION['tokens'], $_SESSION['login'], $_SESSION['pass'], $_SESSION['longlastingsession'], $_SESSION['poche_user']);
-        
-        // Destruction du cookie (le code peut paraître complexe mais c'est pour être certain de reprendre les mêmes paramètres)
-        $args = array_merge(array(session_name(), ''), array_values(session_get_cookie_params()));
-        $args[2] = time() - 3600;
-        call_user_func_array('setcookie', $args);
-        // Suppression physique de la session
-        session_destroy();
-    }
-
-    /**
-     * Make sure user is logged in.
-     *
-     * @return true|false True if user is logged in, false otherwise
-     */
-    public static function isLogged()
-    {
-        if (!isset ($_SESSION['uid'])
-            || (self::$disableSessionProtection === false
-                && $_SESSION['ip'] !== self::_allIPs())
-            || time() >= $_SESSION['expires_on']) {
-            //self::logout();
-
-            return false;
-        }
-        // User accessed a page : Update his/her session expiration date.
-        $_SESSION['expires_on'] = time() + self::$inactivityTimeout;
-        if (!empty($_SESSION['longlastingsession'])) {
-                $_SESSION['expires_on'] += $_SESSION['longlastingsession'];
-        }
-
-        return true;
-    }
-
-    /**
-     * Create a token, store it in SESSION and return it
-     *
-     * @param string $salt to prevent birthday attack
-     *
-     * @return string Token created
-     */
-    public static function getToken($salt = '')
-    {
-        if (!isset($_SESSION['tokens'])) {
-            $_SESSION['tokens']=array();
-        }
-        // We generate a random string and store it on the server side.
-        $rnd = sha1(uniqid('', true).'_'.mt_rand().$salt);
-        $_SESSION['tokens'][$rnd]=1;
-
-        return $rnd;
-    }
-
-    /**
-     * Tells if a token is ok. Using this function will destroy the token.
-     *
-     * @param string $token Token to test
-     *
-     * @return true|false   True if token is correct, false otherwise
-     */
-    public static function isToken($token)
-    {
-        if (isset($_SESSION['tokens'][$token])) {
-            unset($_SESSION['tokens'][$token]); // Token is used: destroy it.
-
-            return true; // Token is ok.
-        }
-
-        return false; // Wrong token, or already used.
-    }
-
-    /**
-     * Signal a failed login. Will ban the IP if too many failures:
-     */
-    public static function banLoginFailed()
-    {
-        if (self::$banFile !== '') {
-            $ip = $_SERVER["REMOTE_ADDR"];
-            $gb = $GLOBALS['IPBANS'];
-
-            if (!isset($gb['FAILURES'][$ip])) {
-                $gb['FAILURES'][$ip] = 0;
-            }
-            $gb['FAILURES'][$ip]++;
-            if ($gb['FAILURES'][$ip] > (self::$banAfter - 1)) {
-                $gb['BANS'][$ip]= time() + self::$banDuration;
-            }
-
-            $GLOBALS['IPBANS'] = $gb;
-            file_put_contents(self::$banFile, "<?php\n\$GLOBALS['IPBANS']=".var_export($gb, true).";\n?>");
-        }
-    }
-
-    /**
-     * Signals a successful login. Resets failed login counter.
-     */
-    public static function banLoginOk()
-    {
-        if (self::$banFile !== '') {
-            $ip = $_SERVER["REMOTE_ADDR"];
-            $gb = $GLOBALS['IPBANS'];
-            unset($gb['FAILURES'][$ip]); unset($gb['BANS'][$ip]);
-            $GLOBALS['IPBANS'] = $gb;
-            file_put_contents(self::$banFile, "<?php\n\$GLOBALS['IPBANS']=".var_export($gb, true).";\n?>");
-        }
-    }
-
-    /**
-     * Ban init
-     */
-    public static function banInit()
-    {
-        if (self::$banFile !== '') {
-            if (!is_file(self::$banFile)) {
-                file_put_contents(self::$banFile, "<?php\n\$GLOBALS['IPBANS']=".var_export(array('FAILURES'=>array(), 'BANS'=>array()), true).";\n?>");
-            }
-            include self::$banFile;
-        }
-    }
-
-    /**
-     * Checks if the user CAN login. If 'true', the user can try to login.
-     *
-     * @return boolean true if user is banned, false otherwise
-     */
-    public static function banCanLogin()
-    {
-        if (self::$banFile !== '') {
-            $ip = $_SERVER["REMOTE_ADDR"];
-            $gb = $GLOBALS['IPBANS'];
-            if (isset($gb['BANS'][$ip])) {
-                // User is banned. Check if the ban has expired:
-                if ($gb['BANS'][$ip] <= time()) {
-                    // Ban expired, user can try to login again.
-                    unset($gb['FAILURES'][$ip]);
-                    unset($gb['BANS'][$ip]);
-                    file_put_contents(self::$banFile, "<?php\n\$GLOBALS['IPBANS']=".var_export($gb, true).";\n?>");
-
-                    return true; // Ban has expired, user can login.
-                }
-
-                return false; // User is banned.
-            }
-        }
-
-        return true; // User is not banned.
-    }
-
-
-    /**
-     * Tells if a param exists in session
-     *
-     * @param $name name of the param to test
-     * @return bool
-     */
-    public static function isInSession($name)
-    {
-        return (isset($_SESSION[$name]) ? : FALSE);
-    }
-
-    /**
-     * Returns param in session
-     *
-     * @param $name name of the param to return
-     * @return mixed param or null
-     */
-    public static function getParam($name)
-    {
-        return (self::isInSession($name) ? $_SESSION[$name] : NULL);
-    }
-
-    /**
-     * Store value in session
-     *
-     * @param $name     name of the variable to store
-     * @param $value    value to store
-     */
-    public static function setParam($name, $value)
-    {
-        $_SESSION[$name] = $value;
-    }
-}
diff --git a/inc/3rdparty/paginator.php b/inc/3rdparty/paginator.php
deleted file mode 100644
index 306756c0..00000000
--- a/inc/3rdparty/paginator.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/*
- * PHP Pagination Class
- *
- * @author David Carr - dave@daveismyname.com - http://www.daveismyname.com
- * @version 1.0
- * @date October 20, 2013
- */
-class Paginator{
-
-        /**
-     * set the number of items per page.
-     *
-     * @var numeric
-    */
-    private $_perPage;
-
-    /**
-     * set get parameter for fetching the page number
-     *
-     * @var string
-    */
-    private $_instance;
-
-    /**
-     * sets the page number.
-     *
-     * @var numeric
-    */
-    private $_page;
-
-    /**
-     * set the limit for the data source
-     *
-     * @var string
-    */
-    private $_limit;
-
-    /**
-     * set the total number of records/items.
-     *
-     * @var numeric
-    */
-    private $_totalRows = 0;
-
-
-
-    /**
-     *  __construct
-     *  
-     *  pass values when class is istantiated 
-     *  
-     * @param numeric  $_perPage  sets the number of iteems per page
-     * @param numeric  $_instance sets the instance for the GET parameter
-     */
-    public function __construct($perPage,$instance){
-        $this->_instance = $instance;        
-        $this->_perPage = $perPage;
-        $this->set_instance();        
-    }
-
-    /**
-     * get_start
-     *
-     * creates the starting point for limiting the dataset
-     * @return numeric
-    */
-    private function get_start(){
-        return ($this->_page * $this->_perPage) - $this->_perPage;
-    }
-
-    /**
-     * set_instance
-     * 
-     * sets the instance parameter, if numeric value is 0 then set to 1
-     *
-     * @var numeric
-    */
-    private function set_instance(){
-        $this->_page = (int) (!isset($_GET[$this->_instance]) ? 1 : $_GET[$this->_instance]); 
-        $this->_page = ($this->_page == 0 ? 1 : $this->_page);
-    }
-
-    /**
-     * set_total
-     *
-     * collect a numberic value and assigns it to the totalRows
-     *
-     * @var numeric
-    */
-    public function set_total($_totalRows){
-        $this->_totalRows = $_totalRows;
-    }
-
-    /**
-     * get_limit
-     *
-     * returns the limit for the data source, calling the get_start method and passing in the number of items perp page
-     * 
-     * @return string
-    */
-    public function get_limit(){
-        if (STORAGE == 'postgres') {
-            return "LIMIT ".$this->_perPage." OFFSET ".$this->get_start();
-        } else {
-            return "LIMIT ".$this->get_start().",".$this->_perPage;
-        }
-    }
-
-        /**
-         * page_links
-         *
-         * create the html links for navigating through the dataset
-         * 
-         * @var sting $path optionally set the path for the link
-         * @var sting $ext optionally pass in extra parameters to the GET
-         * @return string returns the html menu
-        */
-    public function page_links($path='?',$ext=null)
-    {
-        $adjacents = "2";
-        $prev = $this->_page - 1;
-        $next = $this->_page + 1;
-        $lastpage = ceil($this->_totalRows/$this->_perPage);
-        $lpm1 = $lastpage - 1;
-
-        $pagination = "";
-        if($lastpage > 1)
-        {   
-            $pagination .= "<div class='pagination'>";
-        if ($this->_page > 1)
-            $pagination.= "<a href='".$path."$this->_instance=$prev"."$ext'>« previous</a>";
-        else
-            $pagination.= "<span class='disabled'>« previous</span>";   
-
-        if ($lastpage < 7 + ($adjacents * 2))
-        {   
-        for ($counter = 1; $counter <= $lastpage; $counter++)
-        {
-        if ($counter == $this->_page)
-            $pagination.= "<span class='current'>$counter</span>";
-        else
-            $pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";                   
-        }
-        }
-        elseif($lastpage > 5 + ($adjacents * 2))
-        {
-        if($this->_page < 1 + ($adjacents * 2))       
-        {
-        for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++)
-        {
-        if ($counter == $this->_page)
-            $pagination.= "<span class='current'>$counter</span>";
-        else
-            $pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";                   
-        }
-            $pagination.= "...";
-            $pagination.= "<a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a>";
-            $pagination.= "<a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a>";       
-        }
-        elseif($lastpage - ($adjacents * 2) > $this->_page && $this->_page > ($adjacents * 2))
-        {
-            $pagination.= "<a href='".$path."$this->_instance=1"."$ext'>1</a>";
-            $pagination.= "<a href='".$path."$this->_instance=2"."$ext'>2</a>";
-            $pagination.= "...";
-        for ($counter = $this->_page - $adjacents; $counter <= $this->_page + $adjacents; $counter++)
-        {
-        if ($counter == $this->_page)
-            $pagination.= "<span class='current'>$counter</span>";
-        else
-            $pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";                   
-        }
-            $pagination.= "..";
-            $pagination.= "<a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a>";
-            $pagination.= "<a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a>";       
-        }
-        else
-        {
-            $pagination.= "<a href='".$path."$this->_instance=1"."$ext'>1</a>";
-            $pagination.= "<a href='".$path."$this->_instance=2"."$ext'>2</a>";
-            $pagination.= "..";
-        for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++)
-        {
-        if ($counter == $this->_page)
-            $pagination.= "<span class='current'>$counter</span>";
-        else
-            $pagination.= "<a href='".$path."$this->_instance=$counter"."$ext'>$counter</a>";                   
-        }
-        }
-        }
-
-        if ($this->_page < $counter - 1)
-            $pagination.= "<a href='".$path."$this->_instance=$next"."$ext'>next »</a>";
-        else
-            $pagination.= "<span class='disabled'>next »</span>";
-            $pagination.= "</div>\n";       
-        }
-
-
-    return $pagination;
-    }
-}
diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/poche/FlattrItem.class.php
index ef8c62f7..ef8c62f7 100644
--- a/inc/3rdparty/FlattrItem.class.php
+++ b/inc/poche/FlattrItem.class.php
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 4d119456..c17d54e6 100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -29,7 +29,7 @@ require_once INCLUDES . '/3rdparty/paginator.php';
 
 require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedItem.php';
 require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedWriter.php';
-require_once INCLUDES . '/3rdparty/FlattrItem.class.php';
+require_once INCLUDES . '/poche/FlattrItem.class.php';
 
 # epub library
 require_once INCLUDES . '/3rdparty/libraries/PHPePub/Logger.php';