X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fstats.php;h=d931031d3091081abf0e26b0d8134545a5b77922;hb=cecdf74795e71ed038411915dad5e0dff6ea51fa;hp=88be8367e8a2f778e7b206a7173aa6c2baf89d67;hpb=089a5801075ffba573c547f1283d42d87065b5e4;p=platal.git diff --git a/modules/stats.php b/modules/stats.php index 88be836..d931031 100644 --- a/modules/stats.php +++ b/modules/stats.php @@ -1,6 +1,6 @@ 'site web', 'mail'=> 'redirection mail', - 'smtp' => 'serveur sécurisé d\'envoi de mails', + 'smtp' => 'serveur sécurisé d\'envoi de mails', 'nntp' => 'serveur des forums de discussion'); $ret = Array(); foreach ($flags as $flag) { @@ -36,14 +36,13 @@ class StatsModule extends PLModule function handlers() { return array( - '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), + '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), ); } @@ -60,26 +59,26 @@ class StatsModule extends PLModule function handler_graph_evo(&$page, $jours = 365) { - 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') - GROUP BY jour"); + define('DUREEJOUR', 24 * 3600); + + //recupere le nombre d'inscriptions par jour sur la plage concernée + $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=''; - // la première ligne contient le total des inscrits avant la date de départ (J - $jours) + // la première ligne contient le total des inscrits avant la date de départ (J - $jours) list(,$init_nb) = $res->next(); - $total = $init_nb; - - list($numjour, $nb) = $res->next(); + $total = $init_nb; + $numjour = - $jours - 1; for ($i = -$jours; $i<=0; $i++) { if ($numjour<$i) { @@ -92,10 +91,11 @@ class StatsModule extends PLModule $inscrits .= date('d/m/y',$i*DUREEJOUR+time())." ".$total."\n"; } - //Genere le graphique à la volée avec GNUPLOT - header( "Content-type: image/png"); + //Genere le graphique à la volée avec GNUPLOT + pl_cached_dynamic_content_headers("image/png"); $delt = ($total - $init_nb)/10; + $delt = $delt ? $delt : 5; $ymin = round($init_nb - $delt,0); $ymax = round($total + $delt,0); @@ -124,20 +124,22 @@ EOF2; function handler_graph(&$page, $promo = null) { if ($promo == 'all') { - // date de départ - $depart = 1920; - - //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"); + // date de départ + $depart = 1930; + + //recupere le nombre d'inscriptions par jour sur la plage concernée + $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=''; - // la première ligne contient le total des inscrits avant la date de départ + // la première ligne contient le total des inscrits avant la date de départ list($annee, $nb) = $res->next(); for ($i = $depart; $i <= date("Y"); $i++) { @@ -151,7 +153,7 @@ EOF2; $inscrits .= $i.' '.$nb."\n"; } - //Genere le graphique à la volée avec GNUPLOT + //Genere le graphique à la volée avec GNUPLOT $fin = $i+2; $gnuplot = <<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') - GROUP BY jour", $promo); + //recupere le nombre d'inscriptions par jour sur la plage concernée + $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=''; - // la première ligne contient le total des inscrits avant la date de départ (J - $jours) + // la première ligne contient le total des inscrits avant la date de départ (J - $jours) list(,$init_nb) = $res->next(); $total = $init_nb; @@ -212,7 +216,7 @@ EOF2; $inscrits .= date('d/m/y',$i*DUREEJOUR+time())." ".$total."\n"; } - //Genere le graphique à la volée avec GNUPLOT + //Genere le graphique à la volée avec GNUPLOT $delt = ($total - $init_nb) / 10; $delt += ($delt < 1); $ymin = round($init_nb - $delt,0); @@ -237,7 +241,7 @@ EOF EOF2; } - header('Content-type: image/png'); + pl_cached_dynamic_content_headers("image/png"); passthru($gnuplot); exit; } @@ -246,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') - 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()) { @@ -273,24 +278,29 @@ EOF2; $page->changeTpl('stats/coupure.tpl'); if (!is_null($cp_id)) { - $res = XDB::query("SELECT UNIX_TIMESTAMP(debut) AS debut, - TIME_FORMAT(duree,'%kh%i') AS duree, - resume, description, services - FROM coupures - WHERE id = {?}", $cp_id); + $res = XDB::query("SELECT debut, + TIME_FORMAT(duree,'%kh%i') AS duree, + resume, description, services + FROM downtimes + WHERE id = {?}", $cp_id); $cp = $res->fetchOneAssoc(); } - if($cp) { + if(@$cp) { $cp['lg_services'] = serv_to_str($cp['services']); $page->assign_by_ref('cp',$cp); } else { $beginning_date = date("Ymd", time() - 3600*24*21) . "000000"; - $sql = "SELECT id, UNIX_TIMESTAMP(debut) AS debut, resume, services - FROM coupures where debut > '$beginning_date' order by debut desc"; + $sql = "SELECT id, debut, resume, services + 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 + WHERE state != 'ok'"); + $page->assign('mxs', $res); } } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>