Fix a vicious bug hidden by another bug when a banned user

[platal.git] / classes / plmailer.php

diff --git a/classes/plmailer.php b/classes/plmailer.php
index 317dd64..0377d80 100644 (file)
--- a/classes/plmailer.php
+++ b/classes/plmailer.php
@@ -59,17 +59,20 @@ class PlMail extends Smarty
         return $plmail;
     }
 
-    public function run($html)
+    public function run($version)
     {
-        $this->assign('html_version', $html);
+        $this->assign('mail_part', $version);
         $text = $this->fetch($this->tpl);
+        if ($version == 'text') {
+            return wordwrap($text, 78);
+        }
         return $text;
     }
 
     /** used to remove the empty lines due to {from ...}, {to ...} ... functions */
     static public function mail_format($output, &$smarty)
     {
-        return wordwrap("\n".trim($output)."\n",75);
+        return "\n".trim($output)."\n";
     }
 
     static protected function format_addr(&$params)
@@ -147,6 +150,7 @@ class PlMailer extends Mail_Mime {
     private $mail;
     private $page    = null;
     private $charset;
+    private $wiki    = null;
 
     function __construct($tpl = null, $charset = "UTF-8")
     {
@@ -218,6 +222,12 @@ class PlMailer extends Mail_Mime {
         }
     }
 
+    public function addUploadAttachment(PlUpload &$upload, $name)
+    {
+        $encoding = $upload->isType('text') ? 'quoted-printable' : 'base64';
+        $this->addAttachment($upload->getContents(), $upload->contentType(), $name, false, $encoding);
+    }
+
     public function assign($var, $value)
     {
         if (!is_null($this->page)) {
@@ -245,20 +255,35 @@ class PlMailer extends Mail_Mime {
             $this->page->register_function($var, $callback);
         }
     }
-    
+
+    public function setWikiBody($wiki)
+    {
+        $this->wiki = $wiki;
+    }
+
     private function processPage($with_html = true)
     {
-        $level = error_reporting(0);
         if (!is_null($this->page)) {
-            $this->setTxtBody($this->page->run(false));
-            if ($with_html) {
-                $html = trim($this->page->run(true));
-                if (!empty($html)) {
-                    $this->setHtmlBody($html);
+            $level = error_reporting(0);
+            $this->page->run('head'); // process page headers
+            $this->wiki = trim($this->page->run('wiki')); // get wiki
+            if (!$this->wiki) {
+                $this->setTxtBody($this->page->run('text'));
+                if ($with_html) {
+                    $html = trim($this->page->run('html'));
+                    if (!empty($html)) {
+                        $this->setHtmlBody($html);
+                    }
                 }
             }
+            error_reporting($level);
+        }
+        if ($this->wiki) {
+            $this->setTxtBody(MiniWiki::WikiToText($this->wiki, true, 0, 78));
+            if ($with_html) {
+                $this->setHtmlBody(MiniWiki::WikiToHtml($this->wiki, true));
+            }
         }
-        error_reporting($level);
     }
 
     public function send($with_html = true)
@@ -289,6 +314,7 @@ class PlMailer extends Mail_Mime {
     
         // very important to do it in THIS order very precisely.
         $body = $this->get(array('text_charset' => $this->charset,
+                                 'text_encoding' => '8bit',
                                  'html_charset' => $this->charset,
                                  'head_charset' => $this->charset));
         $hdrs = $this->headers();