X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Femails.inc.php;h=cd7e0a056c3a048e420f8313a2faae8036e5e7f7;hb=b6ba1a0417b6fc73f3d1701146373b4bec0d1428;hp=f285f08858ef8adf46cbe4a91e4d8f2aa41e6743;hpb=12a587df92f7bc9efeb91c1a2d27f763070b8609;p=platal.git diff --git a/include/emails.inc.php b/include/emails.inc.php index f285f08..cd7e0a0 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -1,6 +1,6 @@ ', '', $em); + if (strpos($em, '@') === false) { + return; + } list($ident, $dom) = explode('@', $em); - if ($dom == $globals->mail->domain or $dom == $globals->mail->domain2) { + if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) { list($ident1) = explode('_', $ident); list($ident) = explode('+', $ident1); } @@ -74,6 +77,87 @@ function isvalid_email_redirection($email) !preg_match("/@(polytechnique\.(org|edu)|melix\.(org|net)|m4x\.org)$/", $email); } +// function ids_from_mails() {{{1 +// Converts an array of emails to an array of email => uid +function ids_from_mails(array $emails) +{ + global $globals; + $domain_mails = array(); + $alias_mails = array(); + $other_mails = array(); + + // Determine the type of the email adresses. It can eiher be a domain + // email (@polytechnique.org), an alias email (@melix.net) or any other + // email (potentially used as a redirection by one user) + foreach ($emails as $email) { + if (strpos($email, '@') === false) { + $user = $email; + $domain = $globals->mail->domain2; + } else { + list($user, $domain) = explode('@', $email); + } + if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) { + list($user) = explode('+', $user); + list($user) = explode('_', $user); + $alias_mails[$user] = $email; + } elseif ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) { + list($user) = explode('+', $user); + list($user) = explode('_', $user); + $domain_mails[$user] = $email; + } else { + $other_mails[] = $email; + } + } + $uids = array(); + + // Look up user ids for addresses in domain + if (count($domain_mails)) { + $domain_users = array_map(array('XDB', 'escape'), array_keys($domain_mails)); + $list = implode(',', $domain_users); + $res = XDB::query("SELECT alias, id + FROM aliases + WHERE alias IN ($list)"); + foreach ($res->fetchAllRow() as $row) { + list ($alias, $id) = $row; + $uids[$domain_mails[$alias]] = $id; + } + } + + // Look up user ids for addresses in our alias domain + if (count($alias_mails)) { + $alias_users = array(); + foreach (array_keys($alias_mails) as $user) { + $alias_users[] = XDB::escape($user."@".$globals->mail->alias_dom); + } + $list = implode(',', $alias_users); + $res = XDB::query("SELECT v.alias, a.id + FROM virtual AS v + INNER JOIN virtual_redirect AS r USING(vid) + INNER JOIN aliases AS a ON (a.type = 'a_vie' + AND r.redirect = CONCAT(a.alias, '@{$globals->mail->domain2}')) + WHERE v.alias IN ($list)"); + foreach ($res->fetchAllRow() as $row) { + list ($alias, $id) = $row; + $uids[$alias_mails[$alias]] = $id; + } + } + + // Look up user ids for other addresses in the email redirection list + if (count($other_mails)) { + $other_users = array_map(array('XDB', 'escape'), $other_mails); + $list = implode(',', $other_users); + $res = XDB::query("SELECT email, uid + FROM emails + WHERE email IN ($list)"); + foreach ($res->fetchAllRow() as $row) { + list ($email, $uid) = $row; + $uids[$other_mails[$email]] = $uid; + } + } + + return $uids; +} + // class Bogo {{{1 // The Bogo class represents a spam filtering level in plat/al architecture. class Bogo @@ -142,6 +226,8 @@ abstract class Email public $broken; public $disabled; public $rewrite; + public $allow_rewrite; + public $hash; // Redirection bounces stats. public $panne; @@ -181,7 +267,7 @@ class EmailRedirection extends Email $this->user = &$user; $this->sufficient = true; - list($this->email, $flags, $this->rewrite, $this->panne, $this->last, $this->panne_level) = $row; + list($this->email, $flags, $this->rewrite, $this->allow_rewrite, $this->hash, $this->panne, $this->last, $this->panne_level) = $row; $this->display_email = $this->email; $this->active = ($flags == 'active'); $this->broken = ($flags == 'panne'); @@ -227,6 +313,22 @@ class EmailRedirection extends Email } XDB::execute('UPDATE emails SET rewrite = {?} WHERE uid = {?} AND email = {?}', $rewrite, $this->user->id(), $this->email); $this->rewrite = $rewrite; + if (!$this->allow_rewrite) { + global $globals; + if (empty($this->hash)) { + $this->hash = rand_url_id(); + XDB::execute("UPDATE emails + SET hash = {?} + WHERE uid = {?} AND email = {?}", $this->hash, $this->user->id(), $this->email); + } + $mail = new PlMailer('emails/rewrite-in.mail.tpl'); + $mail->assign('mail', $this); + $mail->assign('user', $this->user); + $mail->assign('baseurl', $globals->baseurl); + $mail->assign('sitename', $globals->core->sitename); + $mail->assign('to', $this->email); + $mail->send($this->user->isEmailFormatHtml()); + } return; } @@ -234,7 +336,7 @@ class EmailRedirection extends Email public function clean_errors() { - if (!S::has_perms()) { + if (!S::admin()) { return false; } $this->panne = 0; @@ -310,7 +412,7 @@ class EmailStorage extends Email // IMAP storage is always visible to administrators, and is allowed for // everyone when the service is marked as 'active'. - if ($globals->mailstorage->imap_active || S::has_perms()) { + if ($globals->mailstorage->imap_active || S::admin()) { $storages[] = 'imap'; } @@ -388,7 +490,7 @@ class Redirect $this->bogo = new Bogo($user); // Adds third-party email redirections. - $res = XDB::iterRow("SELECT email, flags, rewrite, panne, last, panne_level + $res = XDB::iterRow("SELECT email, flags, rewrite, allow_rewrite, hash, panne, last, panne_level FROM emails WHERE uid = {?} AND flags != 'filter'", $user->id()); $this->emails = Array(); @@ -452,7 +554,7 @@ class Redirect return SUCCESS; } } - $this->emails[] = new EmailRedirection($this->user, array($email, 'active', '', '0000-00-00', '0000-00-00', 0)); + $this->emails[] = new EmailRedirection($this->user, array($email, 'active', '', 0, null, '0000-00-00', '0000-00-00', 0)); // security stuff check_email($email, "Ajout d'une adresse surveillée aux redirections de " . $this->user->login()); @@ -535,7 +637,7 @@ class Redirect { XDB::execute("UPDATE emails SET flags = 'disable' - WHERE flags = 'active' AND uid = {?}", $this->user->id); + WHERE flags = 'active' AND uid = {?}", $this->user->id()); foreach ($this->emails as &$mail) { if ($mail->active && $mail->has_disable()) { $mail->disabled = true; @@ -551,7 +653,7 @@ class Redirect { XDB::execute("UPDATE emails SET flags = 'active' - WHERE flags = 'disable' AND uid = {?}", $this->user->id); + WHERE flags = 'disable' AND uid = {?}", $this->user->id()); foreach ($this->emails as &$mail) { if ($mail->disabled) { $mail->active = true;