X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Femail.php;h=49c1cb7623feea533fcadc9791c9aaa859bc3dc3;hb=98d7a2d3ee35bbd3cf9891d4db60a6b262e8d798;hp=41e5d2518914a7f893010c121d3f8e4bfd322bee;hpb=e03a98e9e01313204a54ae0c0b45ab2ed0b08ee1;p=platal.git diff --git a/modules/email.php b/modules/email.php index 41e5d25..49c1cb7 100644 --- a/modules/email.php +++ b/modules/email.php @@ -198,6 +198,7 @@ class EmailModule extends PLModule $value, $user->profile()->id()); } $visibility = ($value == 'public'); + exit; } $page->assign('actuel', $alias); @@ -249,15 +250,18 @@ class EmailModule extends PLModule $actifs = Env::v('emails_actifs', Array()); print_r(Env::v('emails_rewrite')); if (Env::v('emailop') == "ajouter" && Env::has('email')) { + $error_email = false; $new_email = Env::v('email'); if ($new_email == "new@example.org") { $new_email = Env::v('email_new'); } $result = $redirect->add_email($new_email); if ($result == ERROR_INVALID_EMAIL) { + $error_email = true; $page->assign('email', $new_email); } $page->assign('retour', $result); + $page->assign('error_email', $error_email); } elseif (empty($actifs)) { $result = ERROR_INACTIVE_REDIRECTION; } elseif (is_array($actifs)) { @@ -271,7 +275,7 @@ class EmailModule extends PLModule . $user->forlifeEmail() . ' ne fonctionnerait plus.'); break; case ERROR_INVALID_EMAIL: - $page->trigError('Erreur: l\'email n\'est pas valide.'); + $page->trigError('Erreur : l\'email n\'est pas valide.'); break; case ERROR_LOOP_EMAIL: $page->trigError('Erreur : ' . $user->forlifeEmail()