Merge commit 'origin/fusionax' into account

Conflicts:

	include/notifs.inc.php
	modules/axletter.php
	modules/newsletter.php

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

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

diff --cc include/notifs.inc.php
index b1cf91d,bae71b0..8f28f82
--- 1/include/notifs.inc.php
--- 2/include/notifs.inc.php
+++ b/include/notifs.inc.php
@@@ -456,8 -448,8 +456,8 @@@ class NoninsNotif
  
      public function add($p)
      {
-         XDB::execute('INSERT INTO  watch_nonins (uid,ni_id) VALUES({?},{?})', $this->_uid, $p);
+         XDB::execute('INSERT IGNORE INTO  watch_nonins (uid,ni_id) VALUES({?},{?})', $this->_uid, $p);
 -        $res = XDB::query('SELECT  prenom,IF(nom_usage="",nom,nom_usage) AS nom,promo,user_id
 +        $res = XDB::query('SELECT  prenom, IF(nom_usage="",nom,nom_usage) AS nom,promo,user_id
                               FROM  auth_user_md5
                              WHERE  user_id={?}', $p);
          $this->_data["$p"] = $res->fetchOneAssoc();

diff --cc include/user.func.inc.php
Simple merge

diff --cc modules/axletter.php
index ed601e2,805f238..5bc7643
--- 1/modules/axletter.php
--- 2/modules/axletter.php
+++ b/modules/axletter.php
@@@ -268,15 -268,20 +268,19 @@@ class AXLetterModule extends PLModul
          $this->load('axletter.inc.php');
          $page->changeTpl('axletter/show.tpl');
  
-         $nl  = new AXLetter($nid);
-         $user =& S::user();
-         if (Get::has('text')) {
-             $nl->toText($page, $user);
-         } else {
-             $nl->toHtml($page, $user);
-         }
-         if (Post::has('send')) {
-             $nl->sendTo($user);
+         try {
+             $nl = new AXLetter($nid);
++            $user =& S::user();
+             if (Get::has('text')) {
 -                $nl->toText($page, S::v('prenom'), S::v('nom'), S::v('femme'));
++                $nl->toText($page, $user);
+             } else {
 -                $nl->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme'));
++                $nl->toHtml($page, $user);
+             }
+             if (Post::has('send')) {
 -                $nl->sendTo(S::user()->login(), S::user()->bestEmail(),
 -                            S::v('prenom'), S::v('nom'),
 -                            S::v('femme'), S::v('mail_fmt') != 'texte');
++                $nl->sendTo($user);
+             }
+         } catch (MailNotFound $e) {
+             return PL_NOT_FOUND;
          }
      }
  

diff --cc modules/newsletter.php
index a9b0bb7,62dd684..3d8b610
--- 1/modules/newsletter.php
--- 2/modules/newsletter.php
+++ b/modules/newsletter.php
@@@ -56,15 -56,25 +56,19 @@@ class NewsletterModule extends PLModul
  
          require_once 'newsletter.inc.php';
  
-         $nl  = new NewsLetter($nid);
-         $user =& S::user();
-         if (Get::has('text')) {
-             $nl->toText($page, $user);
-         } else {
-             $nl->toHtml($page, $user);
-         }
-         if (Post::has('send')) {
-             $nl->sendTo($user);
+         try {
+             $nl = new NewsLetter($nid);
++            $user =& S::user();
+             if (Get::has('text')) {
 -                $nl->toText($page, S::v('prenom'), S::v('nom'), S::v('femme'));
++                $nl->toText($page, $user);
+             } else {
 -                $nl->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme'));
++                $nl->toHtml($page, $user);
+             }
+             if (Post::has('send')) {
 -                $res = XDB::query("SELECT  hash
 -                                     FROM  newsletter_ins
 -                                    WHERE  user_id = {?}",
 -                                  S::i('uid'));
 -                $nl->sendTo(S::user()->login(), S::user()->bestEmail(),
 -                            S::v('prenom'), S::v('nom'),
 -                            S::v('femme'), S::v('mail_fmt') != 'texte',
 -                            $res->fetchOneCell());
++                $nl->sendTo($user);
+             }
+         } catch (MailNotFound $e) {
+             return PL_NOT_FOUND;
          }
      }
  

diff --cc modules/platal.php
Simple merge

diff --cc modules/register.php
Simple merge

diff --cc modules/xnetgrp.php
Simple merge

diff --cc modules/xnetlists.php
Simple merge