Merge commit 'origin/master' into fusionax

diff --cc modules/email.php
index 4a4741e,43e4c19..09cfe6e
--- 1/modules/email.php
--- 2/modules/email.php
+++ b/modules/email.php
@@@ -242,20 -241,11 +241,19 @@@ class EmailModule extends PLModul
              $actifs = Env::v('emails_actifs', Array());
              print_r(Env::v('emails_rewrite'));
              if (Env::v('emailop') == "ajouter" && Env::has('email')) {
 -                $retour = $redirect->add_email(Env::v('email'));
 +                $new_email = Env::v('email');
 +                if ($new_email == "new@example.org") {
 +                    $new_email = Env::v('email_new');
 +                }
 +                $retour = $redirect->add_email($new_email);
 +                if ($retour == ERROR_INVALID_EMAIL) {
 +                    $page->assign('email', $new_email);
 +                }
 +                $page->assign('retour', $retour);
              } elseif (empty($actifs)) {
-                 $page->assign('retour', ERROR_INACTIVE_REDIRECTION);
+                 $retour = ERROR_INACTIVE_REDIRECTION;
              } elseif (is_array($actifs)) {
-                 $page->assign('retour', $redirect->modify_email($actifs,
-                     Env::v('emails_rewrite',Array())));
+                 $retour = $redirect->modify_email($actifs, Env::v('emails_rewrite', Array()));
              }
          }
  

diff --cc modules/profile.php
Simple merge

diff --cc templates/emails/redirect.tpl
Simple merge

diff --cc templates/events/index.tpl
Simple merge