projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refetches session's user when she updates her bestalias.
[platal.git]
/
include
/
marketing.inc.php
diff --git
a/include/marketing.inc.php
b/include/marketing.inc.php
index
9943499
..
e91b730
100644
(file)
--- a/
include/marketing.inc.php
+++ b/
include/marketing.inc.php
@@
-67,8
+67,8
@@
class Marketing
'sexe' => $user->isFemale(),
'mail' => $email,
'to' => '"' . $user->fullName() . '" <' . $email . '>',
'sexe' => $user->isFemale(),
'mail' => $email,
'to' => '"' . $user->fullName() . '" <' . $email . '>',
- 'forlife_email' => $user->
login() . '@' . $globals->mail->domain
,
- 'forlife_email2' => $user->
login() . '@' . $globals->mail->domain2,
+ 'forlife_email' => $user->
forlifeEmail()
,
+ 'forlife_email2' => $user->
forlifeEmailAlternate()
);
}
);
}
@@
-186,7
+186,7
@@
class Marketing
}
}
}
}
- static public function relance(PlUser
&
$user, $nbx = -1)
+ static public function relance(PlUser $user, $nbx = -1)
{
global $globals;
{
global $globals;
@@
-217,7
+217,7
@@
class Marketing
$mymail->assign('baseurl', $globals->baseurl);
$mymail->assign('lins_id', $hash);
$mymail->assign('lemail', $email);
$mymail->assign('baseurl', $globals->baseurl);
$mymail->assign('lins_id', $hash);
$mymail->assign('lemail', $email);
- $mymail->assign('subj',
$alias.'@'.$globals->mail->domain
);
+ $mymail->assign('subj',
ucfirst($globals->mail->domain) . ' : ' . $alias
);
$mymail->send();
XDB::execute('UPDATE register_pending
SET hash={?}, password={?}, relance=NOW()
$mymail->send();
XDB::execute('UPDATE register_pending
SET hash={?}, password={?}, relance=NOW()
@@
-282,7
+282,7
@@
class AnnuaireMarketing implements MarketingEngine
return $this->personal_notes;
}
return $this->personal_notes;
}
- protected function prepareText(PlPage
&
$page, array $user)
+ protected function prepareText(PlPage $page, array $user)
{
$page->assign('intro', $this->getIntro());
$page->assign('u', $user);
{
$page->assign('intro', $this->getIntro());
$page->assign('u', $user);