X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fmarketing.php;h=10c87910ce16cfd2c1642c7ec8addbdaba5b0058;hb=a0b453227e9433d2bd4dea1e07a7463800702839;hp=f6ac4fb100895b043e548c43c19304ba3a572fc6;hpb=ea74d2785d9c1ff5571ebf2f73c89cbf19c8dd07;p=platal.git diff --git a/modules/marketing.php b/modules/marketing.php index f6ac4fb..10c8791 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -1,6 +1,6 @@ changeTpl('marketing/index.tpl'); $page->setTitle('Marketing'); - - // Quelques statistiques - - $res = XDB::query( - "SELECT COUNT(*) AS vivants, - COUNT(NULLIF(perms='admin' OR perms='user', 0)) AS inscrits, - 100*COUNT(NULLIF(perms='admin' OR perms='user', 0))/COUNT(*) AS ins_rate, - COUNT(NULLIF(promo >= 1972, 0)) AS vivants72, - COUNT(NULLIF(promo >= 1972 AND (perms='admin' OR perms='user'), 0)) AS inscrits72, - 100 * COUNT(NULLIF(promo >= 1972 AND (perms='admin' OR perms='user'), 0)) / - COUNT(NULLIF(promo >= 1972, 0)) AS ins72_rate, - COUNT(NULLIF(FIND_IN_SET('femme', flags), 0)) AS vivantes, - COUNT(NULLIF(FIND_IN_SET('femme', flags) AND (perms='admin' OR perms='user'), 0)) AS inscrites, - 100 * COUNT(NULLIF(FIND_IN_SET('femme', flags) AND (perms='admin' OR perms='user'), 0)) / - COUNT(NULLIF(FIND_IN_SET('femme', flags), 0)) AS inse_rate - FROM auth_user_md5 - WHERE deces = 0"); - $stats = $res->fetchOneAssoc(); - $page->assign('stats', $stats); - - $res = XDB::query("SELECT count(*) FROM auth_user_md5 WHERE date_ins > ". - date('Ymd000000', strtotime('1 week ago'))); - $page->assign('nbInsSem', $res->fetchOneCell()); - - $res = XDB::query("SELECT count(*) FROM register_pending WHERE hash != 'INSCRIT'"); - $page->assign('nbInsEnCours', $res->fetchOneCell()); - - $res = XDB::query("SELECT count(*) FROM register_marketing"); - $page->assign('nbInsMarket', $res->fetchOneCell()); - - $res = XDB::query("SELECT count(*) FROM register_mstats - WHERE TO_DAYS(NOW()) - TO_DAYS(success) <= 7"); - $page->assign('nbInsMarkOK', $res->fetchOneCell()); + $page->trigWarning("Les statistiques sont momentanéement désactivées"); } function handler_private(&$page, $hruid = null, @@ -88,16 +56,15 @@ class MarketingModule extends PLModule } // Retrieves marketed user details. - $res = XDB::query( - "SELECT matricule - FROM auth_user_md5 - WHERE user_id = {?} AND perms = 'pending'", $user->id()); - if (!($matricule = $res->fetchOneCell())) { - $page->kill("Cet utilisateur est déjà inscrit au site."); + if ($user->state != 'pending') { + $page->kill('Cet utilisateur est déjà inscrit'); + } + if (!$user->hasProfile()) { + $page->kill('Cet utilisateur n\'est pas concerné par le marketing'); } + $matricule = $user->profile()->xorg_id; require_once('user.func.inc.php'); - $matricule = $res->fetchOneCell(); $matricule_X = get_X_mat($matricule); $page->assign('full_name', $user->fullName()); @@ -241,15 +208,11 @@ class MarketingModule extends PLModule } $page->assign('promo', $promo); - $sql = "SELECT u.user_id, u.nom, u.prenom, u.last_known_email, u.matricule_ax, - IF(MAX(m.last) > p.relance, MAX(m.last), p.relance) AS dern_rel, p.email - 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 u.promo = {?} AND u.deces = 0 AND u.perms='pending' - GROUP BY u.user_id - ORDER BY nom, prenom"; - $page->assign('nonins', XDB::iterator($sql, $promo)); + $uf = new UserFilter(new UFC_And(new UFC_Promo('=', UserFilter::DISPLAY, $promo), + new UFC_Not(new UFC_Registered())), + array(new UFO_Name(UserFilter::LASTNAME), new UFO_Name(UserFilter::FIRSTNAME))); + $users = $uf->getUsers(); + $page->assign('nonins', $users); } function handler_public(&$page, $hruid = null) @@ -258,16 +221,12 @@ class MarketingModule extends PLModule // Retrieves the user info, and checks the user is not yet registered. $user = User::getSilent($hruid); - if (!$user) { + if (!$user || !$user->hasProfile()) { return PL_NOT_FOUND; } - $res = XDB::query( - "SELECT COUNT(*) - FROM auth_user_md5 - WHERE user_id = {?} AND perms = 'pending'", $user->id()); - if (!$res->fetchOneCell()) { - $page->kill("Cet utilisateur est déjà inscrit au site."); + if ($user->state != 'pending') { + $page->kill('Cet utilisateur est déjà inscrit'); } // Displays the page, and handles the eventual user actions. @@ -301,14 +260,10 @@ class MarketingModule extends PLModule { $page->changeTpl('marketing/this_week.tpl'); - $sort = $sorting == 'per_promo' ? 'promo' : 'date_ins'; + $sort = $sorting == 'per_promo' ? new UFO_Promo() : new UFO_Registration(); - $sql = "SELECT a.alias AS forlife, u.date_ins, u.promo, u.nom, u.prenom - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie') - WHERE u.date_ins > ".date("Ymd000000", strtotime ('1 week ago'))." - ORDER BY u.$sort DESC"; - $page->assign('ins', XDB::iterator($sql)); + $uf = new UserFilter(new UFC_Registered(false, '>', strtotime('1 week ago')), $sort); + $page->assign('users', $uf->getUsers()); } function handler_volontaire(&$page, $promo = null) @@ -316,22 +271,21 @@ class MarketingModule extends PLModule $page->changeTpl('marketing/volontaire.tpl'); $res = XDB::query( - "SELECT - DISTINCT a.promo + 'SELECT DISTINCT pd.promo FROM register_marketing AS m - INNER JOIN auth_user_md5 AS a ON a.user_id = m.uid - ORDER BY a.promo"); + INNER JOIN account_profiles AS ap ON (m.uid = ap.uid AND FIND_IN_SET(\'owner\', ap.perms)) + INNER JOIN profile_display AS pd ON (pd.pid = ap.pid) + ORDER BY pd.promo'); $page->assign('promos', $res->fetchColumn()); if (!is_null($promo)) { - $sql = "SELECT a.nom, a.prenom, a.user_id, - m.email, sa.alias AS forlife - FROM register_marketing AS m - INNER JOIN auth_user_md5 AS a ON a.user_id = m.uid AND a.promo = {?} - INNER JOIN aliases AS sa ON (m.sender = sa.id AND sa.type='a_vie') - ORDER BY a.nom"; - $page->assign('addr', XDB::iterator($sql, $promo)); + $it = XDB::iterator('SELECT m.uid, m.email + FROM register_marketing AS m + INNER JOIN account_profiles AS ap ON (m.uid = ap.uid AND FIND_IN_SET(\'owner\', ap.perms)) + INNER JOIN profile_display AS pd ON (pd.pid = ap.pid) + WHERE pd.promo = {?}', $promo); + $page->assign('addr', $it); } } @@ -340,24 +294,22 @@ class MarketingModule extends PLModule $page->changeTpl('marketing/relance.tpl'); if (Post::has('relancer')) { - $res = XDB::query("SELECT COUNT(*) FROM auth_user_md5 WHERE deces=0"); - $nbdix = $res->fetchOneCell(); + $nbdix = Marketing::getAliveUsersCount(); $sent = Array(); - foreach (array_keys($_POST['relance']) as $uid) { - if ($tmp = Marketing::relance($uid, $nbdix)) { - $sent[] = $tmp.' a été relancé'; + $users = User::getBulkUsersWithUIDs($_POST['relance']); + foreach ($users as $user) { + if ($tmp = Marketing::relance($user, $nbdix)) { + $sent[] = $tmp . ' a été relancé.'; } } $page->assign('sent', $sent); } - $sql = "SELECT r.date, r.relance, r.uid, u.promo, u.nom, u.prenom - FROM register_pending AS r - INNER JOIN auth_user_md5 AS u ON r. uid = u.user_id - WHERE hash!='INSCRIT' - ORDER BY date DESC"; - $page->assign('relance', XDB::iterator($sql)); + $page->assign('relance', XDB::iterator('SELECT r.date, r.relance, r.uid + FROM register_pending AS r + WHERE hash != \'INSCRIT\' + ORDER BY date DESC')); } }