X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Femail.php;h=6f855042bd51c3add04e7e69c4feaa30edef83a8;hb=f56ceafecc0deae130734dfc0243804f02f46586;hp=5fd93e91a2519c92c1ec4d5d21c27a59f8f49b51;hpb=7c4ae1c3d38d458ac3b6dea25ca76ebdd2c0ecd8;p=platal.git

diff --git a/modules/email.php b/modules/email.php
index 5fd93e9..6f85504 100644
--- a/modules/email.php
+++ b/modules/email.php
@@ -24,14 +24,14 @@ class EmailModule extends PLModule
     function handlers()
     {
         return array(
-            'emails'                  => $this->make_hook('emails',      AUTH_COOKIE),
-            'emails/alias'            => $this->make_hook('alias',       AUTH_MDP),
-            'emails/antispam'         => $this->make_hook('antispam',    AUTH_MDP),
+            'emails'                  => $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),
-            'emails/send'             => $this->make_hook('send',        AUTH_MDP),
+            '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/test'             => $this->make_hook('test',        AUTH_COOKIE, 'user', NO_AUTH),
+            'emails/test'             => $this->make_hook('test',        AUTH_COOKIE, 'mail', NO_AUTH),
 
             'emails/rewrite/in'       => $this->make_hook('rewrite_in',  AUTH_PUBLIC),
             'emails/rewrite/out'      => $this->make_hook('rewrite_out', AUTH_PUBLIC),
@@ -106,8 +106,6 @@ class EmailModule extends PLModule
 
     function handler_alias(&$page, $action = null, $value = null)
     {
-        require_once 'validations.inc.php';
-
         global $globals;
 
         $page->changeTpl('emails/alias.tpl');
@@ -171,9 +169,9 @@ class EmailModule extends PLModule
                 }
 
                 //vérifier que l'alias n'est pas déja en demande
-                $it = new ValidateIterator();
+                $it = Validate::iterate('alias');
                 while($req = $it->next()) {
-                    if ($req->type == 'alias' and $req->alias == $alias_mail) {
+                    if ($req->alias == $alias_mail) {
                         $page->trigError("L'alias $alias_mail a déja été demandé.
                                     Tu ne peux donc pas l'obtenir pour l'instant.");
                         return ;
@@ -194,7 +192,7 @@ class EmailModule extends PLModule
             if ($user->hasProfile()) {
                 XDB::execute("UPDATE  profiles
                                  SET  alias_pub = {?}
-                               WHERE  pid = {?}", 
+                               WHERE  pid = {?}",
                             $value, $user->profile()->id());
             }
             $visibility = ($value == 'public');
@@ -619,13 +617,13 @@ class EmailModule extends PLModule
             $storage = new EmailStorage(S::user(), 'imap');
             $storage->activate();
             $page->assign('ok', true);
-            $page->assign('prenom', S::v('prenom'));
-            $page->assign('sexe', S::v('femme'));
+            $page->assign('yourself', S::user()->displayName());
+            $page->assign('sexe', S::user()->isFemale());
         } else if (!S::logged() && $user) {
             $storage = new EmailStorage($user, 'imap');
             $storage->activate();
             $page->assign('ok', true);
-            $page->assign('prenom', $user->displayName());
+            $page->assign('yourself', $user->displayName());
             $page->assign('sexe', $user->isFemale());
         }
     }