projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Converts Banana to the new forlife/hruid scheme.
[platal.git]
/
include
/
banana
/
ml.inc.php
diff --git
a/include/banana/ml.inc.php
b/include/banana/ml.inc.php
index
1a5413f
..
bf7be94
100644
(file)
--- a/
include/banana/ml.inc.php
+++ b/
include/banana/ml.inc.php
@@
-46,7
+46,7
@@
class MLBanana extends Banana
static public $listname;
static public $domain;
static public $listname;
static public $domain;
- function __construct(
$forlife
, $params = null)
+ function __construct(
User &$user
, $params = null)
{
global $globals;
Banana::$spool_root = $globals->banana->spool_root;
{
global $globals;
Banana::$spool_root = $globals->banana->spool_root;
@@
-75,9
+75,9
@@
class MLBanana extends Banana
global $platal, $globals;
$nom = S::v('prenom') . ' ' . S::v('nom');
global $platal, $globals;
$nom = S::v('prenom') . ' ' . S::v('nom');
- $mail =
S::v('bestalias') . '@' . $globals->mail->domain
;
+ $mail =
$user->bestEmail()
;
$sig = $nom . ' (' . S::v('promo') . ')';
$sig = $nom . ' (' . S::v('promo') . ')';
- Banana::$msgedit_headers['X-Org-Mail'] =
S::v('forlife') . '@' . $globals->mail->domain
;
+ Banana::$msgedit_headers['X-Org-Mail'] =
$user->forlifeEmail()
;
// Build user profile
Banana::$profile['headers']['From'] = "$nom <$mail>";
// Build user profile
Banana::$profile['headers']['From'] = "$nom <$mail>";