X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Femail.php;h=e7f1e28d6566a5cfef58ed1777aa9fb22364788d;hb=bc0276a2d79d88a56656514fe24bd427c0ef3b88;hp=1496b04d247d42ccc73d3990308a9287b49384e2;hpb=52da49d8d4fdaa614f51b5e86815d79f8619126f;p=platal.git diff --git a/modules/email.php b/modules/email.php index 1496b04..e7f1e28 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'), ); } @@ -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 @@ -148,7 +152,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 +163,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 +312,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 +464,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 +499,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 +628,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 +661,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 +756,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); @@ -872,10 +888,10 @@ class EmailModule extends PLModule $csv = fopen('php://output', 'w'); 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) ? $corps->current : ''; + $current_corps = $profile->getCorpsName(); $jobs = $profile->getJobs(); $companies = array(); foreach ($jobs as $job) {