From 6e112b58d746616a4b9e2a7ba727a3a228eaece8 Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Sun, 3 Dec 2006 21:26:28 +0000 Subject: [PATCH] Make [1202] useful git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1233 839d8a87-29fc-0310-9880-83ba4fa771e5 --- ChangeLog | 3 +++ include/validations/marketing.inc.php | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index be6e97f..c311bc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ VERSION 0.9.13 ?? ?? 2007 New: + * Admin: + - Show last contact date on marketing validation -Fal/FRU + * Core: - New mailer -FRU diff --git a/include/validations/marketing.inc.php b/include/validations/marketing.inc.php index 91b61b2..9a3d926 100644 --- a/include/validations/marketing.inc.php +++ b/include/validations/marketing.inc.php @@ -47,20 +47,28 @@ class MarkReq extends Validate $this->perso = $perso; $res = XDB::query('SELECT u.nom, u.prenom, u.promo, - IF(MAX(m.last)>p.relance, MAX(m.last), p.relance) FROM auth_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 = {?} GROUP BY u.user_id', $mark_id); - list ($this->m_nom, $this->m_prenom, $this->m_promo, $this->m_relance) = $res->fetchOneRow(); + list ($this->m_nom, $this->m_prenom, $this->m_promo) = $res->fetchOneRow(); } // }}} // {{{ function formu() function formu() - { return 'include/form.valid.mark.tpl'; } + { + $res = XDB::query('SELECT IF(MAX(m.last)>p.relance, MAX(m.last), p.relance) + FROM auth_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 = {?}', + $this->m_id); + $this->m_relance = $res->fetchOneCell(); + return 'include/form.valid.mark.tpl'; + } // }}} // {{{ function _mail_subj -- 2.1.4