X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fpoche%2FPoche.class.php;h=f85bb86cea08bf6c4de246f8cb0b0ac864f5b2b2;hb=897b2b53029b8490cd7e9ea329d4151c2f6bd123;hp=480f6d45569ac56e52fcdf67975a89fda503bac6;hpb=1acd18510a8fc5b843bf793322ed79b249b195dc;p=github%2Fwallabag%2Fwallabag.git
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 480f6d45..f85bb86c 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -32,10 +32,10 @@ class Poche
'fr_FR.utf8' => 'Français',
'it_IT.utf8' => 'Italiano',
'pl_PL.utf8' => 'Polski',
+ 'pt_BR.utf8' => 'Português (Brasil)',
'ru_RU.utf8' => 'PÑÑÑкий',
'sl_SI.utf8' => 'SlovenÅ¡Äina',
'uk_UA.utf8' => 'УкÑаÑнÑÑка',
- 'pt_BR.utf8' => 'Brasileiro',
);
public function __construct()
{
@@ -388,6 +388,7 @@ class Poche
}
//search for possible duplicate if not in import mode
+ $duplicate = NULL;
if (!$import) {
$duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
}
@@ -874,6 +875,8 @@ class Poche
# the second
is for read links
$read = 1;
}
+
+ $unlink = unlink($targetFile);
$this->messages->add('s', _('import from instapaper completed. You have to execute the cron to fetch content.'));
Tools::logm('import from instapaper completed');
Tools::redirect();
@@ -918,6 +921,8 @@ class Poche
# the second is for read links
$read = 1;
}
+
+ $unlink = unlink($targetFile);
$this->messages->add('s', _('import from pocket completed. You have to execute the cron to fetch content.'));
Tools::logm('import from pocket completed');
Tools::redirect();
@@ -974,6 +979,8 @@ class Poche
}
}
}
+
+ unlink($targetFile);
$this->messages->add('s', _('import from Readability completed. You have to execute the cron to fetch content.'));
Tools::logm('import from Readability completed');
Tools::redirect();
@@ -1020,6 +1027,8 @@ class Poche
}
}
+
+ unlink($targetFile);
$this->messages->add('s', _('import from Poche completed. You have to execute the cron to fetch content.'));
Tools::logm('import from Poche completed');
Tools::redirect();
@@ -1155,7 +1164,7 @@ class Poche
foreach ($entries as $entry) {
$newItem = $feed->createNewItem();
$newItem->setTitle($entry['title']);
- $newItem->setLink(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']);
+ $newItem->setLink($entry['url']);
$newItem->setDate(time());
$newItem->setDescription($entry['content']);
$feed->addItem($newItem);