]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
up to date 722/head
authortcit <tcit@tcit.fr>
Sat, 7 Jun 2014 14:36:57 +0000 (16:36 +0200)
committertcit <tcit@tcit.fr>
Sat, 7 Jun 2014 14:36:57 +0000 (16:36 +0200)
1  2 
inc/poche/Poche.class.php

index 4139c4f4615525e098eafd625765b4ccb70eb8d2,3d1337f34d7649eeaa422eda2b9c59542a39936d..09a9f5ff85276423a29b505312d2f1cec66ead8a
@@@ -1145,7 -1144,8 +1144,9 @@@ class Poch
        $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);
++
+       //allow YouTube, Vimeo and dailymotion videos
+       $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%');
  
        return new HTMLPurifier($config);
      }
          . "<body>\n";
  
          $bookEnd = "</body>\n</html>\n";
-         
          $log = new Logger("wallabag", TRUE);
          $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);