define('ERROR_INVALID_EMAIL', 3);
define('ERROR_LOOP_EMAIL', 4);
-function add_to_list_alias(User $user, $local_part, $domain, $type = 'user')
+function add_to_list_alias(User $user, $local_part, $domain, $type = 'alias')
{
Platal::assert($user !== null);
$local_part, $user->forlifeEmail(), $type, $domain);
}
-function delete_from_list_alias(User $user, $local_part, $domain, $type = 'user')
+function delete_from_list_alias(User $user, $local_part, $domain, $type = 'alias')
{
Platal::assert($user !== null);
$local_part, $domain, $user->forlifeEmail(), $type);
}
-function update_list_alias(User $user, $former_email, $local_part, $domain, $type = 'user')
+function update_list_alias(User $user, $former_email, $local_part, $domain, $type = 'alias')
{
Platal::assert($user !== null);
FROM email_virtual AS v
INNER JOIN email_virtual_domains AS m ON (v.domain = m.id)
INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id)
- WHERE v.email = {?} AND d.name = {?} AND type = \'user\'',
+ WHERE v.email = {?} AND d.name = {?} AND type = \'alias\'',
$local_part, $domain);
$members = array();
FROM email_virtual AS v
INNER JOIN email_virtual_domains AS m ON (v.domain = m.id)
INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id)
- WHERE v.email = {?} AND d.name = {?} AND type = \'user\'',
+ WHERE v.email = {?} AND d.name = {?} AND type = \'alias\'',
$local_part, $domain);
}
return XDB::fetchColumn('SELECT CONCAT(v.email, \'@\', m.name)
FROM email_virtual AS v
INNER JOIN email_virtual_domains AS m ON (v.domain = m.id)
- WHERE m.name = {?} AND v.type = \'user\'
+ WHERE m.name = {?} AND v.type = \'alias\'
GROUP BY v.email',
$domain);
}
WHERE redirect = {?}', $email);
} elseif ($admin) {
XDB::execute('UPDATE email_redirect_account
- SET last = CURDATE(), broken_level = IF(broken_level > 1, 3, 2)
+ SET last = CURDATE(), broken_level = broken_level + 1
WHERE redirect = {?} AND DATE_ADD(last, INTERVAL 14 DAY) < CURDATE()',
$email);
} else {
{
$count = XDB::fetchOneCell('SELECT COUNT(*)
FROM email_source_account
- WHERE uid = {?} AND FIND_IN_SET(\'bestalias\', flags)',
+ WHERE uid = {?} AND FIND_IN_SET(\'bestalias\', flags) AND expire IS NULL',
$user->id());
if ($count == 1) {
// related to a usage name and contains a '.'.
XDB::execute("UPDATE email_source_account
SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias')
- WHERE uid = {?}
+ WHERE uid = {?} AND expire IS NULL
ORDER BY NOT FIND_IN_SET('usage', flags), email LIKE '%.%', LENGTH(email)
LIMIT 1",
$user->id());
return;
}
list($ident, $dom) = explode('@', $em);
- if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) {
+ if (User::isMainMailDomain($dom)) {
list($ident1) = explode('_', $ident);
list($ident) = explode('+', $ident1);
}
*/
function isvalid_email_redirection($email)
{
- return isvalid_email($email) &&
- !preg_match("/@(polytechnique\.(org|edu)|melix\.(org|net)|m4x\.org)$/", $email);
+ return isvalid_email($email) && !preg_match("/@polytechnique\.edu$/", $email) && User::isForeignEmailAddress($email);
}
// function ids_from_mails() {{{1
// given email when we found a matching user.
function ids_from_mails(array $emails)
{
- global $globals;
-
// Removes duplicates, if any.
$emails = array_unique($emails);
// Formats and splits by domain type (locally managed or external) emails.
- $domain_emails = array();
- $other_emails = array();
+ $main_domain_emails = array();
+ $aux_domain_emails = array();
+ $other_emails = array();
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
- || $domain == $globals->mail->domain || $domain == $globals->mail->domain2) {
- list($user) = explode('+', $user);
- list($user) = explode('_', $user);
- $domain_emails[$email] = strtolower($user . '@' . $domain);
+ $main_domain_emails[] = $email;
} else {
- $other_emails[$email] = strtolower($user . '@' . $domain);
+ if (User::isForeignEmailAddress($email)) {
+ $other_emails[$email] = strtolower($user . '@' . $domain);
+ } else {
+ list($local_part, $domain) = explode('@', $email);
+ list($local_part) = explode('+', $local_part);
+ list($local_part) = explode('_', $local_part);
+ if (User::isMainMailDomain($domain)) {
+ $main_domain_emails[$email] = strtolower($local_part);
+ } elseif (User::isAliasMailDomain($domain)) {
+ $aux_domain_emails[$email] = strtolower($local_part);
+ }
+ }
}
}
// Retrieves emails from our domains.
- $domain_uids = XDB::fetchAllAssoc('email',
- 'SELECT email, uid
- FROM email_source_account
- WHERE email IN {?}',
- array_unique($domain_emails));
+ $main_domain_uids = XDB::fetchAllAssoc('email',
+ 'SELECT email, uid
+ FROM email_source_account
+ WHERE email IN {?} AND type != \'alias_aux\'',
+ array_unique($main_domain_emails));
+ $aux_domain_uids = XDB::fetchAllAssoc('email',
+ 'SELECT email, uid
+ FROM email_source_account
+ WHERE email IN {?} AND type = \'alias_aux\'',
+ array_unique($aux_domain_emails));
// Retrieves emails from redirections.
$other_uids = XDB::fetchAllAssoc('redirect',
// Associates given emails with the corresponding uid.
$uids = array();
- foreach (array_merge($domain_emails, $other_emails) as $email => $canonical_email) {
- if (array_key_exists($canonical_email, $domain_uids)) {
- $uids[$email] = $domain_uids[$canonical_email];
- } elseif (array_key_exists($canonical_email, $other_uids)) {
- $uids[$email] = $other_uids[$canonical_email];
- }
+ foreach ($main_domain_emails as $email => $key) {
+ $uids[$email] = $main_domain_uids[$key];
+ }
+ foreach ($aux_domain_emails as $email => $key) {
+ $uids[$email] = $aux_domain_uids[$key];
+ }
+ foreach ($other_emails as $email => $key) {
+ $uids[$email] = $other_uids[$key];
}
- return $uids;
+ return array_unique($uids);
}
// class Bogo {{{1
// The Bogo class represents a spam filtering level in plat/al architecture.
class Bogo
{
- private static $states = array('let_spams', 'tag_spams', 'tag_and_drop_spams', 'drop_spams');
+ public static $states = array(
+ 0 => 'default',
+ 1 => 'let_spams',
+ 2 => 'tag_spams',
+ 3 => 'tag_and_drop_spams',
+ 4 => 'drop_spams'
+ );
private $user;
- private $state;
+ public $state;
+ public $single_state;
+ public $redirections;
+ public $single_redirection;
public function __construct(User $user)
{
}
$this->user = &$user;
- $res = XDB::query('SELECT action
- FROM email_redirect_account
- WHERE uid = {?} AND (type = \'smtp\' OR type = \'googleapps\')',
- $user->id());
- if ($res->numRows() == 0) {
+ $res = XDB::fetchOneAssoc('SELECT COUNT(DISTINCT(action)) AS action_count, COUNT(redirect) AS redirect_count, action
+ FROM email_redirect_account
+ WHERE uid = {?} AND (type = \'smtp\' OR type = \'googleapps\') AND flags = \'active\'',
+ $user->id());
+ if ($res['redirect_count'] == 0) {
return;
}
- $this->state = $res->fetchOneCell();
+
+ $this->single_redirection = ($res['redirect_count'] == 1);
+ $this->redirections = XDB::fetchAllAssoc('SELECT IF(type = \'googleapps\', type, redirect) AS redirect, type, action
+ FROM email_redirect_account
+ WHERE uid = {?} AND (type = \'smtp\' OR type = \'googleapps\')
+ ORDER BY type, redirect',
+ $user->id());
+
+ foreach ($this->redirections AS &$redirection) {
+ $redirection['filter'] = array_search($redirection['action'], self::$states);
+ }
+ if ($res['action_count'] == 1) {
+ $this->state = array_search($res['action'], self::$states);
+ $this->single_state = true;
+ } else {
+ $this->single_state = $this->state = false;
+ }
}
- public function change($state)
+ public function changeAll($state)
{
- $this->state = is_int($state) ? self::$states[$state] : $state;
+ Platal::assert($state >= 0 && $state < count(self::$states), 'Unknown antispam level.');
+
+ $this->state = $state;
XDB::execute('UPDATE email_redirect_account
SET action = {?}
WHERE uid = {?} AND (type = \'smtp\' OR type = \'googleapps\')',
- $this->state, $this->user->id());
+ self::$states[$this->state], $this->user->id());
}
- public function level()
+ public function change($redirection, $state)
{
- return array_search($this->state, self::$states);
+ Platal::assert($state >= 0 && $state < count(self::$states), 'Unknown antispam level.');
+
+ XDB::execute('UPDATE email_redirect_account
+ SET action = {?}
+ WHERE uid = {?} AND (type = {?} OR redirect = {?})',
+ self::$states[$state], $this->user->id(), $redirection, $redirection);
}
}
public $display_email;
public $domain;
public $action;
+ public $filter_level;
// Redirection status properties.
public $active;
$this->$status = ($status == $row['flags']);
}
$this->sufficient = ($this->type == 'smtp' || $this->type == 'googleapps');
+ $this->filter_level = ($this->type == 'imap') ? null : array_search($this->action, Bogo::$states);
$this->user = &$user;
}
}
$res = XDB::fetchOneCell('SELECT COUNT(*)
FROM email_redirect_account
- WHERE uid = {?} AND type = {?} AND flags = \'active\')',
+ WHERE uid = {?} AND type = {?} AND flags = \'active\'',
$user->id(), $storage);
return !is_null($res) && $res > 0;
}
private $user;
public $emails;
- public $bogo;
public function __construct(User $user)
{
$this->user = &$user;
- $this->bogo = new Bogo($user);
// Adds third-party email redirections.
$res = XDB::iterator('SELECT redirect, rewrite, type, action, broken_date, broken_level, last, flags, hash, allow_rewrite
}
}
check_redirect($this);
+ $this->update_imap();
return SUCCESS;
}
if (!isvalid_email_redirection($email_stripped)) {
return ERROR_LOOP_EMAIL;
}
+ // We first need to retrieve the value for the antispam filter: it is
+ // either the user's redirections common value, or if they differ, our
+ // default value.
+ $bogo = new Bogo($this->user);
+ $filter = ($bogo->single_state ? Bogo::$states[$bogo->state] : Bogo::$states[0]);
// If the email was already present for this user, we reset it to the default values, we thus use REPLACE INTO.
- XDB::execute('REPLACE INTO email_redirect_account (uid, redirect, flags)
- VALUES ({?}, {?}, \'active\')',
- $this->user->id(), $email);
+ XDB::execute('REPLACE INTO email_redirect_account (uid, redirect, flags, action)
+ VALUES ({?}, {?}, \'active\', {?})',
+ $this->user->id(), $email, $filter);
if ($logger = S::v('log', null)) { // may be absent --> step4.php
S::logger()->log('email_add', $email . ($this->user->id() != S::v('uid') ? " (admin on {$this->user->login()})" : ""));
}
'redirect' => $email,
'rewrite' => '',
'type' => 'smtp',
- 'action' => 'default',
+ 'action' => $filter,
'broken_date' => '0000-00-00',
'broken_level' => 0,
'last' => '0000-00-00',
// security stuff
check_email($email, "Ajout d'une adresse surveillée aux redirections de " . $this->user->login());
check_redirect($this);
+ $this->update_imap();
return SUCCESS;
}
$email->set_rewrite($emails_rewrite[$email->email]);
}
check_redirect($this);
+ $this->update_imap();
return SUCCESS;
}
$this->emails[$thisone]->deactivate();
}
check_redirect($this);
+ $this->update_imap();
if ($allinactive && !$activate) {
return ERROR_INACTIVE_REDIRECTION;
}
if ($mail->email == $email) {
$mail->set_rewrite($redirect);
check_redirect($this);
+ $this->update_imap();
return;
}
}
foreach ($this->emails as &$mail) {
if ($mail->email == $email) {
check_redirect($this);
+ $this->update_imap();
return $mail->clean_errors();
}
}
}
}
check_redirect($this);
+ $this->update_imap();
}
public function enable()
}
check_redirect($this);
}
+ $this->update_imap();
}
public function get_broken_mx()
{
return $this->user->id();
}
+
+ private function update_imap()
+ {
+ // Imaps must bounce if and only if the user has no active redirection.
+ if (!$this->other_active('')) {
+ XDB::execute('UPDATE email_redirect_account
+ SET action = \'imap_and_bounce\'
+ WHERE type = \'imap\' AND uid = {?}',
+ $this->user->id());
+ } else {
+ XDB::execute('UPDATE email_redirect_account
+ SET action = \'let_spams\'
+ WHERE type = \'imap\' AND uid = {?}',
+ $this->user->id());
+ }
+ }
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
projects / platal.git / blobdiff