X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fstats.php;h=d931031d3091081abf0e26b0d8134545a5b77922;hb=cecdf74795e71ed038411915dad5e0dff6ea51fa;hp=d7f77afb7fe352578c57e5e9c2a0d5729dcca112;hpb=8230e9f8eff954fb1103c8bdcf0d22557d419ae7;p=platal.git diff --git a/modules/stats.php b/modules/stats.php index d7f77af..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), ); } @@ -61,17 +59,18 @@ class StatsModule extends PLModule function handler_graph_evo(&$page, $jours = 365) { - define('DUREEJOUR',24*3600); + define('DUREEJOUR', 24 * 3600); //recupere le nombre d'inscriptions par jour sur la plage concernée - $res = XDB::iterRow( - "SELECT IF( date_ins>DATE_SUB(NOW(),INTERVAL $jours DAY), - TO_DAYS(date_ins)-TO_DAYS(NOW()), - ".(-($jours+1)).") AS jour, - COUNT(user_id) AS nb - FROM auth_user_md5 - WHERE perms IN ('admin','user') AND deces = 0 - GROUP BY jour"); + $res = XDB::iterRow('SELECT IF(registration_date > DATE_SUB(NOW(), INTERVAL {?} DAY), + TO_DAYS(registration_date) - TO_DAYS(NOW()), + -{?}) AS jour, + 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 $inscrits=''; @@ -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,11 +128,13 @@ EOF2; $depart = 1930; //recupere le nombre d'inscriptions par jour sur la plage concernée - $res = XDB::iterRow( - "SELECT promo, SUM(perms IN ('admin', 'user')) / COUNT(*) * 100 - FROM auth_user_md5 - WHERE promo >= $depart AND deces = 0 - GROUP BY promo"); + $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 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 $inscrits=''; @@ -175,23 +176,25 @@ EOF2; } else { //nombre de jours sur le graph $jours = 365; - define('DUREEJOUR',24*3600); - $res = XDB::query( - "SELECT min(TO_DAYS(date_ins)-TO_DAYS(now())) - FROM auth_user_md5 - WHERE promo = {?} AND perms IN ('admin', 'user') AND deces = 0", - $promo); + define('DUREEJOUR', 24 * 3600); + + $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.pid = ap.pid AND FIND_IN_SET('primary', pe.flags)) + WHERE pe.entry_year = {?} AND a.state = 'active'", (int)$promo); $jours = -$res->fetchOneCell(); //recupere le nombre d'inscriptions par jour sur la plage concernée - $res = XDB::iterRow( - "SELECT IF( date_ins>DATE_SUB(NOW(),INTERVAL $jours DAY), - TO_DAYS(date_ins)-TO_DAYS(NOW()), - ".(-($jours+1)).") AS jour, - COUNT(user_id) AS nb - FROM auth_user_md5 - WHERE promo = {?} AND perms IN ('admin','user') AND deces = 0 - GROUP BY jour", $promo); + $res = XDB::iterRow("SELECT IF(a.registration_date > DATE_SUB(NOW(), INTERVAL {?} DAY), + TO_DAYS(a.registration_date) - TO_DAYS(NOW()), + -{?}) AS jour, + 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.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); //genere des donnees compatibles avec GNUPLOT $inscrits=''; @@ -238,7 +241,7 @@ EOF EOF2; } - header('Content-type: image/png'); + pl_cached_dynamic_content_headers("image/png"); passthru($gnuplot); exit; } @@ -247,12 +250,13 @@ EOF2; { $page->changeTpl('stats/nb_by_promo.tpl'); - $res = XDB::iterRow( - "SELECT promo,COUNT(*) - FROM auth_user_md5 - WHERE promo > 1900 AND perms IN ('admin','user') AND deces = 0 - GROUP BY promo - ORDER BY promo"); + $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.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'); $max=0; $min=3000; while (list($p,$nb) = $res->next()) { @@ -277,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(); } @@ -288,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 @@ -296,30 +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; - } - $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: