X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Femail.php;h=764851576e5159f71ea3a80b2593242611e6098b;hb=cb6e7db980fcc5fcdd2dad5aa645cfdf98057cd4;hp=d70da2c90fed832d83a4b0dd870db6eb18322fb8;hpb=34b566f47d9c65a18a5bd8250133e30f88cb75f6;p=platal.git diff --git a/modules/email.php b/modules/email.php index d70da2c..7648515 100644 --- a/modules/email.php +++ b/modules/email.php @@ -67,34 +67,42 @@ class EmailModule extends PLModule WHERE uid = {?}", $user->id()); // 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); + XDB::execute("UPDATE email_source_account + SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias') + WHERE uid = {?} AND email = {?}", $user->id(), $email); + 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()); + $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); + $alias = XDB::fetchOneCell('SELECT COUNT(email) + FROM email_source_account + WHERE uid = {?} AND type = \'alias_aux\'', + $user->id()); $page->assign('alias', $alias); @@ -104,6 +112,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,22 +135,20 @@ 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); + WHERE s.uid = {?} AND s.type = \'alias_aux\'', + $user->id()); $visibility = $user->hasProfile() && ($user->profile(true)->alias_pub == 'public'); $page->assign('current', $alias); $page->assign('user', $user); @@ -164,11 +177,10 @@ class EmailModule extends PLModule 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 +296,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 +308,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 +321,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) @@ -596,12 +616,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()); @@ -640,11 +660,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); @@ -724,7 +741,7 @@ class EmailModule extends PLModule 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\') - INNER JOIN accounts AS a ON (w.uid = a.uid) + LEFT JOIN accounts AS a ON (w.uid = a.uid) WHERE w.email = {?} ORDER BY s.email', $email); @@ -811,25 +828,33 @@ 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_list = explode("\n", $list); sort($broken_list); foreach ($broken_list as $email) { if ($user = mark_broken_email($email, true)) { - if ($user['nb_mails'] > 0) { + if ($user['nb_mails'] > 0 && $user['notify']) { $mail = new PlMailer('emails/broken.mail.tpl'); - $mail->addTo('"' . $user['full_name'] . '" <' . $user['alias'] . '@' . Platal::globals()->mail->domain . '>'); + $dest = User::getSilentWithUID($user['uid']); + $mail->setTo($dest); $mail->assign('user', $user); $mail->assign('email', $email); $mail->send(); + } else { + $profile = Profile::get($user['alias']); + WatchProfileUpdate::register($profile, 'broken'); } - if (!isset($broken_user_list[$user['alias']])) { - $broken_user_list[$user['alias']] = array($email); + if (!isset($broken_user_list[$user['uid']])) { + $broken_user_list[$user['uid']] = array($email); } else { - $broken_user_list[$user['alias']][] = $email; + $broken_user_list[$user['uid']][] = $email; } + $broken_user_email_count[$user['uid']] = $user['nb_mails']; } } @@ -844,42 +869,29 @@ 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 $uid => $mails) { + $profile = Profile::get($uid); + $corps = $profile->getCorps(); + $current_corps = ($corps && $corps->current) ? $corpsList[$corps->current] : ''; + $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[$uid], + 'https://www.polytechnique.org/marketing/broken/' . $profile->hrid(), + $current_corps, implode(',', $companies), implode(',', $networking_list)), ';'); } fclose($csv); exit;