Find corps field in profile educations when processing broken emails.

[platal.git] / modules / email.php

diff --git a/modules/email.php b/modules/email.php
index 6c5d96f..e7f1e28 100644 (file)
--- a/modules/email.php
+++ b/modules/email.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2011 Polytechnique.org                              *
+ *  Copyright (C) 2003-2013 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -152,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);
@@ -163,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.
@@ -660,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);
@@ -887,8 +891,7 @@ class EmailModule extends PLModule
                 $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] : '';
+                    $current_corps = $profile->getCorpsName();
                     $jobs = $profile->getJobs();
                     $companies = array();
                     foreach ($jobs as $job) {