From 6285e57c49bd06ed52ab997f0dc767576b7da126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 14 Feb 2014 15:11:57 +0100 Subject: [add] link to empty cache in config screen, #454 --- inc/poche/Poche.class.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'inc') diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 5eba3564..d0e2de1f 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -1057,4 +1057,20 @@ class Poche $feed->genarateFeed(); exit; } + + public function emptyCache() { + $files = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator(CACHE, RecursiveDirectoryIterator::SKIP_DOTS), + RecursiveIteratorIterator::CHILD_FIRST + ); + + foreach ($files as $fileinfo) { + $todo = ($fileinfo->isDir() ? 'rmdir' : 'unlink'); + $todo($fileinfo->getRealPath()); + } + + Tools::logm('empty cache'); + $this->messages->add('s', _('Cache deleted.')); + Tools::redirect(); + } } -- cgit v1.2.3 From 488fc63b67312640dcac68a324794ec4a591ba6d Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 14 Feb 2014 17:27:22 +0200 Subject: duplicate check added. fix of issue #400 --- inc/poche/Database.class.php | 16 ++++++++++++++++ inc/poche/Poche.class.php | 19 +++++++++++++++++++ 2 files changed, 35 insertions(+) (limited to 'inc') diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index 9f553fa1..58583bf5 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -241,6 +241,22 @@ class Database { return isset($entry[0]) ? $entry[0] : null; } + 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 = '') { switch ($_SESSION['sort']) { diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index d0e2de1f..76169297 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -374,6 +374,11 @@ class Poche $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'); $body = $content['rss']['channel']['item']['description']; + //search for possible duplicate if not in import mode + if (!$import) { + $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId()); + } + if ($this->store->add($url->getUrl(), $title, $body, $this->user->getId())) { Tools::logm('add link ' . $url->getUrl()); $sequence = ''; @@ -386,6 +391,20 @@ class Poche Tools::logm('updating content article'); $this->store->updateContent($last_id, $content, $this->user->getId()); } + + if ($duplicate != NULL) { + // duplicate exists, so, older entry needs to be deleted (as new entry should go to the top of list), BUT favorite mark and tags should be preserved + Tools::logm('link ' . $url->getUrl() . ' is a duplicate'); + // 1) - preserve tags and favorite, then drop old entry + $this->store->reassignTags($duplicate['id'], $last_id); + if ($duplicate['is_fav']) { + $this->store->favoriteById($last_id, $this->user->getId()); + } + if ($this->store->deleteById($duplicate['id'], $this->user->getId())) { + Tools::logm('previous link ' . $url->getUrl() .' entry deleted'); + } + } + if (!$import) { $this->messages->add('s', _('the link has been added successfully')); } -- cgit v1.2.3 From b89d5a2bf48c2c1eb796963b3401aca498618ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 19 Feb 2014 13:25:28 +0100 Subject: [fix] security problems with tags --- inc/poche/Database.class.php | 24 +++++++++++++++--------- inc/poche/Poche.class.php | 26 ++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 13 deletions(-) (limited to 'inc') diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index 58583bf5..3332b5a3 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -344,30 +344,36 @@ class Database { return $this->getHandle()->lastInsertId($column); } - public function retrieveAllTags() { - $sql = "SELECT * FROM tags"; - $query = $this->executeQuery($sql, array()); + public function retrieveAllTags($user_id) { + $sql = "SELECT 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 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 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; diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 76169297..753bd7f0 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -463,6 +463,12 @@ class Poche case 'add_tag' : $tags = explode(',', $_POST['value']); $entry_id = $_POST['entry_id']; + $entry = $this->store->retrieveOneById($entry_id, $this->user->getId()); + if (!$entry) { + $this->messages->add('e', _('Article not found!')); + Tools::logm('error : article not found'); + Tools::redirect(); + } foreach($tags as $key => $tag_value) { $value = trim($tag_value); $tag = $this->store->retrieveTagByValue($value); @@ -487,6 +493,12 @@ class Poche break; case 'remove_tag' : $tag_id = $_GET['tag_id']; + $entry = $this->store->retrieveOneById($id, $this->user->getId()); + if (!$entry) { + $this->messages->add('e', _('Article not found!')); + Tools::logm('error : article not found'); + Tools::redirect(); + } $this->store->removeTagForEntry($id, $tag_id); Tools::redirect(); break; @@ -525,6 +537,12 @@ class Poche break; case 'edit-tags': # tags + $entry = $this->store->retrieveOneById($id, $this->user->getId()); + if (!$entry) { + $this->messages->add('e', _('Article not found!')); + Tools::logm('error : article not found'); + Tools::redirect(); + } $tags = $this->store->retrieveTagsByEntry($id); $tpl_vars = array( 'entry_id' => $id, @@ -532,8 +550,8 @@ class Poche ); break; case 'tag': - $entries = $this->store->retrieveEntriesByTag($id); - $tag = $this->store->retrieveTag($id); + $entries = $this->store->retrieveEntriesByTag($id, $this->user->getId()); + $tag = $this->store->retrieveTag($id, $this->user->getId()); $tpl_vars = array( 'tag' => $tag, 'entries' => $entries, @@ -541,7 +559,7 @@ class Poche break; case 'tags': $token = $this->user->getConfigValue('token'); - $tags = $this->store->retrieveAllTags(); + $tags = $this->store->retrieveAllTags($this->user->getId()); $tpl_vars = array( 'token' => $token, 'user_id' => $this->user->getId(), @@ -1056,7 +1074,7 @@ class Poche $feed->setChannelElement('author', 'wallabag'); if ($type == 'tag') { - $entries = $this->store->retrieveEntriesByTag($tag_id); + $entries = $this->store->retrieveEntriesByTag($tag_id, $user_id); } else { $entries = $this->store->getEntriesByView($type, $user_id); -- cgit v1.2.3