X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fmarketing.php;h=300d6f769534beb32f9c0ec0321e3e23af8d9c28;hb=ee8af1cb2eeff43b9f1760c9ffe2ab3c787b2a4e;hp=d382124de466bfe60c0bdbe4251e5ef422993e7a;hpb=72318f059ac4c83d1c1484484a142b19e6f79982;p=platal.git diff --git a/modules/marketing.php b/modules/marketing.php index d382124..300d6f7 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -1,6 +1,6 @@ changeTpl('marketing/index.tpl'); - $page->setTitle('Marketing'); - $page->trigWarning("Les statistiques sont momentanéement désactivées"); + + $alive = new UserFilter(new PFC_Not(new UFC_Dead())); + $registered = new UserFilter(new PFC_And(new UFC_Registered(), new PFC_Not(new UFC_Dead()))); + $alive72 = new UserFilter(new PFC_And(new UFC_Promo('>=', UserFilter::GRADE_ING, 1972), new PFC_Not(new UFC_Dead()))); + $registered72 = new UserFilter(new PFC_And(new UFC_Registered(), new UFC_Promo('>=', UserFilter::GRADE_ING, 1972), new PFC_Not(new UFC_Dead()))); + $aliveWomen = new UserFilter(new PFC_And(new UFC_Sex(User::GENDER_FEMALE) , new PFC_Not(new UFC_Dead()))); + $registeredWomen = new UserFilter(new PFC_And(new UFC_Registered(), new UFC_Sex(User::GENDER_FEMALE), new PFC_Not(new UFC_Dead()))); + $statistics = array( + 'alive' => $alive->getTotalCount(), + 'registered' => $registered->getTotalCount(), + 'alive72' => $alive72->getTotalCount(), + 'registered72' => $registered72->getTotalCount(), + 'womenAlive' => $aliveWomen->getTotalCount(), + 'womenRegistered' => $registeredWomen->getTotalCount(), + ); + $statistics['registeredRate'] = $statistics['registered'] / $statistics['alive'] * 100; + $statistics['registeredRate72'] = $statistics['registered72'] / $statistics['alive72'] * 100; + $statistics['womenRegisteredRate'] = $statistics['womenRegistered'] / $statistics['womenAlive'] * 100; + + $registeredWeek = new UserFilter(new PFC_And(new UFC_Registered(false, '>=', strtotime('1 week ago')), new PFC_Not(new UFC_Dead()))); + $registrationPending = XDB::fetchOneCell('SELECT COUNT(*) + FROM register_pending'); + $registrations = array( + 'week' => $registeredWeek->getTotalCount(), + 'pending' => $registrationPending, + ); + + $ok = XDB::fetchOneCell('SELECT COUNT(*) + FROM register_mstats + WHERE success != \'0000-00-00\''); + $okWeek = XDB::fetchOneCell('SELECT COUNT(*) + FROM register_mstats + WHERE success >= {?}', strtotime('1 week ago')); + $res = XDB::fetchAllAssoc('SELECT type, COUNT(*) as count + FROM register_marketing + GROUP BY type'); + $no = array(); + foreach ($res as $value) { + $no[$value['type']] = $value['count']; + } + $no['week'] = XDB::fetchOneCell('SELECT COUNT(*) + FROM register_marketing + WHERE last >= {?}', strtotime('1 week ago')); + $marketings = array( + 'ok' => $ok, + 'okWeek' => $okWeek, + 'noPerso' => (isset($no['user']) ? $no['user'] : 0), + 'noXorg' => (isset($no['staff']) ? $no['staff'] : 0), + 'noAX' => (isset($no['ax']) ? $no['ax'] : 0), + 'noWeek' => $no['week'], + ); + + $page->assign('statistics', $statistics); + $page->assign('registrations', $registrations); + $page->assign('marketings', $marketings); } - function handler_private(&$page, $hruid = null, + function handler_private($page, $hruid = null, $action = null, $value = null) { global $globals; @@ -121,9 +174,9 @@ class MarketingModule extends PLModule // Retrieves and display the existing marketing attempts. $res = XDB::iterator( - "SELECT r.*, a.alias - FROM register_marketing AS r - LEFT JOIN aliases AS a ON (r.sender = a.uid AND a.type = 'a_vie') + "SELECT r.*, s.email AS alias + FROM register_marketing AS r + LEFT JOIN email_source_account AS s ON (r.sender = s.uid AND s.type = 'forlife') WHERE r.uid = {?} ORDER BY date", $user->id()); $page->assign('addr', $res); @@ -138,7 +191,7 @@ class MarketingModule extends PLModule $page->assign('path', 'marketing/private/' . $user->login()); } - function handler_broken(&$page, $uid = null) + function handler_broken($page, $uid = null) { $page->changeTpl('marketing/broken.tpl'); @@ -153,15 +206,14 @@ class MarketingModule extends PLModule pl_redirect('emails/redirect'); } - $res = XDB::query('SELECT p.deathdate IS NULL AS alive, e.last, - IF(e.email IS NOT NULL, e.email, - IF(FIND_IN_SET(\'googleapps\', eo.storage), \'googleapps\', NULL)) AS email - FROM email_options AS eo - LEFT JOIN account_profiles AS ap ON (ap.uid = eo.uid AND FIND_IN_SET(\'owner\', ap.perms)) - LEFT JOIN profiles AS p ON (p.pid = ap.pid) - LEFT JOIN emails AS e ON (e.flags = \'active\' AND e.uid = eo.uid) - WHERE eo.uid = {?} - ORDER BY e.panne_level, e.last', $user->id()); + $res = XDB::query('SELECT p.deathdate IS NULL AS alive, r.last, IF(r.type = \'googleapps\', \'googleapps\', r.redirect) AS active_email + FROM accounts AS a + LEFT JOIN email_redirect_account AS r ON (a.uid = r.uid AND r.type IN (\'smtp\', \'googleapps\') AND r.flags = \'active\') + LEFT JOIN account_profiles AS ap ON (ap.uid = r.uid AND FIND_IN_SET(\'owner\', ap.perms)) + LEFT JOIN profiles AS p ON (p.pid = ap.pid) + WHERE a.uid = {?} + ORDER BY r.broken_level, r.last', + $user->id()); if (!$res->numRows()) { return PL_NOT_FOUND; } @@ -178,29 +230,28 @@ class MarketingModule extends PLModule // security stuff check_email($email, "Proposition d'une adresse surveillee pour " . $user->login() . " par " . S::user()->login()); - $res = XDB::query("SELECT flags - FROM emails - WHERE email = {?} AND uid = {?}", $email, $user->id()); - $state = $res->numRows() ? $res->fetchOneCell() : null; - if ($state == 'panne') { + $state = XDB::fetchOneCell('SELECT flags + FROM email_redirect_account + WHERE redirect = {?} AND uid = {?}', + $email, $user->id()); + if ($state == 'broken') { $page->trigWarning("L'adresse que tu as fournie est l'adresse actuelle de {$user->fullName()} et est en panne."); } elseif ($state == 'active') { $page->trigWarning("L'adresse que tu as fournie est l'adresse actuelle de {$user->fullName()}"); - } elseif ($user->email && !trim(Post::v('comment'))) { + } elseif ($user->email && !Post::t('comment')) { $page->trigError("Il faut que tu ajoutes un commentaire à ta proposition pour justifier le " . "besoin de changer la redirection de {$user->fullName()}."); } else { - require_once 'validations.inc.php'; $valid = new BrokenReq(S::user(), $user, $email, trim(Post::v('comment'))); $valid->submit(); $page->assign('sent', true); } } elseif ($email) { - $page->trigError("L'adresse proposée n'est pas une adresse acceptable pour une redirection"); + $page->trigError("L'adresse proposée n'est pas une adresse acceptable pour une redirection."); } } - function handler_promo(&$page, $promo = null) + function handler_promo($page, $promo = null) { $page->changeTpl('marketing/promo.tpl'); @@ -216,7 +267,7 @@ class MarketingModule extends PLModule $page->assign('nonins', $users); } - function handler_public(&$page, $hruid = null) + function handler_public($page, $hruid = null) { $page->changeTpl('marketing/public.tpl'); @@ -260,24 +311,24 @@ class MarketingModule extends PLModule require_once 'marketing.inc.php'; $sender = User::getSilent(S::v('uid')); + $perso_signature = 'Cordialement,
--
' . $sender->fullName(); $market = new AnnuaireMarketing(null, true); $text = $market->getText(array( 'sexe' => $user->isFemale(), - 'forlife_email' => $user->login() . '@' . $globals->mail->domain, - 'forlife_email2' => $user->login() . '@' . $globals->mail->domain2 + 'forlife_email' => $user->forlifeEmail(), + 'forlife_email2' => $user->forlifeEmailAlternate() )); $text = str_replace('%%hash%%', '', $text); $text = str_replace('%%personal_notes%%', '', $text); $text = str_replace('%%sender%%', - "" . $sender->fullName() . '', $text); + '' . $perso_signature . '', $text); $page->assign('text', nl2br($text)); - // TODO (JAC): define a unique Xorg signature for all the emails we send. - $page->assign('xorg_signature', "L'équipe de Polytechnique.org,
Le portail des élèves & anciens élèves de l'École polytechnique"); - $page->assign('perso_signature', $sender->fullName()); + $page->assign('perso_signature', $perso_signature); + $page->assign('mail_part', 'escaped_html'); } } - function handler_week(&$page, $sorting = 'per_promo') + function handler_week($page, $sorting = 'per_promo') { $page->changeTpl('marketing/this_week.tpl'); @@ -287,7 +338,7 @@ class MarketingModule extends PLModule $page->assign('users', $uf->getUsers()); } - function handler_volontaire(&$page, $promo = null) + function handler_volontaire($page, $promo = null) { $page->changeTpl('marketing/volontaire.tpl'); @@ -301,21 +352,24 @@ class MarketingModule extends PLModule if (!is_null($promo)) { - $it = XDB::iterator('SELECT m.uid, m.email + $it = XDB::iterator('SELECT m.uid, m.email, s.email AS forlife 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); + LEFT JOIN email_source_account AS s ON (m.sender = s.uid AND s.type = \'forlife\') + WHERE pd.promo = {?} + ORDER BY pd.sort_name', $promo); $page->assign('addr', $it); } } - function handler_relance(&$page) + function handler_relance($page) { $page->changeTpl('marketing/relance.tpl'); if (Post::has('relancer')) { - $nbdix = Marketing::getAliveUsersCount(); + global $globals; + $nbdix = $globals->core->NbIns; $sent = Array(); $users = User::getBulkUsersWithUIDs($_POST['relance']);