]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
do not debug inside an epub
authortcit <tcit@tcit.fr>
Sat, 7 Jun 2014 13:53:39 +0000 (15:53 +0200)
committertcit <tcit@tcit.fr>
Sat, 7 Jun 2014 13:53:39 +0000 (15:53 +0200)
inc/3rdparty/libraries/PHPePub/EPub.php
inc/poche/Poche.class.php

index f1f41bd50b2ba68c5dc9e6aad8f75b79430a8cbc..d9b990b7a8a03afe47f5039b1d2382db76866fad 100644 (file)
@@ -41,6 +41,8 @@ class EPub {
 
     private $bookVersion = EPub::BOOK_VERSION_EPUB2;
 
+    private $debugInside = FALSE;
+
        public $maxImageWidth = 768;
     public $maxImageHeight = 1024;
 
@@ -132,10 +134,14 @@ class EPub {
      *
      * @return void
      */
-    function __construct($bookVersion = EPub::BOOK_VERSION_EPUB2, $languageCode = "en", $writingDirection = EPub::DIRECTION_LEFT_TO_RIGHT) {
+    function __construct($bookVersion = EPub::BOOK_VERSION_EPUB2, $debugInside = FALSE, $languageCode = "en", $writingDirection = EPub::DIRECTION_LEFT_TO_RIGHT) {
         include_once("Zip.php");
                include_once("Logger.php");
 
+        if (!$debugInside) {
+            error_reporting(E_ERROR | E_PARSE);
+        }
+
                $this->bookVersion = $bookVersion;
                $this->writingDirection = $writingDirection;
                $this->languageCode = $languageCode;
index 1b69cd619a74d4f82662418dc79bd998cee67066..4139c4f4615525e098eafd625765b4ccb70eb8d2 100755 (executable)
@@ -1142,11 +1142,11 @@ class Poche
      * return new purifier object with actual config
      */
     protected function getPurifier() {
-      $config = HTMLPurifier_Config::createDefault();\r
-      $config->set('Cache.SerializerPath', CACHE);\r
-      $config->set('HTML.SafeIframe', true);\r
+      $config = HTMLPurifier_Config::createDefault();
+      $config->set('Cache.SerializerPath', CACHE);
+      $config->set('HTML.SafeIframe', true);
       $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%'); //allow YouTube and Vimeo$purifier = new HTMLPurifier($config);
-\r
+
       return new HTMLPurifier($config);
     }
     
@@ -1208,7 +1208,7 @@ class Poche
         $fileDir = CACHE;
 
         
-        $book = new EPub(EPub::BOOK_VERSION_EPUB3);
+        $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE);
         $log->logLine("new EPub()");
         $log->logLine("EPub class version: " . EPub::VERSION);
         $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION);