mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-10-02 00:01:59 +00:00
Code Issues Projects Releases Wiki Activity

remove duplicates by import, code changes: tabs replaced with spaces

Browse source
This commit is contained in:
Maryana Rozhankivska 2014-04-08 11:41:06 +03:00
parent d7ee9f986b
commit 86da39886d
1 changed files with 37 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
inc/poche/Poche.class.php
View file

@ -872,10 +872,10 @@ class Poche
}
}
$i = 0; //counter for articles inserted
$urlsInserted = array(); //urls of articles inserted
foreach ($data as $record) {
$url = trim( isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : '') );
if ( $url ) {
if ( $url and !in_array($url, $urlsInserted) ) {
$title = (isset($record['title']) ? $record['title'] : _('Untitled - Import - ').'</a> <a href="./?import">'._('click to finish import').'</a><a>');
$body = (isset($record['content']) ? $record['content'] : '');
$isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive'])?intval($record['archive']):0));
@ -883,8 +883,8 @@ class Poche
//insert new record
$id = $this->store->add($url, $title, $body, $this->user->getId(), $isFavorite, $isRead);
if ( $id ) {
//increment no of records inserted
$i++;
$urlsInserted[] = $url; //add
if ( isset($record['tags']) && trim($record['tags']) ) {
//@TODO: set tags
@ -893,6 +893,7 @@ class Poche
}
}
$i = sizeof($urlsInserted);
if ( $i > 0 ) {
$this->messages->add('s', _('Articles inserted: ').$i._('. Please note, that some may be marked as "read".'));
}