X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplmailer.php;h=eb2620879c867574a8e0cd082589e8d88f60a1e6;hb=eaf30d86cc99df2414cf4f171a9b0f11b0561e3b;hp=1bfe7818d6975684c34574599d1d125bdd957d5f;hpb=11f44323b9f6d4ee4d21eb8cfb3084e5d3964253;p=platal.git diff --git a/classes/plmailer.php b/classes/plmailer.php index 1bfe781..eb26208 100644 --- a/classes/plmailer.php +++ b/classes/plmailer.php @@ -1,6 +1,6 @@ tpl = $tpl; - $this->mailer = $mailer; $this->caching = false; $this->compile_check = true; $this->template_dir = $globals->spoolroot . "/templates/"; - $this->compile_dir = $globals->spoolroot . "/spool/templates_c/"; + $this->compile_dir = $globals->spoolroot . "/spool/mails_c/"; $this->config_dir = $globals->spoolroot . "/configs/"; + $this->register_outputfilter(Array($this, 'mail_format')); $this->register_function('from', Array($this, 'setFrom')); $this->register_function('to', Array($this, 'addTo')); @@ -53,28 +49,33 @@ class PlMail extends Smarty $this->register_function('add_header', Array($this, 'addHeader')); } - // }}} - // {{{ function run() - - function run($html) + public static function &get(&$mailer, $tpl) { - $this->assign('html_version', $html); - return $this->fetch($this->tpl); + static $plmail; + if (!isset($plmail) || $plmail->tpl != $tpl) { + $plmail = new PlMail($tpl); + } + $plmail->mailer =& $mailer; + return $plmail; } - // }}} - // {{{ function mail_format() + public function run($version) + { + $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 function mail_format($output, &$smarty) + static public function mail_format($output, &$smarty) { - return wordwrap("\n".trim($output)."\n",75); + return "\n".trim($output)."\n"; } - // }}} - // {{{ function format_addr() - - static function format_addr(&$params) + static protected function format_addr(&$params) { if (isset($params['full'])) { return $params['full']; @@ -85,120 +86,91 @@ class PlMail extends Smarty } } - // }}} - // {{{ function setFrom() - /** template function : from. * {from full=...} for an already formatted address * {from addr=... [text=...]} else */ - function setFrom($params, &$smarty) + public function setFrom($params, &$smarty) { - $smarty->mailer->setFrom($this->format_addr($params)); + $smarty->mailer->setFrom(PlMail::format_addr($params)); } - // }}} - // {{{ function setTo() - /** template function : to. * {to full=...} for an already formatted address * {to addr=... [text=...]} else */ - function addTo($params, &$smarty) + public function addTo($params, &$smarty) { - $smarty->mailer->addTo($this->format_addr($params)); + $smarty->mailer->addTo(PlMail::format_addr($params)); } - // }}} - // {{{ function setCc() - /** template function : cc. * {cc full=...} for an already formatted address * {cc addr=... [text=...]} else */ - function addCc($params, &$smarty) + public function addCc($params, &$smarty) { - $smarty->mailer->addCc($this->format_addr($params)); + $smarty->mailer->addCc(PlMail::format_addr($params)); } - // }}} - // {{{ function setBcc() - /** template function : bcc. * {bcc full=...} for an already formatted address * {bcc addr=... [text=...]} else */ - function addBcc($params, &$smarty) + public function addBcc($params, &$smarty) { - $smarty->mailer->addBcc($this->format_addr($params)); + $smarty->mailer->addBcc(PlMail::format_addr($params)); } - // }}} - // {{{ function setSubject() - /** template function : subject. - * {subject text=...} + * {subject text=...} */ - function setSubject($params, &$smarty) + public function setSubject($params, &$smarty) { $smarty->mailer->setSubject($params['text']); } - // }}} - // {{{ function addHeader() - /** template function : add_header. * {add_header name=... value=...} */ - function addHeader($params, &$smarty) + public function addHeader($params, &$smarty) { $smarty->mailer->addHeader($params['name'], $params['value']); } - - // }}} } -// }}} - require_once('Mail.php'); require_once('Mail/mime.php'); -// {{{ class PlMailer /** Class for sending inline or multipart-emails. + * Based on Diogenes' HermesMailer */ class PlMailer extends Mail_Mime { private $mail; private $page = null; private $charset; - // {{{ constructor + private $wiki = null; - function PlMailer($tpl = null, $charset = "ISO-8859-15") + function __construct($tpl = null, $charset = "UTF-8") { $this->charset = $charset; $this->Mail_Mime("\n"); - $this->mail =& Mail::factory('sendmail', Array('sendmail_args' => '-oi')); + $this->mail = Mail::factory('sendmail', Array('sendmail_args' => '-oi')); if (!is_null($tpl)) { - $this->page = new PlMail($this, $tpl); + $this->page =& PlMail::get($this, $tpl); } } - // }}} - // {{{ function correct_emails() - /** * converts all : Foo Bar Baz into "Foo Bar Baz" which is RFC compliant */ - private function correct_emails($email) { - return preg_replace('!(^|, *)([^<"][^<"]*[^< "]) *(<[^>]*>)!', '\1"\2" \3', $email); + return preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!u', '\1"\2" \3', $email); } - // }}} - // {{{ function addTo() - - function addTo($email) + public function addTo($email) { $email = $this->correct_emails($email); if (isset($this->_headers['To'])) { @@ -208,34 +180,22 @@ class PlMailer extends Mail_Mime { } } - // }}} - // {{{ function addCc() - - function addCc($email) + public function addCc($email) { return parent::addCc($this->correct_emails($email)); } - // }}} - // {{{ function addBcc() - - function addBcc($email) + public function addBcc($email) { return parent::addBcc($this->correct_emails($email)); } - // }}} - // {{{ function setFrom() - - function setFrom($email) + public function setFrom($email) { return parent::setFrom($this->correct_emails($email)); } - // }}} - // {{{ function addHeader() - - function addHeader($hdr,$val) + public function addHeader($hdr,$val) { switch($hdr) { case 'From': @@ -262,98 +222,109 @@ class PlMailer extends Mail_Mime { } } - // }}} - // {{{ function assign() + public function addUploadAttachment(PlUpload &$upload, $name) + { + $encoding = $upload->isType('text') ? 'quoted-printable' : 'base64'; + $this->addAttachment($upload->getContents(), $upload->contentType(), $name, false, $encoding); + } - function assign($var, $value) + public function assign($var, $value) { if (!is_null($this->page)) { $this->page->assign($var, $value); } } - - // }}} - // {{{ function assign_by_ref() - - function assign_by_ref($var, &$value) + + public function assign_by_ref($var, &$value) { if (!is_null($this->page)) { $this->page->assign_by_ref($var, $value); } } - // }}} - // {{{ function register_modifier() - - function register_modifier($var, $callback) + public function register_modifier($var, $callback) { if (!is_null($this->page)) { $this->page->register_modifier($var, $callback); } } - - // }}} - // {{{ function register_function() - function register_function($var, $callback) + public function register_function($var, $callback) { if (!is_null($this->page)) { $this->page->register_function($var, $callback); } } - - // }}} - // {{{ function processPage() + + public function setWikiBody($wiki) + { + $this->wiki = $wiki; + } private function processPage($with_html = true) { 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)); + } } } - // }}} - // {{{ function send() - - function send($with_html = true) + public function send($with_html = true) { $this->processPage($with_html); if (S::v('forlife')) { - $this->addHeader('X-Org-Mail', S::v('forlife') . '@polytechnique.org'); + global $globals; + $this->addHeader('X-Org-Mail', S::v('forlife') . '@' . $globals->mail->domain); } $addrs = Array(); foreach(Array('To', 'Cc', 'Bcc') as $hdr) { if(isset($this->_headers[$hdr])) { require_once 'Mail/RFC822.php'; - $addrs = array_merge($addrs, Mail_RFC822::parseAddressList($this->_headers[$hdr])); + $parsed = @Mail_RFC822::parseAddressList($this->_headers[$hdr]); + if (is_array($parsed)) { + $addrs = array_merge($addrs, $parsed); + } } } 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', 'html_charset' => $this->charset, 'head_charset' => $this->charset)); $hdrs = $this->headers(); + if (empty($hdrs['From'])) { + trigger_error('Empty "From", mail not sent', E_USER_WARNING); + return false; + } return $this->mail->send($dests, $hdrs, $body); } - - // }}} } -// }}} - +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>