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

diff --git a/composer.json b/composer.json
index a63f2893f526dc6015c3322b585caddbc2cd6c1e..f48e5dfcb448fb4081dcea53ddd852c56702782b 100644 (file)
--- 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
+}

diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index 0d33cdc3e3526ead0b8090305bcf6d9d4c956bce..138da48d33032a6d8369e5063d135f3ab2a4f44e 100755 (executable)
--- 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();

diff --git a/inc/poche/WallabagEBooks.class.php b/inc/poche/WallabagEBooks.class.php
index 54c2b1bcf2d35b53f07fa7003e815fcbba8757ed..ec1e4b2719d6b3e6abb8e423b27e3f626602805b 100644 (file)
--- a/inc/poche/WallabagEBooks.class.php
+++ b/inc/poche/WallabagEBooks.class.php
@@ -96,7 +96,6 @@ class WallabagEpub extends WallabagEBooks
         $bookEnd = "</body>\n</html>\n";
 
         $log = new Logger("wallabag", TRUE);
-        $fileDir = CACHE;
 
         $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE);
         $log->logLine("new EPub()");
@@ -121,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 = "<h1> " . $this->bookTitle . "</h1>\n";
@@ -180,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);
@@ -243,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']);
             }