<?php
/***************************************************************************
- * Copyright (C) 2003-2008 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
}
}
+ static private function formatUser(PlUser $user)
+ {
+ return '"' . $user->fullName() . '" <' . $user->bestEmail() . '>';
+ }
+
/**
* converts all : Foo Bar Baz <quux@foobar.org> into "Foo Bar Baz" <quux@foobar.org> which is RFC compliant
*/
private function correct_emails($email)
{
+ if ($email instanceof PlUser) {
+ $email = self::formatUser($email);
+ }
return preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!u', '\1"\2" \3', $email);
}
}
}
+ public function sendTo(PlUser &$user)
+ {
+ $this->addTo($user);
+ $this->assign_by_ref('user', $user);
+ return $this->send($user->isEmailFormatHtml());
+ }
+
public function send($with_html = true)
{
$this->processPage($with_html);
if (S::user()) {
$this->addHeader('X-Org-Mail', S::user()->forlifeEmail());
- } else if (S::v('forlife')) {
- // TODO(vzanotti): trash this code when hruid will be part of master.
- 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])) {
+ foreach (Array('To', 'Cc', 'Bcc') as $hdr) {
+ if (isset($this->_headers[$hdr])) {
require_once 'Mail/RFC822.php';
$parsed = @Mail_RFC822::parseAddressList($this->_headers[$hdr]);
if (is_array($parsed)) {
}
}
}
- if(empty($addrs)) {
+ if (empty($addrs)) {
return false;
}
$dests = Array();
- foreach($addrs as $a) {
+ foreach ($addrs as $a) {
$dests[] = "{$a->mailbox}@{$a->host}";
}
+ // Support for a "catch-all" email address, to be used by developers.
+ // This mode can only be activated when the working copy is in restricted
+ // mode, to ensure that production plat/al copies are never affected.
+ global $globals;
+ if ($globals->email_catchall && $globals->core->restricted_platal) {
+ require_once 'Mail/RFC822.php';
+ if (@Mail_RFC822::isValidInetAddress($globals->email_catchall)) {
+ $dests = array($globals->email_catchall);
+ }
+ }
+
// very important to do it in THIS order very precisely.
$body = $this->get(array('text_charset' => $this->charset,
'text_encoding' => '8bit',