X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplmailer.php;h=2106d5024b91098f057d2d2c9523ea74f2fcb4c9;hb=ba63661ce2f38974002c7e4113320e9d06010853;hp=eb2620879c867574a8e0cd082589e8d88f60a1e6;hpb=787bb3d745141f2f85bd947ad7dd775d2c63f908;p=platal.git diff --git a/classes/plmailer.php b/classes/plmailer.php index eb26208..2106d50 100644 --- a/classes/plmailer.php +++ b/classes/plmailer.php @@ -1,6 +1,6 @@ template_dir = $globals->spoolroot . "/templates/"; $this->compile_dir = $globals->spoolroot . "/spool/mails_c/"; $this->config_dir = $globals->spoolroot . "/configs/"; - + array_unshift($this->plugins_dir, $globals->spoolroot."/plugins/"); $this->register_outputfilter(Array($this, 'mail_format')); $this->register_function('from', Array($this, 'setFrom')); @@ -47,6 +47,7 @@ class PlMail extends Smarty $this->register_function('bcc', Array($this, 'addBcc')); $this->register_function('subject', Array($this, 'setSubject')); $this->register_function('add_header', Array($this, 'addHeader')); + $this->assign_by_ref('globals', $globals); } public static function &get(&$mailer, $tpl) @@ -264,7 +265,10 @@ class PlMailer extends Mail_Mime { private function processPage($with_html = true) { if (!is_null($this->page)) { - $level = error_reporting(0); + global $globals; + if (!($globals->debug & DEBUG_SMARTY)) { + $level = error_reporting(0); + } $this->page->run('head'); // process page headers $this->wiki = trim($this->page->run('wiki')); // get wiki if (!$this->wiki) { @@ -276,12 +280,14 @@ class PlMailer extends Mail_Mime { } } } - error_reporting($level); + if (!($globals->debug & DEBUG_SMARTY)) { + error_reporting($level); + } } if ($this->wiki) { - $this->setTxtBody(MiniWiki::WikiToText($this->wiki, true, 0, 78)); + $this->setTxtBody(MiniWiki::WikiToText($this->wiki, false, 0, 78)); if ($with_html) { - $this->setHtmlBody(MiniWiki::WikiToHtml($this->wiki, true)); + $this->setHtmlBody('' . MiniWiki::WikiToHtml($this->wiki, true) . ''); } } }