mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-09-30 07:12:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #771 from tcitworld/refactor

Browse source 
fixed bug for epub export #755 ; also better metadata title
This commit is contained in:
Nicolas Lœuillet 2014-09-16 15:21:12 +02:00
commit 657245dcbd
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inc/poche/Routing.class.php
View file

@ -111,7 +111,7 @@ class Routing
} elseif (isset($_GET['deluser'])) { } elseif (isset($_GET['deluser'])) {
$this->wallabag->deleteUser($_POST['password4deletinguser']); $this->wallabag->deleteUser($_POST['password4deletinguser']);
} elseif (isset($_GET['epub'])) { } 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(); $epub->run();
} elseif (isset($_GET['import'])) { } elseif (isset($_GET['import'])) {
$import = $this->wallabag->import(); $import = $this->wallabag->import();

8
inc/poche/WallabagEpub.class.php
View file

@ -12,14 +12,12 @@ class WallabagEpub
{ {
protected $wallabag; protected $wallabag;
protected $method; protected $method;
protected $id;
protected $value; protected $value;
public function __construct(Poche $wallabag, $method, $id, $value) public function __construct(Poche $wallabag, $method, $value)
{ {
$this->wallabag = $wallabag; $this->wallabag = $wallabag;
$this->method = $method; $this->method = $method;
$this->id = $id;
$this->value = $value; $this->value = $value;
} }
@ -30,7 +28,7 @@ class WallabagEpub
{ {
switch ($this->method) { switch ($this->method) {
case 'id': 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()); $entry = $this->wallabag->store->retrieveOneById($entryID, $this->wallabag->user->getId());
$entries = array($entry); $entries = array($entry);
$bookTitle = $entry['title']; $bookTitle = $entry['title'];
@ -87,7 +85,7 @@ class WallabagEpub
$log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL()); $log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL());
$log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL()); $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->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->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")); $book->setDescription(_("Some articles saved on my wallabag"));