X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplmailer.php;h=0cb0b81fbda4dddf26e69779785e46fea66da9c5;hb=d635addc08db31aca8017f271b28d9a7cfcbbf1f;hp=f418b3c21b00b0f492c8c06d28062a339468d59d;hpb=b98794ca72217aac4d5d395d7955ee67ca6e9dea;p=platal.git diff --git a/classes/plmailer.php b/classes/plmailer.php index f418b3c..0cb0b81 100644 --- a/classes/plmailer.php +++ b/classes/plmailer.php @@ -1,6 +1,6 @@ tpl = $tpl; - $this->mailer = $mailer; + $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')); @@ -50,30 +47,22 @@ class PlMail extends Smarty $this->register_function('cc', Array($this, 'addCc')); $this->register_function('bcc', Array($this, 'addBcc')); $this->register_function('subject', Array($this, 'setSubject')); + $this->register_function('add_header', Array($this, 'addHeader')); } - // }}} - // {{{ function run() - - function run($html) + public function run($html) { $this->assign('html_version', $html); return $this->fetch($this->tpl); } - // }}} - // {{{ function mail_format() - /** 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); } - // }}} - // {{{ function format_addr() - - static function format_addr(&$params) + static protected function format_addr(&$params) { if (isset($params['full'])) { return $params['full']; @@ -84,109 +73,90 @@ 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=...} */ - function setSubject($params, &$smarty) + public function setSubject($params, &$smarty) { $smarty->mailer->setSubject($params['text']); } - // }}} + /** template function : add_header. + * {add_header name=... value=...} + */ + 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 - function PlMailer($tpl = null, $charset = "ISO-8859-15") + function __construct($tpl = null, $charset = "ISO-8859-15") { $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); } } - // }}} - // {{{ 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('!(^|, *)([^<"]+?) *(<[^>]*>)!', '\1"\2" \3', $email); } - // }}} - // {{{ function addTo() - - function addTo($email) + public function addTo($email) { $email = $this->correct_emails($email); if (isset($this->_headers['To'])) { @@ -196,34 +166,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': @@ -250,44 +208,61 @@ class PlMailer extends Mail_Mime { } } - // }}} - // {{{ function assign() - - function assign($var, $value) + public function assign($var, $value) { if (!is_null($this->page)) { $this->page->assign($var, $value); } } - // }}} - // {{{ function processPage() + public function assign_by_ref($var, &$value) + { + if (!is_null($this->page)) { + $this->page->assign_by_ref($var, $value); + } + } - private function processPage() + public function register_modifier($var, $callback) + { + if (!is_null($this->page)) { + $this->page->register_modifier($var, $callback); + } + } + + public function register_function($var, $callback) { if (!is_null($this->page)) { + $this->page->register_function($var, $callback); + } + } + + private function processPage($with_html = true) + { + $level = error_reporting(0); + if (!is_null($this->page)) { $this->setTxtBody($this->page->run(false)); - $html = trim($this->page->run(true)); - if (!empty($html)) { - $this->setHtmlBody($html); + if ($with_html) { + $html = trim($this->page->run(true)); + if (!empty($html)) { + $this->setHtmlBody($html); + } } } + error_reporting($level); } - // }}} - // {{{ function send() - - function send() + public function send($with_html = true) { - $this->processPage(); + $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])); + $addrs = array_merge($addrs, @Mail_RFC822::parseAddressList($this->_headers[$hdr])); } } if(empty($addrs)) { @@ -304,12 +279,12 @@ class PlMailer extends Mail_Mime { '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); } - - // }}} } -// }}} - ?>