<?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(User &$user)
+function fix_bestalias(User $user)
{
$res = XDB::query("SELECT COUNT(*)
FROM aliases
- WHERE id = {?} AND FIND_IN_SET('bestalias', flags) AND type != 'homonyme'",
+ 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", $user->id());
}
$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
// constructor {{{2
- public function __construct(User &$user)
+ public function __construct(User $user)
{
if (!$user) {
return;
{
// constructor {{{2
- public function __construct(User &$user, $row)
+ public function __construct(User $user, $row)
{
$this->user = &$user;
$this->sufficient = true;
public function clean_errors()
{
- if (!S::has_perms()) {
+ if (!S::admin()) {
return false;
}
$this->panne = 0;
}
// Returns the list of allowed storages for the @p user.
- static public function get_allowed_storages(User &$user)
+ static public function get_allowed_storages(User $user)
{
global $globals;
$storages = array();
// 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(User &$user, $name)
+ public function __construct(User $user, $name)
{
$this->user = &$user;
$this->email = $name;
// constructor {{{2
- public function __construct(User &$user)
+ public function __construct(User $user)
{
$this->user = &$user;
$this->bogo = new Bogo($user);
if (!isvalid_email_redirection($email_stripped)) {
return ERROR_LOOP_EMAIL;
}
- XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->user->id(), $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->user->id() != S::v('uid') ? " (admin on {$this->user->login()})" : ""));
}
{
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;
{
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;
projects / platal.git / blobdiff