X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fstats.php;h=d931031d3091081abf0e26b0d8134545a5b77922;hb=53595c2a9d1df6993dd69217c4bd1a6a9d51bff7;hp=39f1f0da0f1eb3b476343fb0874f4a1e536c3ec5;hpb=076412639089ff7a5dfd8ae1652faf1683c322e5;p=platal.git diff --git a/modules/stats.php b/modules/stats.php index 39f1f0d..d931031 100644 --- a/modules/stats.php +++ b/modules/stats.php @@ -1,6 +1,6 @@ $this->make_hook('stats', AUTH_COOKIE), - 'stats/evolution' => $this->make_hook('evolution', AUTH_COOKIE), - 'stats/graph' => $this->make_hook('graph', AUTH_COOKIE), - 'stats/graph/evolution' - => $this->make_hook('graph_evo', AUTH_COOKIE), - 'stats/promos' => $this->make_hook('promos', AUTH_COOKIE), - 'stats/profile' => $this->make_hook('profile', AUTH_COOKIE), - - 'stats/coupures' => $this->make_hook('coupures', AUTH_PUBLIC), + 'stats' => $this->make_hook('stats', AUTH_COOKIE), + 'stats/evolution' => $this->make_hook('evolution', AUTH_COOKIE), + 'stats/graph' => $this->make_hook('graph', AUTH_COOKIE), + 'stats/graph/evolution' => $this->make_hook('graph_evo', AUTH_COOKIE), + 'stats/promos' => $this->make_hook('promos', AUTH_COOKIE), + + 'stats/coupures' => $this->make_hook('coupures', AUTH_PUBLIC), ); } @@ -64,13 +62,14 @@ class StatsModule extends PLModule define('DUREEJOUR', 24 * 3600); //recupere le nombre d'inscriptions par jour sur la plage concernée - // FIXME: don't count dead peaple $res = XDB::iterRow('SELECT IF(registration_date > DATE_SUB(NOW(), INTERVAL {?} DAY), TO_DAYS(registration_date) - TO_DAYS(NOW()), -{?}) AS jour, - COUNT(uid) AS nb - FROM accounts - WHERE state = \'active\' + COUNT(a.uid) AS nb + FROM accounts AS a + LEFT JOIN account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET(\'owner\', ap.perms)) + LEFT JOIN profiles AS p ON (ap.pid = p.pid) + WHERE state = \'active\' AND p.deathdate IS NULL GROUP BY jour', (int)$jours, 1 + (int)$jours); //genere des donnees compatibles avec GNUPLOT @@ -93,7 +92,7 @@ class StatsModule extends PLModule } //Genere le graphique à la volée avec GNUPLOT - header( "Content-type: image/png"); + pl_cached_dynamic_content_headers("image/png"); $delt = ($total - $init_nb)/10; $delt = $delt ? $delt : 5; @@ -129,12 +128,12 @@ EOF2; $depart = 1930; //recupere le nombre d'inscriptions par jour sur la plage concernée - // XXX: Manage dead peaple... $res = XDB::iterRow("SELECT pe.entry_year AS promo, SUM(state = 'active') / COUNT(*) * 100 FROM accounts AS a INNER JOIN account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms)) - INNER JOIN profile_education AS pe ON (pe.uid = ap.pid AND FIND_IN_SET('primary', pe.flags)) - WHERE pe.entry_year >= {?} + INNER JOIN profiles AS p ON (p.pid = ap.pid) + INNER JOIN profile_education AS pe ON (pe.pid = ap.pid AND FIND_IN_SET('primary', pe.flags)) + WHERE pe.entry_year >= {?} AND p.deathdate IS NULL GROUP BY promo", $depart); //genere des donnees compatibles avec GNUPLOT @@ -179,11 +178,10 @@ EOF2; $jours = 365; define('DUREEJOUR', 24 * 3600); - // XXX: And promo again \o/ $res = XDB::query("SELECT MIN(TO_DAYS(a.registration_date) - TO_DAYS(NOW())) FROM accounts AS a INNER JOIN account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms)) - INNER JOIN profile_education AS pe ON (pe.uid = ap.pid AND FIND_IN_SET('primary', pe.flags)) + INNER JOIN profile_education AS pe ON (pe.pid = ap.pid AND FIND_IN_SET('primary', pe.flags)) WHERE pe.entry_year = {?} AND a.state = 'active'", (int)$promo); $jours = -$res->fetchOneCell(); @@ -194,7 +192,7 @@ EOF2; COUNT(a.uid) AS nb FROM accounts AS a INNER JOIN account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms)) - INNER JOIN profile_education AS pe ON (pe.uid = ap.pid AND FIND_IN_SET('primary', pe.flags)) + INNER JOIN profile_education AS pe ON (pe.pid = ap.pid AND FIND_IN_SET('primary', pe.flags)) WHERE pe.entry_year = {?} AND a.state = 'active' GROUP BY jour", (int)$jours, 1 + (int)$jours, (int)$promo); @@ -243,7 +241,7 @@ EOF EOF2; } - header('Content-type: image/png'); + pl_cached_dynamic_content_headers("image/png"); passthru($gnuplot); exit; } @@ -255,7 +253,7 @@ EOF2; $res = XDB::iterRow('SELECT pe.entry_year AS promo, COUNT(*) FROM accounts AS a INNER JOIN account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET(\'owner\', ap.perms)) - INNER JOIN profile_education AS pe ON (pe.uid = ap.pid AND FIND_IN_SET(\'primary\', pe.flags)) + INNER JOIN profile_education AS pe ON (pe.pid = ap.pid AND FIND_IN_SET(\'primary\', pe.flags)) WHERE pe.entry_year >= 1900 AND a.state = \'active\' GROUP BY promo ORDER BY promo'); @@ -283,7 +281,7 @@ EOF2; $res = XDB::query("SELECT debut, TIME_FORMAT(duree,'%kh%i') AS duree, resume, description, services - FROM coupures + FROM downtimes WHERE id = {?}", $cp_id); $cp = $res->fetchOneAssoc(); } @@ -294,7 +292,7 @@ EOF2; } else { $beginning_date = date("Ymd", time() - 3600*24*21) . "000000"; $sql = "SELECT id, debut, resume, services - FROM coupures where debut > '$beginning_date' order by debut desc"; + FROM downtimes where debut > '$beginning_date' order by debut desc"; $page->assign('coupures', XDB::iterator($sql)); $res = XDB::iterator("SELECT host, text FROM mx_watch @@ -302,31 +300,6 @@ EOF2; $page->assign('mxs', $res); } } - - function handler_profile(&$page, $period = 'overall') - { - $page->changeTpl('stats/profile.tpl'); - - $time = ''; - switch ($period) { - case 'week': case 'month': case 'year': - $time = ' AND e.stamp > DATE_SUB(CURDATE(), INTERVAL 1 ' . strtoupper($period) . ')'; - break; - } - // XXX: Need to be port to profile stuff - $rows = XDB::iterator("SELECT IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, - u.prenom, u.promo, e.data AS forlife, COUNT(*) AS count - FROM logger.events AS e - INNER JOIN logger.actions AS act ON (e.action = act.id) - INNER JOIN aliases AS a ON (a.alias = e.data) - INNER JOIN auth_user_md5 AS u ON (u.user_id = a.id) - WHERE act.text = 'view_profile' $time - GROUP BY e.data - ORDER BY count DESC - LIMIT 10"); - $page->assign('profiles', $rows); - $page->assign('period', $period); - } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: