From e9540cad02e5adcd96f8439f86674d8da19d5ea7 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 7 Mar 2015 13:39:16 +0100 Subject: [PATCH 1/4] autoclose was not declared --- inc/poche/Routing.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index 0d33cdc3e..138da48d3 100755 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php @@ -15,6 +15,7 @@ class Routing protected $view; protected $action; protected $id; + protected $autoclose; protected $url; protected $file; protected $defaultVars = array(); From 00483a1e0e9174e1dc5f14d13462a8e05e78e855 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 7 Mar 2015 13:44:47 +0100 Subject: [PATCH 2/4] remove unnecessary line --- inc/poche/WallabagEBooks.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/inc/poche/WallabagEBooks.class.php b/inc/poche/WallabagEBooks.class.php index 54c2b1bcf..42913ff87 100644 --- a/inc/poche/WallabagEBooks.class.php +++ b/inc/poche/WallabagEBooks.class.php @@ -96,7 +96,6 @@ class WallabagEpub extends WallabagEBooks $bookEnd = "\n\n"; $log = new Logger("wallabag", TRUE); - $fileDir = CACHE; $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE); $log->logLine("new EPub()"); From 3b21caa2616c73a9aa659eac49f063d16ff7ad9e Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 7 Mar 2015 13:48:40 +0100 Subject: [PATCH 3/4] remove unnecessary lines (again) --- inc/poche/WallabagEBooks.class.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/inc/poche/WallabagEBooks.class.php b/inc/poche/WallabagEBooks.class.php index 42913ff87..ec1e4b271 100644 --- a/inc/poche/WallabagEBooks.class.php +++ b/inc/poche/WallabagEBooks.class.php @@ -120,8 +120,12 @@ class WallabagEpub extends WallabagEBooks $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP"); $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"); $fullTitle = "

" . $this->bookTitle . "

\n"; @@ -179,8 +183,6 @@ class WallabagMobi extends WallabagEBooks $mobi = new MOBI(); $content = new MOBIFile(); - $messages = new Messages(); // for later - Tools::logm('Filling metadata for Mobi...'); $content->set("title", $this->bookTitle); @@ -242,10 +244,9 @@ class WallabagPDF extends WallabagEbooks $pdf->writeHTMLCell(0, 0, '', '', $intro, 0, 1, 0, true, '', true); - $i = 1; Tools::logm('Adding actual content...'); foreach ($this->entries as $item) { - $tags = $this->wallabag->store->retrieveTagsByEntry($entry['id']); + $tags = $this->wallabag->store->retrieveTagsByEntry($item['id']); foreach ($tags as $tag) { $pdf->SetKeywords($tag['value']); } From ba7cd6404353b4fa8043630b7b196e15ea56917a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Votruba?= Date: Sat, 7 Mar 2015 20:42:16 +0100 Subject: [PATCH 4/4] composer: min PHP 5.3 added Ref: https://github.com/wallabag/wallabag/pull/1150 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a63f2893f..f48e5dfcb 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,9 @@ "issues": "https://github.com/wallabag/wallabag/issues" }, "require": { + "php": ">=5.3.3", "twig/twig": "1.*", "twig/extensions": "1.0.*", "umpirsky/twig-gettext-extractor": "1.1.*" } -} \ No newline at end of file +}