<?php
/***************************************************************************
- * Copyright (C) 2003-2008 Polytechnique.org *
+ * Copyright (C) 2003-2011 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
// function fix_bestalias() {{{1
// Checks for an existing 'bestalias' among the the current user's aliases, and
// eventually selects a new bestalias when required.
-function fix_bestalias($uid)
+function fix_bestalias(User &$user)
{
$res = XDB::query("SELECT COUNT(*)
FROM aliases
- WHERE id = {?} AND FIND_IN_SET('bestalias', flags) AND type != 'homonyme'",
- $uid);
+ WHERE uid = {?} AND FIND_IN_SET('bestalias', flags) AND type != 'homonyme'",
+ $user->id());
if ($res->fetchOneCell()) {
return;
}
XDB::execute("UPDATE aliases
SET flags=CONCAT(flags,',','bestalias')
- WHERE id={?} AND type!='homonyme'
+ WHERE uid={?} AND type!='homonyme'
ORDER BY !FIND_IN_SET('usage',flags),alias LIKE '%.%', LENGTH(alias)
- LIMIT 1", $uid);
+ LIMIT 1", $user->id());
}
// function valide_email() {{{1
$em = trim(rtrim($str));
$em = str_replace('<', '', $em);
$em = str_replace('>', '', $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);
}
!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[$email] = $user . "@" . $globals->mail->alias_dom;
+ } elseif ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) {
+ list($user) = explode('+', $user);
+ list($user) = explode('_', $user);
+ $domain_mails[$email] = $user;
+ } else {
+ $other_mails[] = $email;
+ }
+ }
+ $uids = array();
+
+ // Look up user ids for addresses in domain
+ $alias_uids = array();
+ if (count($domain_mails)) {
+ $res = XDB::query("SELECT alias, uid
+ FROM aliases
+ WHERE alias IN {?}", array_unique($domain_mails));
+ foreach ($res->fetchAllRow() as $row) {
+ list ($alias, $id) = $row;
+ $domain_uids[$alias] = $id;
+ }
+ }
+ // Connect emails with uids
+ foreach ($domain_mails as $email => $user) {
+ // Some 'domain' emails might be invalid.
+ if (array_key_exists($user, $domain_uids)) {
+ $uids[$email] = $domain_uids[$user];
+ }
+ }
+
+ // Look up user ids for addresses in our alias domain
+ $alias_uids = array();
+ if (count($alias_mails)) {
+ $res = XDB::query("SELECT v.alias, a.uid
+ 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 {?}", array_unique($alias_mails));
+ foreach ($res->fetchAllRow() as $row) {
+ list ($alias, $id) = $row;
+ $alias_uids[$alias] = $id;
+ }
+ }
+ // Connect emails with uids
+ foreach ($alias_mails as $email => $user) {
+ if (array_key_exists($user, $alias_uids)) {
+ $uids[$email] = $alias_uids[$user];
+ }
+ }
+
+ // Look up user ids for other addresses in the email redirection list
+ if (count($other_mails)) {
+ $lowerupper = array();
+ foreach ($other_mails as $mail) {
+ $lowerupper[strtolower($mail)] = $mail;
+ }
+ $res = XDB::query("SELECT email, uid
+ FROM emails
+ WHERE email IN {?}", $other_mails);
+ foreach ($res->fetchAllRow() as $row) {
+ list ($email, $uid) = $row;
+ $uids[$lowerupper[strtolower($email)]] = $uid;
+ }
+ }
+
+ return $uids;
+}
+
// class Bogo {{{1
// The Bogo class represents a spam filtering level in plat/al architecture.
class Bogo
{
// properties {{{2
- private $uid;
+ private $user;
private $state;
private $_states = Array('let_spams', 'tag_spams', 'tag_and_drop_spams', 'drop_spams');
// constructor {{{2
- public function __construct($uid)
+ public function __construct(User &$user)
{
- if (!$uid) {
+ if (!$user) {
return;
}
- $this->uid = $uid;
- $res = XDB::query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid);
+ $this->user = &$user;
+ $res = XDB::query('SELECT email FROM emails WHERE uid = {?} AND flags = "filter"', $user->id());
if ($res->numRows()) {
$this->state = $res->fetchOneCell();
} else {
$this->state = 'tag_and_drop_spams';
- $res = XDB::query("INSERT INTO emails (uid,email,rewrite,panne,flags)
- VALUES ({?},'tag_and_drop_spams','','0000-00-00','filter')", $uid);
+ $res = XDB::query(
+ "INSERT INTO emails (uid, email, rewrite, panne, flags)
+ VALUES ({?}, 'tag_and_drop_spams', '', '0000-00-00', 'filter')",
+ $user->id());
}
}
public function change($state)
{
$this->state = is_int($state) ? $this->_states[$state] : $state;
- XDB::execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"',
- $this->state, $this->uid);
+ XDB::execute('UPDATE emails SET email = {?} WHERE uid = {?} AND flags = "filter"',
+ $this->state, $this->user->id());
}
// pubic function level() {{{2
// Storage emails (Polytechnique.org).
abstract class Email
{
- protected $uid;
+ protected $user;
// Basic email properties; $sufficient indicates if the email can be used as
// an unique redirection; $email contains the delivery email address.
public $broken;
public $disabled;
public $rewrite;
+ public $allow_rewrite;
+ public $hash;
// Redirection bounces stats.
public $panne;
{
// constructor {{{2
- public function __construct($uid, $row)
+ public function __construct(User &$user, $row)
{
- $this->uid = $uid;
+ $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');
XDB::execute("UPDATE emails
SET panne_level = IF(flags = 'panne', panne_level - 1, panne_level),
flags = 'active'
- WHERE uid={?} AND email={?}", $this->uid, $this->email);
- S::logger()->log("email_on", $this->email.($this->uid!=S::v('uid') ? "(admin on {$this->uid})" : ""));
+ WHERE uid = {?} AND email = {?}", $this->user->id(), $this->email);
+ S::logger()->log("email_on", $this->email . ($this->user->id() != S::v('uid') ? "(admin on {$this->user->login()})" : ""));
$this->active = true;
$this->broken = false;
}
{
if ($this->active) {
XDB::execute("UPDATE emails SET flags =''
- WHERE uid={?} AND email={?}", $this->uid, $this->email);
- S::logger()->log("email_off",$this->email.($this->uid != S::v('uid') ? "(admin on {$this->uid})" : "") );
+ WHERE uid = {?} AND email = {?}", $this->user->id(), $this->email);
+ S::logger()->log("email_off", $this->email . ($this->user->id() != S::v('uid') ? "(admin on {$this->user->login()})" : "") );
$this->active = false;
}
}
if (!$rewrite || !isvalid_email($rewrite)) {
$rewrite = '';
}
- XDB::execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rewrite, $this->uid, $this->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;
}
public function clean_errors()
{
- if (!S::has_perms()) {
+ if (!S::admin()) {
return false;
}
$this->panne = 0;
return XDB::execute("UPDATE emails
SET panne_level = 0, panne = 0, last = 0
WHERE uid = {?} AND email = {?}",
- $this->uid, $this->email);
+ $this->user->id(), $this->email);
}
// public function has_rewrite() {{{2
// Retrieves the current list of actives storages.
private function get_storages()
{
- $res = XDB::query("SELECT mail_storage
- FROM auth_user_md5
- WHERE user_id = {?}", $this->uid);
- return new PlFlagSet($res->fetchOneCell());
+ return new PlFlagSet(XDB::fetchOneCell('SELECT storage
+ FROM email_options
+ WHERE uid = {?}',
+ $this->user->id()));
}
// Updates the list of active storages.
private function set_storages($storages)
{
- XDB::execute("UPDATE auth_user_md5
- SET mail_storage = {?}
- WHERE user_id = {?}", $storages, $this->uid);
+ XDB::execute("UPDATE email_options
+ SET storage = {?}
+ WHERE uid = {?}", $storages, $this->user->id());
}
// Returns the list of allowed storages for the @p user.
- static public function get_allowed_storages($uid)
+ static public function get_allowed_storages(User &$user)
{
global $globals;
$storages = array();
// Google Apps storage is available for users with valid Google Apps account.
require_once 'googleapps.inc.php';
if ($globals->mailstorage->googleapps_domain &&
- GoogleAppsAccount::account_status($uid) == 'active') {
+ GoogleAppsAccount::account_status($user->id()) == 'active') {
$storages[] = 'googleapps';
}
// 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';
}
}
- public function __construct($uid, $name)
+ public function __construct(User &$user, $name)
{
- $this->uid = $uid;
+ $this->user = &$user;
$this->email = $name;
$this->display_email = (isset($this->display_names[$name]) ? $this->display_names[$name] : $name);
// properties {{{2
private $flag_active = 'active';
- private $uid;
+ private $user;
public $emails;
public $bogo;
// constructor {{{2
- public function __construct($_uid)
+ public function __construct(User &$user)
{
- $this->uid = $_uid;
- $this->bogo = new Bogo($_uid);
+ $this->user = &$user;
+ $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'", $_uid);
+ WHERE uid = {?} AND flags != 'filter'", $user->id());
$this->emails = Array();
while ($row = $res->next()) {
- $this->emails[] = new EmailRedirection($_uid, $row);
+ $this->emails[] = new EmailRedirection($user, $row);
}
// Adds local email storage backends.
- foreach (EmailStorage::get_allowed_storages($_uid) as $storage) {
- $this->emails[] = new EmailStorage($_uid, $storage);
+ foreach (EmailStorage::get_allowed_storages($user) as $storage) {
+ $this->emails[] = new EmailStorage($user, $storage);
}
}
if (!$this->other_active($email)) {
return ERROR_INACTIVE_REDIRECTION;
}
- XDB::execute('DELETE FROM emails WHERE uid={?} AND email={?}', $this->uid, $email);
- S::logger()->log('email_del',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : ""));
+ XDB::execute('DELETE FROM emails WHERE uid = {?} AND email = {?}', $this->user->id(), $email);
+ S::logger()->log('email_del', $email . ($this->user->id() != S::v('uid') ? " (admin on {$this->user->login()})" : ""));
foreach ($this->emails as $i => $mail) {
if ($email == $mail->email) {
unset($this->emails[$i]);
if (!isvalid_email_redirection($email_stripped)) {
return ERROR_LOOP_EMAIL;
}
- XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->uid, $email);
+ // 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 emails (uid, email, flags)
+ VALUES ({?}, {?}, \'active\')',
+ $this->user->id(), $email);
if ($logger = S::v('log', null)) { // may be absent --> step4.php
- S::logger()->log('email_add',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : ""));
+ S::logger()->log('email_add', $email . ($this->user->id() != S::v('uid') ? " (admin on {$this->user->login()})" : ""));
}
foreach ($this->emails as $mail) {
if ($mail->email == $email_stripped) {
return SUCCESS;
}
}
- $this->emails[] = new EmailRedirection($this->uid, 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->uid);
+ check_email($email, "Ajout d'une adresse surveillée aux redirections de " . $this->user->login());
check_redirect($this);
return SUCCESS;
}
{
XDB::execute("UPDATE emails
SET flags = 'disable'
- WHERE flags = 'active' AND uid = {?}", $this->uid);
+ WHERE flags = 'active' AND uid = {?}", $this->user->id());
foreach ($this->emails as &$mail) {
if ($mail->active && $mail->has_disable()) {
$mail->disabled = true;
{
XDB::execute("UPDATE emails
SET flags = 'active'
- WHERE flags = 'disable' AND uid = {?}", $this->uid);
+ WHERE flags = 'disable' AND uid = {?}", $this->user->id());
foreach ($this->emails as &$mail) {
if ($mail->disabled) {
$mail->active = true;
public function get_uid()
{
- return $this->uid;
+ return $this->user->id();
}
}
projects / platal.git / blobdiff