mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-27 07:56:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of github.com:wallabag/wallabag into dev

Browse source
This commit is contained in:
Thomas Citharel 2015-03-08 00:23:10 +01:00
commit 5e10eee8fc
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composer.json
View file

@ -23,6 +23,7 @@
"issues": "https://github.com/wallabag/wallabag/issues" "issues": "https://github.com/wallabag/wallabag/issues"
}, },
"require": { "require": {
"php": ">=5.3.3",
"twig/twig": "1.*", "twig/twig": "1.*",
"twig/extensions": "1.0.*", "twig/extensions": "1.0.*",
"umpirsky/twig-gettext-extractor": "1.1.*" "umpirsky/twig-gettext-extractor": "1.1.*"

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

@ -15,6 +15,7 @@ class Routing
protected $view; protected $view;
protected $action; protected $action;
protected $id; protected $id;
protected $autoclose;
protected $url; protected $url;
protected $file; protected $file;
protected $defaultVars = array(); protected $defaultVars = array();

12
inc/poche/WallabagEBooks.class.php
View file

@ -96,7 +96,6 @@ class WallabagEpub extends WallabagEBooks
$bookEnd = "</body>\n</html>\n"; $bookEnd = "</body>\n</html>\n";
$log = new Logger("wallabag", TRUE); $log = new Logger("wallabag", TRUE);
$fileDir = CACHE;
$book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE); $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE);
$log->logLine("new EPub()"); $log->logLine("new EPub()");
@ -121,7 +120,11 @@ class WallabagEpub extends WallabagEBooks
$book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP"); $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP");
$book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "wallabag"); $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "wallabag");
$cssData = "body {\n margin-left: .5em;\n margin-right: .5em;\n text-align: justify;\n}\n\np {\n font-family: serif;\n font-size: 10pt;\n text-align: justify;\n text-indent: 1em;\n margin-top: 0px;\n margin-bottom: 1ex;\n}\n\nh1, h2 {\n font-family: sans-serif;\n font-style: italic;\n text-align: center;\n background-color: #6b879c;\n color: white;\n width: 100%;\n}\n\nh1 {\n margin-bottom: 2px;\n}\n\nh2 {\n margin-top: -2px;\n margin-bottom: 2px;\n}\n"; /*
* Line not used but planned to be used
*
*$cssData = "body {\n margin-left: .5em;\n margin-right: .5em;\n text-align: justify;\n}\n\np {\n font-family: serif;\n font-size: 10pt;\n text-align: justify;\n text-indent: 1em;\n margin-top: 0px;\n margin-bottom: 1ex;\n}\n\nh1, h2 {\n font-family: sans-serif;\n font-style: italic;\n text-align: center;\n background-color: #6b879c;\n color: white;\n width: 100%;\n}\n\nh1 {\n margin-bottom: 2px;\n}\n\nh2 {\n margin-top: -2px;\n margin-bottom: 2px;\n}\n";
*/
$log->logLine("Add Cover"); $log->logLine("Add Cover");
@ -180,8 +183,6 @@ class WallabagMobi extends WallabagEBooks
$mobi = new MOBI(); $mobi = new MOBI();
$content = new MOBIFile(); $content = new MOBIFile();
$messages = new Messages(); // for later
Tools::logm('Filling metadata for Mobi...'); Tools::logm('Filling metadata for Mobi...');
$content->set("title", $this->bookTitle); $content->set("title", $this->bookTitle);
@ -243,10 +244,9 @@ class WallabagPDF extends WallabagEbooks
$pdf->writeHTMLCell(0, 0, '', '', $intro, 0, 1, 0, true, '', true); $pdf->writeHTMLCell(0, 0, '', '', $intro, 0, 1, 0, true, '', true);
$i = 1;
Tools::logm('Adding actual content...'); Tools::logm('Adding actual content...');
foreach ($this->entries as $item) { foreach ($this->entries as $item) {
$tags = $this->wallabag->store->retrieveTagsByEntry($entry['id']); $tags = $this->wallabag->store->retrieveTagsByEntry($item['id']);
foreach ($tags as $tag) { foreach ($tags as $tag) {
$pdf->SetKeywords($tag['value']); $pdf->SetKeywords($tag['value']);
} }