projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implements the first API handler (/api/1/user/<user>/isRegistered). It
[platal.git]
/
include
/
validations
/
marketing.inc.php
diff --git
a/include/validations/marketing.inc.php
b/include/validations/marketing.inc.php
index
a81d0a2
..
c0d2707
100644
(file)
--- a/
include/validations/marketing.inc.php
+++ b/
include/validations/marketing.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-20
08
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 *
@@
-31,6
+31,7
@@
class MarkReq extends Validate
public $m_relance;
public $m_type;
public $m_data;
public $m_relance;
public $m_type;
public $m_data;
+ public $m_personal_notes;
public $rules = "Accepter si l'adresse email parait correcte, et pas absurde (ou si le marketeur est de confiance). Si le
demandeur marque sa propre adresse email, refuser dans tous les cas.
public $rules = "Accepter si l'adresse email parait correcte, et pas absurde (ou si le marketeur est de confiance). Si le
demandeur marque sa propre adresse email, refuser dans tous les cas.
@@
-39,7
+40,7
@@
class MarkReq extends Validate
// }}}
// {{{ constructor
// }}}
// {{{ constructor
- public function __construct(User &$sender, User &$mark, $email, $perso, $type, $data)
+ public function __construct(User &$sender, User &$mark, $email, $perso, $type, $data
, $personal_notes
)
{
parent::__construct($sender, false, 'marketing');
$this->m_user = &$mark;
{
parent::__construct($sender, false, 'marketing');
$this->m_user = &$mark;
@@
-47,6
+48,7
@@
class MarkReq extends Validate
$this->perso = $perso;
$this->m_type = $type;
$this->m_data = $data;
$this->perso = $perso;
$this->m_type = $type;
$this->m_data = $data;
+ $this->m_personal_notes = $personal_notes;
}
// }}}
}
// }}}
@@
-55,10
+57,10
@@
class MarkReq extends Validate
public function formu()
{
$res = XDB::query('SELECT IF(MAX(m.last)>p.relance, MAX(m.last), p.relance)
public function formu()
{
$res = XDB::query('SELECT IF(MAX(m.last)>p.relance, MAX(m.last), p.relance)
- FROM a
uth_user_md5 AS u
- LEFT JOIN register_pending AS p ON p.uid =
u.user_
id
- LEFT JOIN register_marketing AS m ON m.uid =
u.user_
id
- WHERE
user_
id = {?}',
+ FROM a
ccounts AS a
+ LEFT JOIN register_pending AS p ON p.uid =
a.u
id
+ LEFT JOIN register_marketing AS m ON m.uid =
a.u
id
+ WHERE
a.u
id = {?}',
$this->m_user->id());
$this->m_relance = $res->fetchOneCell();
return 'include/form.valid.mark.tpl';
$this->m_user->id());
$this->m_relance = $res->fetchOneCell();
return 'include/form.valid.mark.tpl';