devol
/
wallabag
mirror of https://github.com/wallabag/wallabag.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of git://github.com/arnaudmm/wallabag into arnaudmm-dev

This commit is contained in:
Nicolas Lœuillet 2014-02-20 13:15:27 +01:00
parent 8975653d4c 926acd7bba
commit fddf4fbacc
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
inc/poche/Poche.class.php
View File

@ -403,7 +403,7 @@ class Poche
/** /**
* Call action (mark as fav, archive, delete, etc.) * Call action (mark as fav, archive, delete, etc.)
*/ */
public function action($action, Url $url, $id = 0, $import = FALSE, $autoclose = FALSE) public function action($action, Url $url, $id = 0, $import = FALSE, $autoclose = FALSE, $tags = null)
{ {
switch ($action) switch ($action)
{ {
@ -499,8 +499,14 @@ class Poche
} }
break; break;
case 'add_tag' : case 'add_tag' :
$tags = explode(',', $_POST['value']); if($import){
$entry_id = $_POST['entry_id']; $entry_id = $id;
$tags = explode(',', $tags);
}
else{
$tags = explode(',', $_POST['value']);
$entry_id = $_POST['entry_id'];
}
$entry = $this->store->retrieveOneById($entry_id, $this->user->getId()); $entry = $this->store->retrieveOneById($entry_id, $this->user->getId());
if (!$entry) { if (!$entry) {
$this->messages->add('e', _('Article not found!')); $this->messages->add('e', _('Article not found!'));
@ -527,7 +533,9 @@ class Poche
# we assign the tag to the article # we assign the tag to the article
$this->store->setTagToEntry($tag_id, $entry_id); $this->store->setTagToEntry($tag_id, $entry_id);
} }
Tools::redirect(); if(!$import) {
Tools::redirect();
}
break; break;
case 'remove_tag' : case 'remove_tag' :
$tag_id = $_GET['tag_id']; $tag_id = $_GET['tag_id'];
@ -890,14 +898,18 @@ class Poche
$a = $li->find('a'); $a = $li->find('a');
$url = new Url(base64_encode($a[0]->href)); $url = new Url(base64_encode($a[0]->href));
$this->action('add', $url, 0, TRUE); $this->action('add', $url, 0, TRUE);
$sequence = '';
if (STORAGE == 'postgres') {
$sequence = 'entries_id_seq';
}
$last_id = $this->store->getLastId($sequence);
if ($read == '1') { if ($read == '1') {
$sequence = '';
if (STORAGE == 'postgres') {
$sequence = 'entries_id_seq';
}
$last_id = $this->store->getLastId($sequence);
$this->action('toggle_archive', $url, $last_id, TRUE); $this->action('toggle_archive', $url, $last_id, TRUE);
} }
$tags = $a[0]->tags;
if(!empty($tags)) {
$this->action('add_tag',$url,$last_id,true,false,$tags);
}
} }
# the second <ul> is for read links # the second <ul> is for read links