Merge branch 'platal-0.9.17'

Conflicts:

	include/banana/forum.inc.php
	include/common.inc.php
	modules/core.php
	modules/marketing.php
	plugins/modifier.miniwiki.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc classes/xnetpage.php
Simple merge

diff --cc include/banana/forum.inc.php
index 6cd9f77,3e14a78..53d01c6
--- 1/include/banana/forum.inc.php
--- 2/include/banana/forum.inc.php
+++ b/include/banana/forum.inc.php
@@@ -174,13 -179,18 +179,19 @@@ class ForumsBanana extends Banan
  
      protected function action_updateProfile()
      {
 -        global $page, $globals;
 +        global $globals;
 +        $page = Platal::page();
  
-         if (Post::has('action') && Post::has('banananame') && Post::has('bananasig')
-                 && Post::has('bananadisplay') && Post::has('bananamail')
-                 && Post::has('bananaupdate') && Post::v('action')=="Enregistrer" ) {
-             $flags = new PlFlagSet();
+         $colors = glob(dirname(__FILE__) . '/../../htdocs/images/banana/m2*.gif');
+         foreach ($colors as $key=>$path) {
+             $path = basename($path, '.gif');
+             $colors[$key] = substr($path, 2);
+         }
+         $page->assign('colors', $colors);
+ 
+         if (Post::has('action') && Post::v('action') == 'Enregistrer') {
+             S::assert_xsrf_token();
+             $flags = new FlagSet();
              if (Post::b('bananadisplay')) {
                  $flags->addFlag('threads');
              }

diff --cc include/banana/moderate.inc.php
Simple merge

diff --cc include/common.inc.php
Simple merge

diff --cc include/vcard.inc.php
Simple merge

diff --cc modules/events.php
Simple merge

diff --cc modules/lists.php
Simple merge

diff --cc modules/marketing.php
index 74ee081,6296a6c..fbc9b07
--- 1/modules/marketing.php
--- 2/modules/marketing.php
+++ b/modules/marketing.php
@@@ -261,6 -267,9 +267,7 @@@ class MarketingModule extends PLModul
              $page->assign('promo', $promo);
  
              if (Post::has('valide')) {
 -
 -                require_once('xorg.misc.inc.php');
+                 S::assert_xstf_token();
                  $email = trim(Post::v('mail'));
  
                  if (!isvalid_email_redirection($email)) {

diff --cc modules/xnetevents.php
Simple merge

diff --cc templates/xnet/skin.tpl
Simple merge