X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Femail.php;h=360c4623a34186fada001f4f948dec7393e1dd75;hb=96b778a679b261235ede8c5c4e7356680f4e5895;hp=1496b04d247d42ccc73d3990308a9287b49384e2;hpb=52da49d8d4fdaa614f51b5e86815d79f8619126f;p=platal.git diff --git a/modules/email.php b/modules/email.php index 1496b04..360c462 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,edit_directory'), ); } @@ -67,14 +67,18 @@ 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 + XDB::execute("UPDATE email_source_account AS s + 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 uid = {?} AND email = {?}", $user->id(), $email); + 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 = {?}', - $domain, $user->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 @@ -94,9 +98,23 @@ class EmailModule extends PLModule 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", + ORDER BY !alias, s.email, d.name", $user->id()); - $page->assign('aliases', $aliases); + $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 @@ -148,7 +166,7 @@ class EmailModule extends PLModule INNER JOIN email_virtual_domains AS d ON (s.domain = d.id) WHERE s.uid = {?} AND s.type = \'alias_aux\'', $user->id()); - $visibility = $user->hasProfile() && ($user->profile(true)->alias_pub == 'public'); + $visibility = $user->hasProfile() && $user->profile()->isVisible($user->profile()->alias_pub); $page->assign('current', $alias); $page->assign('user', $user); $page->assign('mail_public', $visibility); @@ -159,20 +177,21 @@ 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. @@ -307,7 +326,7 @@ 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, $redirection = null) @@ -459,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); @@ -494,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) @@ -615,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()); @@ -648,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); @@ -740,7 +770,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); @@ -775,7 +805,8 @@ class EmailModule extends PLModule 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) - WHERE a.state = \'active\' AND er.redirect IS NULL AND FIND_IN_SET(\'mail\', at.perms) + 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')); } @@ -831,30 +862,40 @@ class EmailModule extends PLModule $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 && $user['notify']) { - $mail = new PlMailer('emails/broken.mail.tpl'); - $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'); - } + $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['uid']])) { - $broken_user_list[$user['uid']] = array($email); - } else { - $broken_user_list[$user['uid']][] = $email; - } - $broken_user_email_count[$user['uid']] = $user['nb_mails']; + $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 @@ -872,10 +913,10 @@ class EmailModule extends PLModule $csv = fopen('php://output', 'w'); fputcsv($csv, array('nom', 'promo', 'bounces', 'nbmails', 'url', 'corps', 'job', 'networking'), ';'); - foreach ($broken_user_list as $uid => $mails) { - $profile = Profile::get($uid); - $corps = $profile->getCorps(); - $current_corps = ($corps && $corps->current) ? $corps->current : ''; + $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) { @@ -887,7 +928,7 @@ class EmailModule extends PLModule $networking_list[] = $networking['address']; } fputcsv($csv, array($profile->fullName(), $profile->promo(), - join(',', $mails), $broken_user_email_count[$uid], + join(',', $mails), $broken_user_email_count[$pid], 'https://www.polytechnique.org/marketing/broken/' . $profile->hrid(), $current_corps, implode(',', $companies), implode(',', $networking_list)), ';'); } @@ -898,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: ?>