X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fpoche%2FDatabase.class.php;h=c998fe14db5fcd40dd79a9ab9c22501633c39139;hb=6065553c137ec63ec3ffddda0350f1d3d805b852;hp=d95b9b8101c08903bd4dfa80875697aca957b9db;hpb=c432fa1674fbe2b190cf0d0bab2e90302a61e98f;p=github%2Fwallabag%2Fwallabag.git

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
old mode 100644
new mode 100755
index d95b9b81..c998fe14
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -1,17 +1,24 @@
 <?php
 /**
- * poche, a read it later open source system
+ * wallabag, self hostable application allowing you to not miss any content anymore
  *
- * @category   poche
- * @author     Nicolas Lœuillet <support@inthepoche.com>
+ * @category   wallabag
+ * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
 class Database {
     var $handle;
-
-    function __construct()
+    private $order = array(
+      'ia' => 'ORDER BY entries.id',
+      'id' => 'ORDER BY entries.id DESC',
+      'ta' => 'ORDER BY lower(entries.title)',
+      'td' => 'ORDER BY lower(entries.title) DESC',
+      'default' => 'ORDER BY entries.id'
+    );
+
+    function __construct() 
     {
         switch (STORAGE) {
             case 'sqlite':
@@ -39,12 +46,79 @@ class Database {
     public function isInstalled() {
         $sql = "SELECT username FROM users";
         $query = $this->executeQuery($sql, array());
+        if ($query == false) {
+            die(STORAGE . ' database looks empty. You have to create it (you can find database structure in install folder).');
+        }
         $hasAdmin = count($query->fetchAll());
 
         if ($hasAdmin == 0) 
-            return FALSE;
+            return false;
 
-        return TRUE;
+        return true;
+    }
+
+    public function checkTags() {
+
+        if (STORAGE == 'sqlite') {
+            $sql = '
+                CREATE TABLE IF NOT EXISTS tags (
+                    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE,
+                    value TEXT
+                )';
+        }
+        elseif(STORAGE == 'mysql') {
+            $sql = '
+                CREATE TABLE IF NOT EXISTS `tags` (
+                  `id` int(11) NOT NULL AUTO_INCREMENT,
+                  `value` varchar(255) NOT NULL,
+                  PRIMARY KEY (`id`)
+                ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+            ';
+        }
+        else {
+            $sql = '
+                CREATE TABLE tags (
+                  id bigserial primary key,
+                  value varchar(255) NOT NULL
+                );
+            ';
+        }
+
+        $query = $this->executeQuery($sql, array());
+
+        if (STORAGE == 'sqlite') {
+            $sql = '
+                CREATE TABLE IF NOT EXISTS tags_entries (
+                    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE,
+                    entry_id INTEGER,
+                    tag_id INTEGER,
+                    FOREIGN KEY(entry_id) REFERENCES entries(id) ON DELETE CASCADE,
+                    FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE
+                )';
+        }
+        elseif(STORAGE == 'mysql') {
+            $sql = '
+                CREATE TABLE IF NOT EXISTS `tags_entries` (
+                  `id` int(11) NOT NULL AUTO_INCREMENT,
+                  `entry_id` int(11) NOT NULL,
+                  `tag_id` int(11) NOT NULL,
+                  FOREIGN KEY(entry_id) REFERENCES entries(id) ON DELETE CASCADE,
+                  FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE,
+                  PRIMARY KEY (`id`)
+                ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+            ';
+        }
+        else {
+            $sql = '
+                CREATE TABLE tags_entries (
+                  id bigserial primary key,
+                  entry_id integer NOT NULL,
+                  tag_id integer NOT NULL
+                )
+            ';
+        }
+
+        $query = $this->executeQuery($sql, array());
     }
 
     public function install($login, $password) {
@@ -98,9 +172,14 @@ class Database {
         }
     }
 
-    public function login($username, $password) {
-        $sql = "SELECT * FROM users WHERE username=? AND password=?";
-        $query = $this->executeQuery($sql, array($username, $password));
+    public function login($username, $password, $isauthenticated=false) {
+        if ($isauthenticated) {
+          $sql = "SELECT * FROM users WHERE username=?";
+          $query = $this->executeQuery($sql, array($username));
+        } else {
+          $sql = "SELECT * FROM users WHERE username=? AND password=?";
+          $query = $this->executeQuery($sql, array($username, $password));
+        }
         $login = $query->fetchAll();
 
         $user = array();
@@ -126,11 +205,11 @@ class Database {
     public function updateUserConfig($userId, $key, $value) {
         $config = $this->getConfigUser($userId);
         
-        if (!isset ($user_config[$key])) {
-            $sql = "INSERT INTO users_config (`value`, `user_id`, `name`) VALUES (?, ?, ?)";
+        if (! isset($config[$key])) {
+            $sql = "INSERT INTO users_config (value, user_id, name) VALUES (?, ?, ?)";
         }
         else {
-            $sql = "UPDATE users_config SET `value`=? WHERE `user_id`=? AND `name`=?";
+            $sql = "UPDATE users_config SET value=? WHERE user_id=? AND name=?";
         }
 
         $params = array($value, $userId, $key);
@@ -169,48 +248,78 @@ class Database {
         return isset($entry[0]) ? $entry[0] : null;
     }
 
-    public function getEntriesByView($view, $user_id, $limit = '') {
-        switch ($_SESSION['sort'])
-        {
-            case 'ia':
-                $order = 'ORDER BY id';
-                break;
-            case 'id':
-                $order = 'ORDER BY id DESC';
+    public function retrieveOneByURL($url, $user_id) {
+        $entry  = NULL;
+        $sql    = "SELECT * FROM entries WHERE url=? AND user_id=?";
+        $params = array($url, $user_id);
+        $query  = $this->executeQuery($sql, $params);
+        $entry  = $query->fetchAll();
+
+        return isset($entry[0]) ? $entry[0] : null;
+    }
+
+    public function reassignTags($old_entry_id, $new_entry_id) {
+        $sql    = "UPDATE tags_entries SET entry_id=? WHERE entry_id=?";
+        $params = array($new_entry_id, $old_entry_id);
+        $query  = $this->executeQuery($sql, $params);
+    }
+
+    public function getEntriesByView($view, $user_id, $limit = '', $tag_id = 0) {
+        switch ($view) {
+            case 'archive':
+                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_read=? ";
+                $params = array($user_id, 1);
                 break;
-            case 'ta':
-                $order = 'ORDER BY lower(title)';
+            case 'fav' :
+                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_fav=? ";
+                $params = array($user_id, 1);
                 break;
-            case 'td':
-                $order = 'ORDER BY lower(title) DESC';
+            case 'tag' :
+                $sql    = "SELECT entries.* FROM entries
+                LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
+                WHERE entries.user_id=? AND tags_entries.tag_id = ? ";
+                $params = array($user_id, $tag_id);
                 break;
             default:
-                $order = 'ORDER BY id';
+                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_read=? ";
+                $params = array($user_id, 0);
                 break;
         }
 
-        switch ($view)
-        {
+                $sql .= $this->getEntriesOrder().' ' . $limit;
+
+                $query = $this->executeQuery($sql, $params);
+                $entries = $query->fetchAll();
+
+                return $entries;
+        }
+
+    public function getEntriesByViewCount($view, $user_id, $tag_id = 0) {
+        switch ($view) {
             case 'archive':
-                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_read=? " . $order;
+                    $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";
                 $params = array($user_id, 1);
                 break;
             case 'fav' :
-                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_fav=? " . $order;
+                    $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_fav=? ";
                 $params = array($user_id, 1);
                 break;
+            case 'tag' :
+                $sql    = "SELECT count(*) FROM entries
+                    LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
+                    WHERE entries.user_id=? AND tags_entries.tag_id = ? ";
+                $params = array($user_id, $tag_id);
+                break;
             default:
-                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_read=? " . $order;
+                $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";
                 $params = array($user_id, 0);
                 break;
         }
 
-        $sql .= ' ' . $limit;
-
         $query = $this->executeQuery($sql, $params);
-        $entries = $query->fetchAll();
+        list($count) = $query->fetch();
 
-        return $entries;
+        return $count;
     }
 
     public function updateContent($id, $content, $user_id) {
@@ -246,34 +355,46 @@ class Database {
         $query          = $this->executeQuery($sql_action, $params_action);
     }
 
+    public function archiveAll($user_id) {
+        $sql_action     = "UPDATE entries SET is_read=? WHERE user_id=? AND is_read=?";
+        $params_action  = array($user_id, 1, 0);
+        $query          = $this->executeQuery($sql_action, $params_action);
+    }
+
     public function getLastId($column = '') {
         return $this->getHandle()->lastInsertId($column);
     }
 
-    public function retrieveAllTags() {
-        $sql = "SELECT * FROM tags";
-        $query = $this->executeQuery($sql, array());
+    public function retrieveAllTags($user_id) {
+        $sql = "SELECT DISTINCT tags.* FROM tags
+          LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
+          LEFT JOIN entries ON tags_entries.entry_id=entries.id
+          WHERE entries.user_id=?";
+        $query = $this->executeQuery($sql, array($user_id));
         $tags = $query->fetchAll();
 
         return $tags;
     }
 
-    public function retrieveTag($id) {
+    public function retrieveTag($id, $user_id) {
         $tag  = NULL;
-        $sql    = "SELECT * FROM tags WHERE id=?";
-        $params = array(intval($id));
+        $sql    = "SELECT DISTINCT tags.* FROM tags
+          LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
+          LEFT JOIN entries ON tags_entries.entry_id=entries.id
+          WHERE tags.id=? AND entries.user_id=?";
+        $params = array(intval($id), $user_id);
         $query  = $this->executeQuery($sql, $params);
         $tag  = $query->fetchAll();
 
         return isset($tag[0]) ? $tag[0] : null;
     }
 
-    public function retrieveEntriesByTag($tag_id) {
+    public function retrieveEntriesByTag($tag_id, $user_id) {
         $sql = 
-            "SELECT * FROM entries
+            "SELECT entries.* FROM entries
             LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
-            WHERE tags_entries.tag_id = ?";
-        $query = $this->executeQuery($sql, array($tag_id));
+            WHERE tags_entries.tag_id = ? AND entries.user_id=?";
+        $query = $this->executeQuery($sql, array($tag_id, $user_id));
         $entries = $query->fetchAll();
 
         return $entries;
@@ -281,7 +402,7 @@ class Database {
 
     public function retrieveTagsByEntry($entry_id) {
         $sql = 
-            "SELECT * FROM tags
+            "SELECT tags.* FROM tags
             LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
             WHERE tags_entries.entry_id = ?";
         $query = $this->executeQuery($sql, array($entry_id));
@@ -320,4 +441,14 @@ class Database {
         $query = $this->executeQuery($sql_action, $params_action);
         return $query;
     }
+
+        private function getEntriesOrder() {
+            if (isset($_SESSION['sort']) and array_key_exists($_SESSION['sort'], $this->order)) {
+                return $this->order[$_SESSION['sort']];
+            }
+            else {
+                return $this->order['default'];
+            }
+        }
+
 }