4 files changed, 218 insertions, 13 deletions

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
new file mode 100644
index 00000000..a226b31e
--- /dev/null
+++ b/inc/poche/Database.class.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * poche, a read it later open source system
+ *
+ * @category   poche
+ * @author     Nicolas Lœuillet <support@inthepoche.com>
+ * @copyright  2013
+ * @license    http://www.wtfpl.net/ see COPYING file
+ */
+
+class Database {
+
+    #postgresql
+    public static $db_path = 'pgsql:host=localhost;dbname=poche';
+    public static $user = 'postgres';
+    public static $password = 'postgres';
+    #sqlite
+    // public static $db_path = 'sqlite:./db/poche.sqlite';
+    // public static $user = '';
+    // public static $password = '';
+    #mysql
+    // public static $db_path = 'mysql:host=localhost;dbname=poche';
+    // public static $user = 'root';
+    // public static $password = 'root';
+
+    var $handle;
+
+    function __construct() {
+        $this->handle = new PDO(self::$db_path, self::$user, self::$password);
+        $this->handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+    }
+
+    private function getHandle() {
+        return $this->handle;
+    }
+
+    public function isInstalled() {
+        $sql = "SELECT username FROM users WHERE id=?";
+        $query = $this->executeQuery($sql, array('1'));
+        $hasAdmin = $query->fetchAll();
+
+        if (count($hasAdmin) == 0) 
+            return FALSE;
+
+        return TRUE;
+    }
+
+    public function install($login, $password) {
+        $sql = 'INSERT INTO users ( username, password ) VALUES (?, ?)';
+        $params = array($login, $password);
+        $query = $this->executeQuery($sql, $params);
+
+        return TRUE;
+    }
+
+    private function getConfigUser($id) {
+        $sql = "SELECT * FROM users_config WHERE user_id = ?";
+        $query = $this->executeQuery($sql, array($id));
+        $result = $query->fetchAll();
+        $user_config = array();
+        
+        foreach ($result as $key => $value) {
+            $user_config[$value['name']] = $value['value'];
+        }
+
+        return $user_config;
+    }
+
+    public function login($username, $password) {
+        $sql = "SELECT * FROM users WHERE username=? AND password=?";
+        $query = $this->executeQuery($sql, array($username, $password));
+        $login = $query->fetchAll();
+
+        $user = array();
+        if (isset($login[0])) {
+            $user['id'] = $login[0]['id'];
+            $user['username'] = $login[0]['username'];
+            $user['password'] = $login[0]['password'];
+            $user['name'] = $login[0]['name'];
+            $user['email'] = $login[0]['email'];
+            $user['config'] = $this->getConfigUser($login[0]['id']);
+        }
+
+        return $user;
+    }
+
+    public function updatePassword($id, $password)
+    {
+        $sql_update = "UPDATE users SET password=? WHERE id=?";
+        $params_update = array($password, $id);
+        $query = $this->executeQuery($sql_update, $params_update);
+    }
+
+    private function executeQuery($sql, $params) {
+        try
+        {
+            $query = $this->getHandle()->prepare($sql);
+            $query->execute($params);
+            return $query;
+        }
+        catch (Exception $e)
+        {
+            Tools::logm('execute query error : '.$e->getMessage());
+            return FALSE;
+        }
+    }
+
+    public function retrieveAll($user_id) {
+        $sql        = "SELECT * FROM entries WHERE user_id=? ORDER BY id";
+        $query      = $this->executeQuery($sql, array($user_id));
+        $entries    = $query->fetchAll();
+
+        return $entries;
+    }
+
+    public function retrieveOneById($id, $user_id) {
+        $entry  = NULL;
+        $sql    = "SELECT * FROM entries WHERE id=? AND user_id=?";
+        $params = array(intval($id), $user_id);
+        $query  = $this->executeQuery($sql, $params);
+        $entry  = $query->fetchAll();
+
+        return $entry[0];
+    }
+
+    public function getEntriesByView($view, $user_id, $limit = '') {
+        switch ($_SESSION['sort'])
+        {
+            case 'ia':
+                $order = 'ORDER BY id';
+                break;
+            case 'id':
+                $order = 'ORDER BY id DESC';
+                break;
+            case 'ta':
+                $order = 'ORDER BY lower(title)';
+                break;
+            case 'td':
+                $order = 'ORDER BY lower(title) DESC';
+                break;
+            default:
+                $order = 'ORDER BY id';
+                break;
+        }
+
+        switch ($view)
+        {
+            case 'archive':
+                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_read=? " . $order;
+                $params = array($user_id, 1);
+                break;
+            case 'fav' :
+                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_fav=? " . $order;
+                $params = array($user_id, 1);
+                break;
+            default:
+                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_read=? " . $order;
+                $params = array($user_id, 0);
+                break;
+        }
+
+        $sql .= ' ' . $limit;
+
+        $query = $this->executeQuery($sql, $params);
+        $entries = $query->fetchAll();
+
+        return $entries;
+    }
+
+    public function add($url, $title, $content, $user_id) {
+        $sql_action = 'INSERT INTO entries ( url, title, content, user_id ) VALUES (?, ?, ?, ?)';
+        $params_action = array($url, $title, $content, $user_id);
+        $query = $this->executeQuery($sql_action, $params_action);
+        return $query;
+    }
+
+    public function deleteById($id, $user_id) {
+        $sql_action     = "DELETE FROM entries WHERE id=? AND user_id=?";
+        $params_action  = array($id, $user_id);
+        $query          = $this->executeQuery($sql_action, $params_action);
+        return $query;
+    }
+
+    public function favoriteById($id, $user_id) {
+        $sql_action     = "UPDATE entries SET is_fav=NOT is_fav WHERE id=? AND user_id=?";
+        $params_action  = array($id, $user_id);
+        $query          = $this->executeQuery($sql_action, $params_action);
+    }
+
+    public function archiveById($id, $user_id) {
+        $sql_action     = "UPDATE entries SET is_read=NOT is_read WHERE id=? AND user_id=?";
+        $params_action  = array($id, $user_id);
+        $query          = $this->executeQuery($sql_action, $params_action);
+    }
+
+    public function getLastId() {
+        return $this->getHandle()->lastInsertId();
+    }
+}
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index ce5bb54a..0a43df71 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -16,9 +16,9 @@ class Poche
     public $messages;
     public $pagination;
 
