aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKevin Decherf <kevin@kdecherf.com>2019-01-06 19:23:01 +0100
committerKevin Decherf <kevin@kdecherf.com>2019-01-07 21:43:16 +0100
commit30cf72bf55cdb2130e9096b1f7bcfa2f2ea1df1c (patch)
treec08041bdc579fcb5a4fbe934fa611d092480bdd0
parentedd1825b5832303b714bec37b8796b9077e7ddc0 (diff)
downloadwallabag-30cf72bf55cdb2130e9096b1f7bcfa2f2ea1df1c.tar.gz
wallabag-30cf72bf55cdb2130e9096b1f7bcfa2f2ea1df1c.tar.zst
wallabag-30cf72bf55cdb2130e9096b1f7bcfa2f2ea1df1c.zip
EntriesExport/epub: revert c779373f, move exportinfo to the end of the book
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
-rw-r--r--src/Wallabag/CoreBundle/Helper/EntriesExport.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index ea5a03cf..92f1779c 100644
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -188,7 +188,7 @@ class EntriesExport
188 } 188 }
189 $filename = sha1($entry->getTitle()); 189 $filename = sha1($entry->getTitle());
190 190
191 $titlepage = $content_start . '<h1>' . $entry->getTitle() . '</h1>' . $this->getExportInformation('PHPePub') . $bookEnd; 191 $titlepage = $content_start . '<h1>' . $entry->getTitle() . '</h1>' . $bookEnd;
192 $book->addChapter("Entry {$i} of {$entryCount}", "{$filename}_cover.html", $titlepage, true, EPub::EXTERNAL_REF_ADD); 192 $book->addChapter("Entry {$i} of {$entryCount}", "{$filename}_cover.html", $titlepage, true, EPub::EXTERNAL_REF_ADD);
193 $chapter = $content_start . $entry->getContent() . $bookEnd; 193 $chapter = $content_start . $entry->getContent() . $bookEnd;
194 194
@@ -196,6 +196,8 @@ class EntriesExport
196 $book->addChapter($entry->getTitle(), "{$filename}.html", $chapter, true, EPub::EXTERNAL_REF_ADD); 196 $book->addChapter($entry->getTitle(), "{$filename}.html", $chapter, true, EPub::EXTERNAL_REF_ADD);
197 } 197 }
198 198
199 $book->addChapter('Notices', 'Cover2.html', $content_start . $this->getExportInformation('PHPePub') . $bookEnd);
200
199 // Could also be the ISBN number, prefered for published books, or a UUID. 201 // Could also be the ISBN number, prefered for published books, or a UUID.
200 $hash = sha1(sprintf('%s:%s', $this->wallabagUrl, implode(',', $entryIds))); 202 $hash = sha1(sprintf('%s:%s', $this->wallabagUrl, implode(',', $entryIds)));
201 $book->setIdentifier(sprintf('urn:wallabag:%s', $hash), EPub::IDENTIFIER_URI); 203 $book->setIdentifier(sprintf('urn:wallabag:%s', $hash), EPub::IDENTIFIER_URI);