merge epub with all the dev evolutions

[github/wallabag/wallabag.git] / inc / poche / WallabagEBooks.class.php

diff --git a/inc/poche/WallabagEBooks.class.php b/inc/poche/WallabagEBooks.class.php
index 9dc545dfeac028b1dd5dfa97f1a64dec71942dbc..bc40990b1e2cd90694e57ddd6b71df2412538c65 100644 (file)
--- a/inc/poche/WallabagEBooks.class.php
+++ b/inc/poche/WallabagEBooks.class.php
@@ -124,7 +124,7 @@ class WallabagEpub extends WallabagEBooks
 
         $fullTitle = "<h1> " . $this->bookTitle . "</h1>\n";
 
-        $book->setCoverImage("Cover.png", file_get_contents("themes/baggy/img/apple-touch-icon-152.png"), "image/png", $fullTitle);
+        $book->setCoverImage("Cover.png", file_get_contents("themes/_global/img/appicon/apple-touch-icon-152.png"), "image/png", $fullTitle);
 
         $cover = $content_start . '<div style="text-align:center;"><p>' . _('Produced by wallabag with PHPePub') . '</p><p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p></div>' . $bookEnd;
 
@@ -165,7 +165,7 @@ class WallabagMobi extends WallabagEBooks
        * @author Sander Kromwijk
        */
 
-       public function produceMobi($sendByMail = FALSE)
+       public function produceMobi()
        {
 
         Tools::logm('Starting to produce Mobi file');
@@ -182,7 +182,7 @@ class WallabagMobi extends WallabagEBooks
 
         # introduction
         $content->appendParagraph('<div style="text-align:center;" ><p>' . _('Produced by wallabag with PHPMobi') . '</p><p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p></div>');
-        $content->appendImage(imagecreatefrompng("themes/baggy/img/apple-touch-icon-152.png"));
+        $content->appendImage(imagecreatefrompng("themes/_global/img/appicon/apple-touch-icon-152.png"));
         $content->appendPageBreak();
 
         Tools::logm('Adding actual content...');
@@ -194,70 +194,9 @@ class WallabagMobi extends WallabagEBooks
         }
         $mobi->setContentProvider($content);
 
-        if (!$sendByMail) {
-            // we offer file to download
-            $mobi->download($this->bookFileName.'.mobi');
-            Tools::logm('Mobi file produced');
-        }
-        else {
-               ##                                         ##
-               #   Not working yet !!! #
-               ##                                         ##
-            // we send file to kindle
-
-            Tools::logm('Preparing to send file by email');
-
-            $error = FALSE;
-            # testing Mail function
-            if (!function_exists('mail')) {
-                $error = _("Mail function is disabled. You can't send emails from your server");
-            }
-
-            $char_in = array('/', '.', ',', ':', '|'); # we sanitize filename to avoid conflicts with special characters (for instance, / goes for a directory)
-            $mobiExportName = preg_replace('/\s+/', '-', str_replace($char_in, '-', $this->bookFileName)) . '.mobi';
-            
-            $file = 'cache/' . $mobiExportName;
-            $mobi->save($file);
-
-            $file_size = filesize($file);
-            $filename = basename($file);
-            $handle = fopen($file, "r");
-            $content = fread($handle, $file_size);
-            fclose($handle);
-            $content = chunk_split(base64_encode($content));
-
-            $uid = md5(uniqid(time())); 
-
-            //generate header for mail
-            $header  = "From: wallabag <". $this->wallabag->user->email .">\r\n";        
-            $header .= "MIME-Version: 1.0\r\n";
-            $header .= "Content-Type: multipart/mixed; boundary=\"".$uid."\"\r\n\r\n";
-            $header .= "This is a multi-part message in MIME format.\r\n";
-            $header .= "--".$uid."\r\n";
-            $header .= "Content-type:text/plain; charset=iso-8859-1\r\n";
-            $header .= "Content-Transfer-Encoding: 7bit\r\n\r\n";
-            $header .= "send via wallabag\r\n\r\n";
-            $header .= "--".$uid."\r\n";
-            $header .= "Content-Type: application/x-mobipocket-ebook; name=\"".$filename."\"\r\n";
-            $header .= "Content-Transfer-Encoding: base64\r\n";
-            $header .= "Content-Disposition: attachment; filename=\"".$filename."\"\r\n\r\n";
-            $header .= $content."\r\n\r\n";
-            $header .= "--".$uid."--";
-
-            # trying to get the kindle email adress
-            if (!$this->wallabag->user->getConfigValue('kindleemail')) 
-            {
-                $error = _("You didn't set your kindle's email adress !");
-            }
-            if (!$error) {
-                mail($this->wallabag->user->getConfigValue('kindleemail'), '[wallabag] ' . $this->bookTitle, "", $header );
-                $messages->add('s', _('The email has been sent to your kindle !'));
-                Tools::logm('Email sent');
-            } else {
-                $messages->add('e', $error);
-                Tools::logm($error);
-            }
-        }
+        // we offer file to download
+        $mobi->download($this->bookFileName.'.mobi');
+        Tools::logm('Mobi file produced');
     }
 }
 
@@ -282,7 +221,7 @@ class WallabagPDF extends WallabagEbooks
         $intro = '<h1>' . $this->bookTitle . '</h1><div style="text-align:center;" >
         <p>' . _('Produced by wallabag with tcpdf') . '</p>
         <p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p>
-        <img src="themes/baggy/img/apple-touch-icon-152.png" /></div>';
+        <img src="themes/_global/img/appicon/apple-touch-icon-152.png" /></div>';
 
 
         $pdf->writeHTMLCell(0, 0, '', '', $intro, 0, 1, 0, true, '', true);
@@ -304,4 +243,4 @@ class WallabagPDF extends WallabagEbooks
         $pdf->Output($this->bookFileName . '.pdf', 'FD');
 
        }
-}
\ No newline at end of file
+}