<?php
/***************************************************************************
- * Copyright (C) 2003-2009 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
XDB::execute("UPDATE aliases
SET flags = TRIM(BOTH ',' FROM REPLACE(CONCAT(',', flags, ','), ',bestalias,', ','))
- WHERE id = {?}", $user->id());
+ WHERE uid = {?}", $user->id());
XDB::execute("UPDATE aliases
SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias')
- WHERE id = {?} AND alias = {?}", $user->id(), $email);
+ WHERE uid = {?} AND alias = {?}", $user->id(), $email);
// As having a non-null bestalias value is critical in
// plat/al's code, we do an a posteriori check on the
(alias REGEXP '\\\\.[0-9]{2}$') AS cent_ans,
FIND_IN_SET('bestalias',flags) AS best, expire
FROM aliases
- WHERE id = {?} AND type!='homonyme'
+ WHERE uid = {?} AND type!='homonyme'
ORDER BY LENGTH(alias)";
$page->assign('aliases', XDB::iterator($sql, $user->id()));
// Check for homonyms.
- $homonyme = XDB::query(
- "SELECT alias
- FROM aliases
- INNER JOIN homonymes ON (id = homonyme_id)
- WHERE user_id = {?} AND type = 'homonyme'", $user->id());
- $page->assign('homonyme', $homonyme->fetchOneCell());
+ $page->assign('homonyme', $user->homonyme);
// Display active redirections.
$redirect = new Redirect($user);
// Fetch existing @alias_dom aliases.
$alias = $user->emailAlias();
$visibility = $user->hasProfile() && $user->profile()->alias_pub;
+ $page->assign('actuel', $alias);
+ $page->assign('user', $user);
+ $page->assign('mail_public', $visibility);
if ($action == 'ask' && Env::has('alias') && Env::has('raison')) {
S::assert_xsrf_token();
$value, $user->profile()->id());
}
$visibility = ($value == 'public');
+ exit;
}
$page->assign('actuel', $alias);
$actifs = Env::v('emails_actifs', Array());
print_r(Env::v('emails_rewrite'));
if (Env::v('emailop') == "ajouter" && Env::has('email')) {
+ $error_email = false;
$new_email = Env::v('email');
if ($new_email == "new@example.org") {
$new_email = Env::v('email_new');
}
$result = $redirect->add_email($new_email);
if ($result == ERROR_INVALID_EMAIL) {
+ $error_email = true;
$page->assign('email', $new_email);
}
$page->assign('retour', $result);
+ $page->assign('error_email', $error_email);
} elseif (empty($actifs)) {
$result = ERROR_INACTIVE_REDIRECTION;
} elseif (is_array($actifs)) {
. $user->forlifeEmail() . ' ne fonctionnerait plus.');
break;
case ERROR_INVALID_EMAIL:
- $page->trigError('Erreur: l\'email n\'est pas valide.');
+ $page->trigError('Erreur : l\'email n\'est pas valide.');
break;
case ERROR_LOOP_EMAIL:
$page->trigError('Erreur : ' . $user->forlifeEmail()
$res = XDB::query(
"SELECT alias,expire
FROM aliases
- WHERE id={?} AND (type='a_vie' OR type='alias')
+ WHERE uid={?} AND (type='a_vie' OR type='alias')
ORDER BY !FIND_IN_SET('usage',flags), LENGTH(alias)", $user->id());
$page->assign('alias', $res->fetchAllAssoc());
$page->assign('emails', $redirect->emails);
$_POST['cc_contacts'] = explode(';', @$_POST['cc_contacts']);
$data = serialize($_POST);
XDB::execute("REPLACE INTO email_send_save
- VALUES ({?}, {?})", S::i('uid'), $data);
+ VALUES ({?}, {?})",
+ S::user()->id('uid'), $data);
}
exit;
} else if (Env::v('submit') == 'Envoyer') {
if (!is_array($aliases)) {
return null;
}
- $rel = Env::v('contacts');
+ $uf = new UserFilter(new UFC_Hrpid($aliases));
+ $users = $uf->iterUsers();
$ret = array();
- foreach ($aliases as $alias) {
- $ret[$alias] = $rel[$alias];
+ while ($user = $users->next()) {
+ $ret[] = $user->forlife;
}
return join(', ', $ret);
}
if (!$error) {
XDB::execute("DELETE FROM email_send_save
- WHERE uid = {?}", S::i('uid'));
+ WHERE uid = {?}",
+ S::user()->id());
$to2 = getEmails(Env::v('to_contacts'));
$cc2 = getEmails(Env::v('cc_contacts'));
$txt = str_replace('^M', '', Env::v('contenu'));
- $to = Env::v('to');
- $subj = Env::v('sujet');
- $from = Env::v('from');
- $cc = trim(Env::v('cc'));
- $bcc = trim(Env::v('bcc'));
-
+ $to = str_replace(';', ',', Env::t('to'));
+ $subj = Env::t('sujet');
+ $from = Env::t('from');
+ $cc = str_replace(';', ',', Env::t('cc'));
+ $bcc = str_replace(';', ',', Env::t('bcc'));
+
+ $email_regex = '/^[a-z0-9.\-+_\$]+@([\-.+_]?[a-z0-9])+$/i';
+ foreach (explode(',', $to . ',' . $cc . ',' . $bcc) as $email) {
+ $email = trim($email);
+ if ($email != '' && !preg_match($email_regex, $email)) {
+ $page->trigError("L'adresse email " . $email . ' est erronée.');
+ $error = true;
+ }
+ }
if (empty($to) && empty($cc) && empty($to2) && empty($bcc) && empty($cc2)) {
$page->trigError("Indique au moins un destinataire.");
+ $error = true;
+ }
+
+ if ($error) {
$page->assign('uploaded_f', PlUpload::listFilenames(S::user()->login(), 'emails.send'));
} else {
$mymail = new PlMailer();
}
}
- $res = XDB::query(
- "SELECT ac.full_name, a.alias as forlife
- FROM accounts AS ac
- INNER JOIN contacts AS c ON (ac.uid = c.contact)
- INNER JOIN aliases AS a ON (ac.uid = a.id AND FIND_IN_SET('bestalias', a.flags))
- WHERE c.uid = {?}
- ORDER BY ac.full_name", S::i('uid'));
- $page->assign('contacts', $res->fetchAllAssoc());
+ $uf = new UserFilter(new PFC_And(new UFC_Contact(S::user()),
+ new UFC_Registered()),
+ UserFilter::sortByName());
+ $contacts = $uf->getProfiles();
+ $page->assign('contacts', $contacts);
$page->assign('maxsize', ini_get('upload_max_filesize') . 'o');
$page->assign('user', S::user());
}
global $globals;
$res = XDB::query("SELECT e.email, e.rewrite, a.alias
FROM emails AS e
- INNER JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie')
+ INNER JOIN aliases AS a ON (a.uid = e.uid AND a.type = 'a_vie')
WHERE e.email = {?} AND e.hash = {?}",
$mail, $hash);
XDB::query("UPDATE emails
if (!empty($hash) || !empty($login)) {
$user = User::getSilent($login);
if ($user) {
- $req = XDB::query("SELECT 1 FROM newsletter_ins WHERE user_id = {?} AND hash = {?}", $user->id(), $hash);
+ $req = XDB::query('SELECT 1
+ FROM newsletter_ins
+ WHERE uid = {?} AND hash = {?}',
+ $user->id(), $hash);
if ($req->numRows() == 0) {
$user = null;
}
$page->assign('neuneu', true);
} else {
$page->assign('email',$email);
- $x = XDB::fetchOneAssoc("SELECT e1.uid, e1.panne != 0 AS panne,
- (count(e2.uid) + IF(FIND_IN_SET('googleapps', eo.storage), 1, 0)) AS nb_mails
- FROM emails as e1
+ $x = XDB::fetchOneAssoc("SELECT e1.uid, e1.panne != 0 AS panne, a.hruid,
+ (COUNT(e2.uid) + IF(FIND_IN_SET('googleapps', eo.storage), 1, 0)) AS nb_mails
+ FROM emails AS e1
INNER JOIN email_options AS eo ON (eo.uid = e1.uid)
- LEFT JOIN emails as e2 ON(e1.uid = e2.uid
- AND FIND_IN_SET('active', e2.flags)
- AND e1.email != e2.email)
+ INNER JOIN accounts AS a ON (e1.uid = a.uid)
+ LEFT JOIN emails AS e2 ON (e1.uid = e2.uid
+ AND FIND_IN_SET('active', e2.flags)
+ AND e1.email != e2.email)
WHERE e1.email = {?}
GROUP BY e1.uid", $email);
if ($x) {
switch (Post::v('action')) {
case 'create':
if (trim(Post::v('emailN')) != '') {
- Xdb::execute('INSERT IGNORE INTO emails_watch (email, state, detection, last, uid, description)
+ Xdb::execute('INSERT IGNORE INTO email_watch (email, state, detection, last, uid, description)
VALUES ({?}, {?}, CURDATE(), NOW(), {?}, {?})',
trim(Post::v('emailN')), Post::v('stateN'), S::i('uid'), Post::v('descriptionN'));
};
break;
case 'edit':
- Xdb::execute('UPDATE emails_watch
+ Xdb::execute('UPDATE email_watch
SET state = {?}, last = NOW(), uid = {?}, description = {?}
WHERE email = {?}', Post::v('stateN'), S::i('uid'), Post::v('descriptionN'), Post::v('emailN'));
break;
default:
if ($action == 'delete' && !is_null($email)) {
- Xdb::execute('DELETE FROM emails_watch WHERE email = {?}', $email);
+ Xdb::execute('DELETE FROM email_watch WHERE email = {?}', $email);
}
}
if ($action != 'create' && $action != 'edit') {
if ($action == 'list') {
$sql = "SELECT w.email, w.detection, w.state, a.alias AS forlife
- FROM emails_watch AS w
+ FROM email_watch AS w
LEFT JOIN emails AS e USING(email)
- LEFT JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie')
+ LEFT JOIN aliases AS a ON (a.uid = e.uid AND a.type = 'a_vie')
ORDER BY w.state, w.email, a.alias";
$it = Xdb::iterRow($sql);
} elseif ($action == 'edit') {
$sql = "SELECT w.detection, w.state, w.last, w.description,
a1.alias AS edit, a2.alias AS forlife
- FROM emails_watch AS w
- LEFT JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie')
+ FROM email_watch AS w
+ LEFT JOIN aliases AS a1 ON (a1.uid = w.uid AND a1.type = 'a_vie')
LEFT JOIN emails AS e ON (w.email = e.email)
- LEFT JOIN aliases AS a2 ON (a2.id = e.uid AND a2.type = 'a_vie')
+ LEFT JOIN aliases AS a2 ON (a2.uid = e.uid AND a2.type = 'a_vie')
WHERE w.email = {?}
ORDER BY a2.alias";
$it = Xdb::iterRow($sql, $email);
$broken_list = explode("\n", $list);
sort($broken_list);
foreach ($broken_list as $orig_email) {
- $email = valide_email(trim($orig_email));
- if (empty($email) || $email == '@') {
- $invalid_emails[] = "$orig_email: invalid email";
- } else {
- $res = XDB::query('SELECT COUNT(*)
- FROM emails
- WHERE email = {?}', $email);
- if ($res->fetchOneCell() > 0) {
- $valid_emails[] = $email;
- } else {
- $invalid_emails[] = "$orig_email: no such redirection";
+ $orig_email = trim($orig_email);
+ if ($orig_email != '') {
+ $email = valide_email($orig_email);
+ if (empty($email) || $email == '@') {
+ $invalid_emails[] = trim($orig_email) . ': invalid email';
+ } elseif (!in_array($email, $valid_emails)) {
+ $res = XDB::query('SELECT COUNT(*)
+ FROM emails
+ WHERE email = {?}', $email);
+ if ($res->fetchOneCell() > 0) {
+ $valid_emails[] = $email;
+ } else {
+ $invalid_emails[] = "$orig_email: no such redirection";
+ }
}
}
}
$sel = XDB::query(
"SELECT e1.uid, e1.panne != 0 AS panne, count(e2.uid) AS nb_mails,
- u.nom, u.prenom, u.promo, a.alias
+ acc.full_name, a.alias
FROM emails AS e1
LEFT JOIN emails AS e2 ON (e1.uid = e2.uid AND FIND_IN_SET('active', e2.flags)
AND e1.email != e2.email)
- INNER JOIN auth_user_md5 AS u ON (e1.uid = u.user_id)
- INNER JOIN aliases AS a ON (u.user_id = a.id AND FIND_IN_SET('bestalias', a.flags))
+ INNER JOIN accounts AS acc ON (e1.uid = acc.uid)
+ INNER JOIN aliases AS a ON (acc.uid = a.uid AND FIND_IN_SET('bestalias', a.flags))
WHERE e1.email = {?}
GROUP BY e1.uid", $email);
if (!empty($x['nb_mails'])) {
$mail = new PlMailer('emails/broken.mail.tpl');
- $mail->addTo("\"{$x['prenom']} {$x['nom']}\" <{$x['alias']}@"
+ $mail->addTo("\"{$x['full_name']}\" <{$x['alias']}@"
. $globals->mail->domain . '>');
$mail->assign('x', $x);
$mail->assign('email', $email);
// Output the list of users with recently broken addresses,
// along with the count of valid redirections.
- header('Content-Type: text/x-csv; charset=utf-8;');
- header('Cache-Control: no-cache');
+ require_once 'notifs.inc.php';
+ pl_content_headers("text/x-csv");
$csv = fopen('php://output', 'w');
- fputcsv($csv, array('nom', 'prenom', 'alias', 'bounce', 'nbmails', 'url'), ';');
+ fputcsv($csv, array('nom', 'promo', 'alias', 'bounce', 'nbmails', 'url'), ';');
foreach ($broken_user_list as $alias => $mails) {
$sel = Xdb::query(
- "SELECT u.user_id, count(e.email) AS nb_mails, u.nom, u.prenom, u.promo
- FROM aliases AS a
- INNER JOIN auth_user_md5 AS u ON a.id = u.user_id
- LEFT JOIN emails AS e ON (e.uid = u.user_id
- AND FIND_IN_SET('active', e.flags) AND e.panne = 0)
+ "SELECT acc.uid, count(e.email) AS nb_mails,
+ IFNULL(pd.public_name, acc.full_name) AS fullname,
+ IFNULL(pd.promo, 0) AS promo
+ FROM aliases AS a
+ INNER JOIN accounts AS acc ON (a.uid = acc.uid)
+ LEFT JOIN emails AS e ON (e.uid = acc.uid
+ AND FIND_IN_SET('active', e.flags) AND e.panne = 0)
+ LEFT JOIN account_profiles AS ap ON (acc.uid = ap.uid AND FIND_IN_SET('owner', ap.perms))
+ LEFT JOIN profile_display AS pd ON (pd.pid = ap.pid)
WHERE a.alias = {?}
- GROUP BY u.user_id", $alias);
+ GROUP BY acc.uid", $alias);
if ($x = $sel->fetchOneAssoc()) {
- fputcsv($csv, array($x['nom'], $x['prenom'], $x['promo'], $alias,
- join(',', $mails), $x['nb_mails']),
- 'https://www.polytechnique.org/marketing/broken/' . $alias, ';');
+ if ($x['nb_mails'] == 0) {
+ $user = User::getSilentWithUID($x['uid']);
+ $profile = $user->profile();
+ WatchProfileUpdate::register($profile, 'broken');
+ }
+ fputcsv($csv, array($x['fullname'], $x['promo'], $alias,
+ join(',', $mails), $x['nb_mails'],
+ 'https://www.polytechnique.org/marketing/broken/' . $alias), ';');
}
}
fclose($csv);
projects / platal.git / blobdiff