From 2b58426b2d4a7f1585d5d7667c0a4fbea4cd29dd Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Sun, 20 Jul 2014 00:45:45 +0200
Subject: fixed bug for epub export #755 ; also better metadata title
---
inc/poche/Routing.class.php | 2 +-
inc/poche/WallabagEpub.class.php | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index eb4c4d90..2db57d12 100644
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -111,7 +111,7 @@ class Routing
} elseif (isset($_GET['deluser'])) {
$this->wallabag->deleteUser($_POST['password4deletinguser']);
} elseif (isset($_GET['epub'])) {
- $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['id'], $_GET['value']);
+ $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['value']);
$epub->run();
} elseif (isset($_GET['import'])) {
$import = $this->wallabag->import();
diff --git a/inc/poche/WallabagEpub.class.php b/inc/poche/WallabagEpub.class.php
index b81d9bfd..9c4d3566 100644
--- a/inc/poche/WallabagEpub.class.php
+++ b/inc/poche/WallabagEpub.class.php
@@ -12,14 +12,12 @@ class WallabagEpub
{
protected $wallabag;
protected $method;
- protected $id;
protected $value;
- public function __construct(Poche $wallabag, $method, $id, $value)
+ public function __construct(Poche $wallabag, $method, $value)
{
$this->wallabag = $wallabag;
$this->method = $method;
- $this->id = $id;
$this->value = $value;
}
@@ -30,7 +28,7 @@ class WallabagEpub
{
switch ($this->method) {
case 'id':
- $entryID = filter_var($this->id, FILTER_SANITIZE_NUMBER_INT);
+ $entryID = filter_var($this->value, FILTER_SANITIZE_NUMBER_INT);
$entry = $this->wallabag->store->retrieveOneById($entryID, $this->wallabag->user->getId());
$entries = array($entry);
$bookTitle = $entry['title'];
@@ -87,7 +85,7 @@ class WallabagEpub
$log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL());
$log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL());
- $book->setTitle(_('wallabag\'s articles'));
+ $book->setTitle($bookTitle);
$book->setIdentifier("http://$_SERVER[HTTP_HOST]", EPub::IDENTIFIER_URI); // Could also be the ISBN number, prefered for published books, or a UUID.
//$book->setLanguage("en"); // Not needed, but included for the example, Language is mandatory, but EPub defaults to "en". Use RFC3066 Language codes, such as "en", "da", "fr" etc.
$book->setDescription(_("Some articles saved on my wallabag"));
--
cgit v1.2.3