projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some fixes and updates.
[platal.git]
/
modules
/
marketing.php
diff --git
a/modules/marketing.php
b/modules/marketing.php
index
bb7bb0f
..
eb0778d
100644
(file)
--- a/
modules/marketing.php
+++ b/
modules/marketing.php
@@
-40,7
+40,7
@@
class MarketingModule extends PLModule
{
$page->changeTpl('marketing/index.tpl');
{
$page->changeTpl('marketing/index.tpl');
- $page->
assign('xorg_title','Polytechnique.org -
Marketing');
+ $page->
setTitle('
Marketing');
// Quelques statistiques
// Quelques statistiques
@@
-154,7
+154,7
@@
class MarketingModule extends PLModule
$res = XDB::iterator(
"SELECT r.*, a.alias
FROM register_marketing AS r
$res = XDB::iterator(
"SELECT r.*, a.alias
FROM register_marketing AS r
-
INNER
JOIN aliases AS a ON (r.sender=a.id AND a.type = 'a_vie')
+
LEFT
JOIN aliases AS a ON (r.sender=a.id AND a.type = 'a_vie')
WHERE uid={?}
ORDER BY date", $uid);
$page->assign('addr', $res);
WHERE uid={?}
ORDER BY date", $uid);
$page->assign('addr', $res);
@@
-198,8
+198,8
@@
class MarketingModule extends PLModule
$page->assign('user', $user);
$email = null;
$page->assign('user', $user);
$email = null;
+ require_once 'emails.inc.php';
if (Post::has('mail')) {
if (Post::has('mail')) {
- require_once 'emails.inc.php';
$email = valide_email(Post::v('mail'));
}
if (Post::has('valide') && isvalid_email_redirection($email)) {
$email = valide_email(Post::v('mail'));
}
if (Post::has('valide') && isvalid_email_redirection($email)) {
@@
-267,11
+267,10
@@
class MarketingModule extends PLModule
$page->assign('promo', $promo);
if (Post::has('valide')) {
$page->assign('promo', $promo);
if (Post::has('valide')) {
- S::assert_xstf_token();
-
- require_once('xorg.misc.inc.php');
+ S::assert_xsrf_token();
$email = trim(Post::v('mail'));
$email = trim(Post::v('mail'));
+ require_once 'emails.inc.php';
if (!isvalid_email_redirection($email)) {
$page->trigError("Email invalide !");
} else {
if (!isvalid_email_redirection($email)) {
$page->trigError("Email invalide !");
} else {