projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implements export() and fromExport() on UFOs.
[platal.git]
/
modules
/
xnetgrp
/
mail.inc.php
diff --git
a/modules/xnetgrp/mail.inc.php
b/modules/xnetgrp/mail.inc.php
index
090b5b5
..
eadeb16
100644
(file)
--- a/
modules/xnetgrp/mail.inc.php
+++ b/
modules/xnetgrp/mail.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-20
09
Polytechnique.org *
+ * Copyright (C) 2003-20
10
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-56,18
+56,18
@@
function get_all_redirects($membres, $mls, &$client)
function _send_xnet_mail($user, $body, $wiki, $mailer, $replyto = null)
{
if ($user instanceof PlUser) {
function _send_xnet_mail($user, $body, $wiki, $mailer, $replyto = null)
{
if ($user instanceof PlUser) {
- $
cher
= $user->isFemale() ? 'Chère' : 'Cher';
- $
nom = $user->display
Name();
- $
pnom = ''
;
+ $
dear
= $user->isFemale() ? 'Chère' : 'Cher';
+ $
lastname = $user->last
Name();
+ $
firstname = $user->firstName()
;
} else {
} else {
- $
cher
= 'Cher(e)';
- $
nom = $user
;
- $
pnom = ''
;
+ $
dear
= 'Cher(e)';
+ $
lastname = ''
;
+ $
firstname = $user
;
}
$text = str_ireplace(array('<cher>', '<nom>', '<prenom>'),
}
$text = str_ireplace(array('<cher>', '<nom>', '<prenom>'),
- array($
cher, $nom, $pnom
), $body);
- $mailer->
add
To($user);
+ array($
dear, $lastname, $firstname
), $body);
+ $mailer->
set
To($user);
if ($replyto) {
$mailer->addHeader('Reply-To', $replyto);
}
if ($replyto) {
$mailer->addHeader('Reply-To', $replyto);
}
@@
-100,11
+100,11
@@
function send_xnet_mails($from, $sujet, $body, $wiki, $tos, $replyto = null, $up
} else {
$email = $user;
}
} else {
$email = $user;
}
- if ($sent[$email]) {
- continue;
+
+ if (!isset($sent[$email])) {
+ _send_xnet_mail($user, $body, $wiki, $mailer, $replyto);
+ $sent[$email] = true;
}
}
- _send_xnet_mail($user, $body, $wiki, $mailer, $replyto);
- $sent[$email] = true;
}
}
}
}