Merge branch 'platal-0.9.17' into hruid

Conflicts:
	include/banana/forum.inc.php
	modules/forums.php
	modules/marketing.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>

diff --cc include/banana/forum.inc.php
index 2f233af,89fa0c9..96e9a58
--- 1/include/banana/forum.inc.php
--- 2/include/banana/forum.inc.php
+++ b/include/banana/forum.inc.php
@@@ -214,8 -193,34 +191,34 @@@ class ForumsBanana extends Banan
                                  VALUES  ({?}, {?}, {?}, {?}, {?})",
                           S::v('uid'), Post::v('bananasig'),
                           Post::v('bananamail'), Post::v('banananame'),
-                          implode(',', $flags));
+                          $flags)) {
+                 $page->trigSuccess("Ton profil a été enregistré avec succès.");
+             } else {
+                 $page->trigError("Une erreur s'est produite lors de l'enregistrement de ton profil");
+             }
+         }
+ 
+         $req = XDB::query("
+             SELECT  nom, mail, sig,
+                     FIND_IN_SET('threads', flags),
+                     FIND_IN_SET('automaj', flags),
+                     FIND_IN_SET('xface', flags)
+               FROM  forums.profils
+              WHERE  uid = {?}", S::v('uid'));
+         if (!(list($nom, $mail, $sig, $disp, $maj, $xface) = $req->fetchOneRow())) {
+             $nom   = S::v('prenom').' '.S::v('nom');
 -            $mail  = S::v('forlife').'@'.$globals->mail->domain;
++            $mail  = S::user()->forlifeEmail();
+             $sig   = $nom.' ('.S::v('promo').')';
+             $disp  = 0;
+             $maj   = 0;
+             $xface = 0;
          }
+         $page->assign('nom' ,  $nom);
+         $page->assign('mail',  $mail);
+         $page->assign('sig',   $sig);
+         $page->assign('disp',  $disp);
+         $page->assign('maj',   $maj);
+         $page->assign('xface', $xface);
          return null;
      }
  }

diff --cc modules/forums.php
Simple merge

diff --cc modules/profile.php
Simple merge

diff --cc modules/xnetgrp.php
Simple merge