X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplmailer.php;h=2106d5024b91098f057d2d2c9523ea74f2fcb4c9;hb=7b642046b0dbaf122f12beeb565879f3b3dd8171;hp=0377d80036fc9a75332e21d241e48ba0ef538598;hpb=ef42a9d667bc59456c156d0c5085be9efc1954b7;p=platal.git diff --git a/classes/plmailer.php b/classes/plmailer.php index 0377d80..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) @@ -123,7 +124,7 @@ class PlMail extends Smarty } /** template function : subject. - * {subject text=...} + * {subject text=...} */ public function setSubject($params, &$smarty) { @@ -234,7 +235,7 @@ class PlMailer extends Mail_Mime { $this->page->assign($var, $value); } } - + public function assign_by_ref($var, &$value) { if (!is_null($this->page)) { @@ -248,7 +249,7 @@ class PlMailer extends Mail_Mime { $this->page->register_modifier($var, $callback); } } - + public function register_function($var, $callback) { if (!is_null($this->page)) { @@ -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) . ''); } } } @@ -306,12 +312,12 @@ class PlMailer extends Mail_Mime { if(empty($addrs)) { return false; } - + $dests = Array(); foreach($addrs as $a) { $dests[] = "{$a->mailbox}@{$a->host}"; } - + // very important to do it in THIS order very precisely. $body = $this->get(array('text_charset' => $this->charset, 'text_encoding' => '8bit',