X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Femail.php;h=632524c8342c86db13987c990faf6b42f830cb24;hb=94e3a8e9257f4e22ee7a09fbc9c1235fe37fb8a8;hp=2d6d8c13c6b2890c8e288be54702a5a875e20820;hpb=a9fd3272be2fa0a2513e0ef22323edab77604ca3;p=platal.git diff --git a/modules/email.php b/modules/email.php index 2d6d8c1..632524c 100644 --- a/modules/email.php +++ b/modules/email.php @@ -1,6 +1,6 @@ $this->make_hook('emails', AUTH_COOKIE, 'mail'), - 'emails/alias' => $this->make_hook('alias', AUTH_MDP, 'mail'), - 'emails/antispam' => $this->make_hook('antispam', AUTH_MDP, 'mail'), - 'emails/broken' => $this->make_hook('broken', AUTH_COOKIE), - 'emails/redirect' => $this->make_hook('redirect', AUTH_MDP, 'mail'), - 'emails/send' => $this->make_hook('send', AUTH_MDP, 'mail'), - 'emails/antispam/submit' => $this->make_hook('submit', AUTH_COOKIE), + 'emails/alias' => $this->make_hook('alias', AUTH_PASSWD, 'mail'), + 'emails/antispam' => $this->make_hook('antispam', AUTH_PASSWD, 'mail'), + 'emails/broken' => $this->make_hook('broken', AUTH_COOKIE, 'user'), + 'emails/redirect' => $this->make_hook('redirect', AUTH_PASSWD, 'mail'), + 'emails/send' => $this->make_hook('send', AUTH_PASSWD, 'mail'), + 'emails/antispam/submit' => $this->make_hook('submit', AUTH_COOKIE, 'user'), 'emails/test' => $this->make_hook('test', AUTH_COOKIE, 'mail', NO_AUTH), 'emails/rewrite/in' => $this->make_hook('rewrite_in', AUTH_PUBLIC), @@ -38,10 +38,10 @@ class EmailModule extends PLModule 'emails/imap/in' => $this->make_hook('imap_in', AUTH_PUBLIC), - 'admin/emails/duplicated' => $this->make_hook('duplicated', AUTH_MDP, 'admin'), - 'admin/emails/watch' => $this->make_hook('duplicated', AUTH_MDP, 'admin'), - 'admin/emails/lost' => $this->make_hook('lost', AUTH_MDP, 'admin'), - 'admin/emails/broken' => $this->make_hook('broken_addr', AUTH_MDP, 'admin'), + 'admin/emails/duplicated' => $this->make_hook('duplicated', AUTH_PASSWD, 'admin'), + 'admin/emails/watch' => $this->make_hook('duplicated', AUTH_PASSWD, 'admin'), + 'admin/emails/lost' => $this->make_hook('lost', AUTH_PASSWD, 'admin'), + 'admin/emails/broken' => $this->make_hook('broken_addr', AUTH_PASSWD, 'admin'), ); } @@ -68,33 +68,58 @@ class EmailModule extends PLModule // Then gives the bestalias flag to the given email. list($email, $domain) = explode('@', $email); XDB::execute("UPDATE email_source_account AS s - INNER JOIN email_virtual_domains AS d ON (s.domain = d.id) - SET s.flags = CONCAT_WS(',', IF(s.flags = '', NULL, s.flags), 'bestalias') - WHERE s.uid = {?} AND s.email = {?} AND d.name = {?}", $user->id(), $email, $domain); + INNER JOIN email_virtual_domains AS m ON (m.id = s.domain) + INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id) + SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias') + WHERE s.uid = {?} AND s.email = {?} AND d.name = {?}", + $user->id(), $email, $domain); + XDB::execute('UPDATE accounts AS a + INNER JOIN email_virtual_domains AS d ON (d.name = {?}) + INNER JOIN email_virtual_domains AS m ON (d.aliasing = m.id) + SET a.best_domain = d.id + WHERE a.uid = {?} AND m.name = {?}', + $domain, $user->id(), $user->mainEmailDomain()); // As having a non-null bestalias value is critical in // plat/al's code, we do an a posteriori check on the // validity of the bestalias. fix_bestalias($user); + // Then refetch the user to update its bestalias. + S::set('user', User::getWithUID(S::user()->id())); } // Fetch and display aliases. $aliases = XDB::iterator("SELECT CONCAT(s.email, '@', d.name) AS email, (s.type = 'forlife') AS forlife, - (s.email REGEXP '\\\\.[0-9]{2}$') AS hundred_year, - FIND_IN_SET('bestalias', s.flags) AS bestalias, s.expire, - (d.name = {?}) AS alias + (s.email REGEXP '\\\\.[0-9]{2}$') AS hundred_year, s.expire, + (FIND_IN_SET('bestalias', s.flags) AND a.best_domain = d.id) AS bestalias, + ((s.type = 'alias_aux') AND d.aliasing = d.id) AS alias FROM email_source_account AS s - INNER JOIN email_virtual_domains AS d ON (s.domain = d.id) + INNER JOIN accounts AS a ON (s.uid = a.uid) + INNER JOIN email_virtual_domains AS m ON (s.domain = m.id) + INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id) WHERE s.uid = {?} - ORDER BY !alias, s.email", - $globals->mail->alias_dom, $user->id()); - $page->assign('aliases', $aliases); - - $alias = XDB::fetchOneCell('SELECT COUNT(s.email) - FROM email_source_account AS s - INNER JOIN email_virtual_domains AS d ON (s.domain = d.id) - WHERE s.uid = {?} AND d.name = {?}', - $user->id(), $globals->mail->alias_dom); + ORDER BY !alias, s.email, d.name", + $user->id()); + $aliases_forlife = array(); + $aliases_hundred = array(); + $aliases_other = array(); + while ($a = $aliases->next()) { + if ($a['forlife']) { + $aliases_forlife[] = $a; + } elseif ($a['hundred_year']) { + $aliases_hundred[] = $a; + } else { + $aliases_other[] = $a; + } + } + $page->assign('aliases_forlife', $aliases_forlife); + $page->assign('aliases_hundred', $aliases_hundred); + $page->assign('aliases_other', $aliases_other); + + $alias = XDB::fetchOneCell('SELECT COUNT(email) + FROM email_source_account + WHERE uid = {?} AND type = \'alias_aux\'', + $user->id()); $page->assign('alias', $alias); @@ -104,6 +129,13 @@ class EmailModule extends PLModule // Display active redirections. $redirect = new Redirect($user); $page->assign('mails', $redirect->active_emails()); + + // User's mail domains. + $mail_domains = array($user->alternateEmailDomain()); + $mail_domains[] = User::$sub_mail_domains['all'] . $globals->mail->domain; + $mail_domains[] = User::$sub_mail_domains['all'] . $globals->mail->domain2; + $page->assign('main_email_domain', $user->mainEmailDomain()); + $page->assign('mail_domains', $mail_domains); } function handler_alias($page, $action = null, $value = null) @@ -120,23 +152,21 @@ class EmailModule extends PLModule if ($action == 'delete') { S::assert_xsrf_token(); - XDB::execute('DELETE s - FROM email_source_account AS s - INNER JOIN email_virtual_domains AS d ON (s.domain = d.id) - WHERE s.uid = {?} AND d.name = {?}', - $user->id(), $globals->mail->alias_dom); + XDB::execute('DELETE FROM email_source_account + WHERE uid = {?} AND type = \'alias_aux\'', + $user->id()); require_once 'emails.inc.php'; fix_bestalias($user); } - // Fetch existing @alias_dom aliases. + // Fetch existing auxiliary aliases. list($alias, $old_alias) = XDB::fetchOneRow('SELECT CONCAT(s.email, \'@\', d.name), s.email FROM email_source_account AS s INNER JOIN email_virtual_domains AS d ON (s.domain = d.id) - WHERE s.uid = {?} AND d.name = {?}', - $user->id(), $globals->mail->alias_dom); - $visibility = $user->hasProfile() && ($user->profile(true)->alias_pub == 'public'); + WHERE s.uid = {?} AND s.type = \'alias_aux\'', + $user->id()); + $visibility = $user->hasProfile() && $user->profile()->isVisible($user->profile()->alias_pub); $page->assign('current', $alias); $page->assign('user', $user); $page->assign('mail_public', $visibility); @@ -147,28 +177,28 @@ class EmailModule extends PLModule // Retrieves user request. $new_alias = Env::v('alias'); $reason = Env::v('reason'); - $public = (Env::v('public', 'off') == 'on') ? 'public' : 'private'; + $public = (Env::v('public', 'off') == 'on') ? 'private' : 'hidden'; $page->assign('r_alias', $new_alias); $page->assign('r_reason', $reason); - if ($public == 'public') { + if ($public == 'private') { $page->assign('r_public', true); } // Checks special charaters in alias. - if (!preg_match("/^[a-zA-Z0-9\-.]{3,20}$/", $new_alias)) { + if (!preg_match("/^[a-zA-Z0-9\-.]{2,19}[a-zA-Z0-9\-]$/", $new_alias)) { $page->trigError("L'adresse demandée n'est pas valide." . " Vérifie qu'elle comporte entre 3 et 20 caractères" . " et qu'elle ne contient que des lettres non accentuées," - . " des chiffres ou les caractères - et ."); + . " des chiffres ou les caractères '-' et '.'. De plus, elle ne" + . " peut pas se terminer par un point."); return; } else { // Checks if the alias has already been given. - $res = XDB::query('SELECT COUNT(s.email) - FROM email_source_account AS s - INNER JOIN email_virtual_domains AS d ON (s.domain = d.id) - WHERE s.email = {?} AND d.name = {?}', - $new_alias, $globals->mail->alias_dom); + $res = XDB::query('SELECT COUNT(email) + FROM email_source_account + WHERE email = {?} AND type = \'alias_aux\'', + $new_alias); if ($res->fetchOneCell() > 0) { $page->trigError("L'alias $new_alias a déja été attribué. Tu ne peux donc pas l'obtenir."); return; @@ -284,9 +314,10 @@ class EmailModule extends PLModule INNER JOIN email_virtual_domains AS m ON (s.domain = m.id) INNER JOIN email_virtual_domains AS d ON (m.id = d.aliasing) WHERE s.uid = {?} - ORDER BY NOT (m.name = {?}), s.email, d.name', - $user->id(), $globals->mail->alias_dom); + ORDER BY NOT(s.type = \'alias_aux\'), s.email, d.name', + $user->id()); $page->assign('alias', $alias->fetchAllAssoc()); + $page->assign('best_email', $user->bestEmail()); $page->assign('emails', $redirect->emails); @@ -295,10 +326,10 @@ class EmailModule extends PLModule $page->assign('googleapps', GoogleAppsAccount::account_status($user->id())); require_once 'emails.combobox.inc.php'; - fill_email_combobox($page); + fill_email_combobox($page, array('job', 'stripped_directory')); } - function handler_antispam($page, $filter_status = null) + function handler_antispam($page, $filter_status = null, $redirection = null) { require_once 'emails.inc.php'; $wp = new PlWikiPage('Xorg.Antispam'); @@ -308,10 +339,17 @@ class EmailModule extends PLModule $user = S::user(); $bogo = new Bogo($user); - if (isset($filter_status)) { - $bogo->change($filter_status + 0); + if (!is_null($filter_status)) { + if (is_null($redirection)) { + $bogo->changeAll($filter_status); + } else { + $bogo->change($redirection, $filter_status); + } } - $page->assign('filter', $bogo->level()); + $page->assign('filter', $bogo->state); + $page->assign('single_state', $bogo->single_state); + $page->assign('single_redirection', $bogo->single_redirection); + $page->assign('redirections', $bogo->redirections); } function handler_submit($page) @@ -440,7 +478,7 @@ class EmailModule extends PLModule foreach ($files as $name=>&$upload) { $mymail->addUploadAttachment($upload, $name); } - if (Env::v('nowiki')) { + if (Env::v('wiki') == 'text') { $mymail->setTxtBody(wordwrap($txt, 78, "\n")); } else { $mymail->setWikiBody($txt); @@ -475,6 +513,14 @@ class EmailModule extends PLModule $page->assign('contacts', $contacts); $page->assign('maxsize', ini_get('upload_max_filesize') . 'o'); $page->assign('user', S::user()); + $preferences = XDB::fetchOneAssoc('SELECT from_email, from_format + FROM accounts + WHERE uid = {?}', + S::user()->id()); + if ($preferences['from_email'] == '') { + $preferences['from_email'] = '"' . S::user()->fullName() . '" <' . S::user()->bestEmail() . '>'; + } + $page->assign('preferences', $preferences); } function handler_test($page, $hruid = null) @@ -596,12 +642,12 @@ class EmailModule extends PLModule require_once 'emails.inc.php'; $page->assign('ok', false); if (S::logged() && (is_null($user) || $user->id() == S::i('uid'))) { - Email::activate_storage(S::user(), 'imap'); + Email::activate_storage(S::user(), 'imap', Bogo::IMAP_DEFAULT); $page->assign('ok', true); $page->assign('yourself', S::user()->displayName()); $page->assign('sexe', S::user()->isFemale()); } else if (!S::logged() && $user) { - Email::activate_storage($user, 'imap'); + Email::activate_storage($user, 'imap', Bogo::IMAP_DEFAULT); $page->assign('ok', true); $page->assign('yourself', $user->displayName()); $page->assign('sexe', $user->isFemale()); @@ -629,6 +675,9 @@ class EmailModule extends PLModule if ($uid) { $dest = User::getWithUID($uid); + $active = XDB::fetchOneCell('SELECT flags + FROM email_redirect_account + WHERE redirect = {?} AND uid = {?}', $email, $uid) == 'active'; $mail = new PlMailer('emails/broken-web.mail.tpl'); $mail->assign('email', $email); @@ -640,11 +689,8 @@ class EmailModule extends PLModule S::assert_xsrf_token(); $email = Post::t('email'); - list(, $domain) = explode('@', $email); - $domain = strtolower($domain); - if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2 - || $domain == $globals->mail->domain || $domain == $globals->mail->domain2) { + if (!User::isForeignEmailAddress($email)) { $page->assign('neuneu', true); } else { $user = mark_broken_email($email); @@ -693,12 +739,11 @@ class EmailModule extends PLModule $page->assign('action', $action); if ($action == 'list') { - $sql = "SELECT w.email, w.detection, w.state, a.alias AS forlife - FROM email_watch AS w - LEFT JOIN emails AS e USING(email) - 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); + $it = XDB::iterRow('SELECT w.email, w.detection, w.state, s.email AS forlife + FROM email_watch AS w + INNER JOIN email_redirect_account AS r ON (w.email = r.redirect) + INNER JOIN email_source_account AS s ON (s.uid = r.uid AND s.type = \'forlife\') + ORDER BY w.state, w.email, s.email'); $table = array(); $props = array(); @@ -720,15 +765,15 @@ class EmailModule extends PLModule } $page->assign('table', $table); } elseif ($action == 'edit') { - $sql = "SELECT w.detection, w.state, w.last, w.description, - a1.alias AS edit, a2.alias AS forlife - 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.uid = e.uid AND a2.type = 'a_vie') - WHERE w.email = {?} - ORDER BY a2.alias"; - $it = Xdb::iterRow($sql, $email); + $it = XDB::iterRow('SELECT w.detection, w.state, w.last, w.description, + a.hruid AS edit, s.email AS forlife + FROM email_watch AS w + INNER JOIN email_redirect_account AS r ON (w.email = r.redirect) + INNER JOIN email_source_account AS s ON (s.uid = r.uid AND s.type = \'forlife\') + LEFT JOIN accounts AS a ON (w.uid = a.uid) + WHERE w.email = {?} + ORDER BY s.email', + $email); $props = array(); while (list($detection, $state, $last, $description, $edit, $forlife) = $it->next()) { @@ -754,13 +799,15 @@ class EmailModule extends PLModule $page->assign('lost_emails', XDB::iterator('SELECT a.uid, a.hruid, pd.promo - FROM accounts AS a - INNER JOIN email_options AS eo ON (eo.uid = a.uid) - LEFT JOIN emails AS e ON (a.uid = e.uid AND FIND_IN_SET(\'active\', e.flags)) - LEFT JOIN account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET(\'owner\', perms)) - LEFT JOIN profile_display AS pd ON (ap.pid = pd.pid) - WHERE e.uid IS NULL AND FIND_IN_SET(\'googleapps\', eo.storage) = 0 - AND a.state = \'active\' + FROM accounts AS a + INNER JOIN account_types AS at ON (a.type = at.type) + LEFT JOIN email_redirect_account AS er ON (er.uid = a.uid AND er.flags = \'active\' AND er.broken_level < 3 + AND er.type != \'imap\' AND er.type != \'homonym\') + LEFT JOIN account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET(\'owner\', ap.perms)) + LEFT JOIN profile_display AS pd ON (ap.pid = pd.pid) + LEFT JOIN profiles AS p ON (ap.pid = p.pid) + WHERE a.state = \'active\' AND er.redirect IS NULL AND FIND_IN_SET(\'mail\', at.perms) AND p.deathdate IS NULL + GROUP BY a.uid ORDER BY pd.promo, a.hruid')); } @@ -811,26 +858,44 @@ class EmailModule extends PLModule if ($list == '') { $page->trigError('La liste est vide.'); } else { + require_once 'notifs.inc.php'; + $broken_user_list = array(); + $broken_user_email_count = array(); + $broken_user_profiles = array(); $broken_list = explode("\n", $list); sort($broken_list); foreach ($broken_list as $email) { + $userobj = null; if ($user = mark_broken_email($email, true)) { - if ($user['nb_mails'] > 0) { - $mail = new PlMailer('emails/broken.mail.tpl'); - $mail->addTo('"' . $user['full_name'] . '" <' . $user['alias'] . '@' . Platal::globals()->mail->domain . '>'); - $mail->assign('user', $user); - $mail->assign('email', $email); - $mail->send(); - } + $userobj = User::getSilentWithUID($user['uid']); + } + if (is_null($userobj)) { + continue; + } + $profile = $userobj->profile(); + if (is_null($profile)) { + continue; + } + if ($user['nb_mails'] > 0 && $user['notify']) { + $mail = new PlMailer('emails/broken.mail.tpl'); + $mail->setTo($userobj); + $mail->assign('user', $user); + $mail->assign('email', $email); + $mail->send(); + } else { + WatchProfileUpdate::register($profile, 'broken'); + } - if (!isset($broken_user_list[$user['alias']])) { - $broken_user_list[$user['alias']] = array($email); - } else { - $broken_user_list[$user['alias']][] = $email; - } + $pid = $profile->id(); + if (!isset($broken_user_list[$pid])) { + $broken_user_list[$pid] = array($email); + } else { + $broken_user_list[$pid][] = $email; } + $broken_user_email_count[$pid] = $user['nb_mails']; + $broken_user_profiles[$pid] = $profile; } XDB::execute('UPDATE email_redirect_account @@ -844,42 +909,28 @@ class EmailModule extends PLModule // Output the list of users with recently broken addresses, // along with the count of valid redirections. - require_once 'notifs.inc.php'; pl_cached_content_headers('text/x-csv', 1); $csv = fopen('php://output', 'w'); - fputcsv($csv, array('nom', 'promo', 'alias', 'bounce', 'nbmails', 'url', 'corps', 'job', 'networking'), ';'); - foreach ($broken_user_list as $alias => $mails) { - $sel = Xdb::query( - 'SELECT a.uid, count(DISTINCT(r.redirect)) AS nb_mails, - IFNULL(pd.public_name, a.full_name) AS fullname, - IFNULL(pd.promo, 0) AS promo, IFNULL(pce.name, \'Aucun\') AS corps, - IFNULL(pje.name, \'Aucun\') AS job, GROUP_CONCAT(pn.address SEPARATOR \', \') AS networking - FROM email_source_account AS s - INNER JOIN accounts AS a ON (s.uid = a.uid) - LEFT JOIN email_redirect_account AS r ON (a.uid = r.uid AND r.broken_level = 0 AND r.flags = \'active\' AND - (r.type = \'smtp\' OR r.type = \'googleapps\')) - LEFT JOIN account_profiles AS ap ON (a.uid = ap.uid AND FIND_IN_SET(\'owner\', ap.perms)) - LEFT JOIN profile_display AS pd ON (pd.pid = ap.pid) - LEFT JOIN profile_corps AS pc ON (pc.pid = ap.pid) - LEFT JOIN profile_corps_enum AS pce ON (pc.current_corpsid = pce.id) - LEFT JOIN profile_job AS pj ON (pj.pid = ap.pid) - LEFT JOIN profile_job_enum AS pje ON (pj.jobid = pje.id) - LEFT JOIN profile_networking AS pn ON (pn.pid = ap.pid) - WHERE s.email = {?} - GROUP BY a.uid', $alias); - - if ($x = $sel->fetchOneAssoc()) { - 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, - $x['corps'], $x['job'], $x['networking']), ';'); + fputcsv($csv, array('nom', 'promo', 'bounces', 'nbmails', 'url', 'corps', 'job', 'networking'), ';'); + $corpsList = DirEnum::getOptions(DirEnum::CURRENTCORPS); + foreach ($broken_user_list as $pid => $mails) { + $profile = $broken_user_profiles[$pid]; + $current_corps = $profile->getCorpsName(); + $jobs = $profile->getJobs(); + $companies = array(); + foreach ($jobs as $job) { + $companies[] = $job->company->name; + } + $networkings = $profile->getNetworking(Profile::NETWORKING_ALL); + $networking_list = array(); + foreach ($networkings as $networking) { + $networking_list[] = $networking['address']; } + fputcsv($csv, array($profile->fullName(), $profile->promo(), + join(',', $mails), $broken_user_email_count[$pid], + 'https://www.polytechnique.org/marketing/broken/' . $profile->hrid(), + $current_corps, implode(',', $companies), implode(',', $networking_list)), ';'); } fclose($csv); exit; @@ -888,5 +939,5 @@ class EmailModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?>