-    function __construct($storage_type)
+    function __construct()
     {
-        $this->store = new $storage_type();
+        $this->store = new Database();
         $this->init();
         $this->messages = new Messages();
 
@@ -52,9 +52,13 @@ class Poche
 
         # template engine
         $loader = new Twig_Loader_Filesystem(TPL);
-        $this->tpl = new Twig_Environment($loader, array(
-            'cache' => CACHE,
-        ));
+        if (DEBUG_POCHE) {
+            $twig_params = array();
+        }
+        else {
+            $twig_params = array('cache' => CACHE);
+        }
+        $this->tpl = new Twig_Environment($loader, $twig_params);
         $this->tpl->addExtension(new Twig_Extensions_Extension_I18n());
         # filter to display domain name of an url
         $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
@@ -124,18 +128,19 @@ class Poche
                 Tools::redirect();
                 break;
             case 'delete':
+                $msg = 'delete link #' . $id;
                 if ($this->store->deleteById($id, $this->user->getId())) {
                     if (DOWNLOAD_PICTURES) {
                         remove_directory(ABS_PATH . $id);
                     }
                     $this->messages->add('s', _('the link has been deleted successfully'));
-                    Tools::logm('delete link #' . $id);
                 }
                 else {
                     $this->messages->add('e', _('the link wasn\'t deleted'));
-                    Tools::logm('error : can\'t delete link #' . $id);
+                    $msg = 'error : can\'t delete link #' . $id;
                 }
-                Tools::redirect();
+                Tools::logm($msg);
+                Tools::redirect('?');
                 break;
             case 'toggle_fav' :
                 $this->store->favoriteById($id, $this->user->getId());
@@ -385,7 +390,7 @@ class Poche
         if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
            $version = file_get_contents($cache_file);
         } else {
-           $version = file_get_contents('http://www.inthepoche.com/' . $which);
+           $version = file_get_contents('http://static.inthepoche.com/versions/' . $which);
            file_put_contents($cache_file, $version, LOCK_EX);
         }
         return $version;
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 8b339ea5..d0e43166 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -77,6 +77,7 @@ class Tools
                 $url = $ref;
             }
         }
+        self::logm('redirect to ' . $url);
         header('Location: '.$url);
         exit();
     }
@@ -198,6 +199,7 @@ class Tools
         if (DEBUG_POCHE) {
             $t = strval(date('Y/m/d_H:i:s')) . ' - ' . $_SERVER["REMOTE_ADDR"] . ' - ' . strval($message) . "\n";
             file_put_contents(CACHE . '/log.txt', $t, FILE_APPEND);
+            error_log('DEBUG POCHE : ' . $message);
         }
     }
 
diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php
index a8a9c032..834b18ea 100644
--- a/inc/poche/config.inc.php
+++ b/inc/poche/config.inc.php
@@ -24,7 +24,7 @@ define ('CACHE', './cache');
 define ('LANG', 'en_EN.UTF8');
 define ('PAGINATION', '10');
 define ('THEME', 'light');
-$storage_type = 'sqlite'; # sqlite, mysql, (file, not yet)
+define ('STORAGE','postgres'); # postgres, mysql, sqlite
 
 # /!\ Be careful if you change the lines below /!\
 require_once './inc/poche/User.class.php';
@@ -34,8 +34,7 @@ require_once './inc/3rdparty/class.messages.php';
 require_once './inc/poche/Poche.class.php';
 require_once './inc/3rdparty/Readability.php';
 require_once './inc/3rdparty/Encoding.php';
-require_once './inc/store/store.class.php';
-require_once './inc/store/' . $storage_type . '.class.php';
+require_once './inc/poche/Database.class.php';
 require_once './vendor/autoload.php';
 require_once './inc/3rdparty/simple_html_dom.php';
 require_once './inc/3rdparty/paginator.php';
@@ -45,7 +44,7 @@ if (DOWNLOAD_PICTURES) {
     require_once './inc/poche/pochePictures.php';
 }
 
-$poche = new Poche($storage_type);
+$poche = new Poche();
 
 #XSRF protection with token
 // if (!empty($_POST)) {