X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp%2Fmail.inc.php;h=a998e99ae6324688e46a246c1ac6c5ce10f863d1;hb=5350d75199c4f10940ce8954c1bb302f8a49ead9;hp=6040e30898b817e2e6e61d7ec96d92d0074245ed;hpb=5fe7ec44fb7cf5fb9b88101707dd2aa3f34a0db3;p=platal.git

diff --git a/modules/xnetgrp/mail.inc.php b/modules/xnetgrp/mail.inc.php
index 6040e30..a998e99 100644
--- a/modules/xnetgrp/mail.inc.php
+++ b/modules/xnetgrp/mail.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,12 +21,12 @@
 
 // {{{ get_all_redirects
 
-function get_all_redirects($membres, $exclude, $mls, &$client)
+function get_all_redirects($membres, $mls, &$client)
 {
     global $globals;
-    
+
     $tos = array();
-    
+
     if (!empty($membres)) {
         $membres = array_map(create_function('$str', 'return "\"$str\"";'), $membres);
         $membres = join(',', $membres);
@@ -76,13 +76,13 @@ function get_all_redirects($membres, $exclude, $mls, &$client)
 // }}}
 // {{{ _send_xnet_mail
 
-function _send_xnet_mail($user, $body, $mailer, $replyto = null)
+function _send_xnet_mail($user, $body, $wiki, $mailer, $replyto = null)
 {
-    $cher = isset($user['sexe']) ? ($user['sexe'] ? 'Chère' : 'Cher') : 'Cher(e)';
+    $cher = isset($user['sexe']) ? ($user['sexe'] ? 'Chère' : 'Cher') : 'Cher(e)';
     $nom  = isset($user['nom']) ? $user['nom'] : "";
-    $pnom = isset($user['prenom']) ? $user['prenom'] : preg_replace('!@.*!', '', $user['email']);
+    $pnom = isset($user['prenom']) ? $user['prenom'] : preg_replace('!@.*!u', '', $user['email']);
     $to   = isset($user['prenom']) ? "\"{$user['prenom']} {$user['nom']}\" <{$user['email']}>" : $user['email'];
-    
+
     $text = $body;
     $text = preg_replace('!<cher>!i',   $cher, $text);
     $text = preg_replace('!<nom>!i',    $nom,  $text);
@@ -92,14 +92,18 @@ function _send_xnet_mail($user, $body, $mailer, $replyto = null)
     if ($replyto) {
         $mailer->addHeader('Reply-To', $replyto);
     }
-    $mailer->setTxtBody(wordwrap($text, 72));
+    if ($wiki) {
+        $mailer->setWikiBody($text);
+    } else {
+        $mailer->setTxtBody(wordwrap($text, 72));
+    }
     $mailer->send();
 }
 
 // }}}
 // {{{ send_xnet_mails
 
-function send_xnet_mails($from, $sujet, $body, $tos, $replyto = null, $attach = null)
+function send_xnet_mails($from, $sujet, $body, $wiki, $tos, $replyto = null, $upload = null, $name = null)
 {
     global $globals;
     $sent = array();
@@ -107,20 +111,18 @@ function send_xnet_mails($from, $sujet, $body, $tos, $replyto = null, $attach =
     $mailer = new PlMailer();
     $mailer->setSubject($sujet);
     $mailer->setFrom($from);
-    if (is_uploaded_file($attach['tmp_name'])) {
-        $mailer->addAttachment($attach['tmp_name'],
-                               $attach['type'],
-                               $attach['name']);
+    if ($upload && $upload->exists()) {
+        $mailer->addUploadAttachment($upload, $name);
     }
 
     foreach ($tos as $user) {
         if ($sent[$user['email']]) continue;
-        _send_xnet_mail($user, $body, $mailer, $replyto);
+        _send_xnet_mail($user, $body, $wiki, $mailer, $replyto);
         $sent[$user['email']] = true;
     }
 }
 
 // }}}
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>