refactor + better plots

* stats :
    - better range definition for graphs.

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-100

diff --git a/ChangeLog b/ChangeLog
index b77aac3..24b9727 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ New :
                - Try to avoid the unreadable {"..."|url} modifier, use {rel}/.         -MC
                - Use a real .conf file, and no more .php's for configuration.          -MC
                - Adds include/conf.d and the glob modifier.                                            -MC
+               - Make raw access to POST/GET/... disappear.                                            -MC
        
        * Distribution :
                - Do not modify PHP include path from auto.prepend.inc.php.                     -SHK
@@ -29,6 +30,9 @@ New :
                - New skin : openweb.                                                                                           -MC
                - No more annoying submit button, onclick is used to submit.            -MC
                - This is the first autonom module of the site !                                        -MC
+
+       * Stats :
+               - Better y-range for graphs.                                                                            -MC
        
        * WebRedirect (was: Carva) : now standalone.                                                    -MC
 

diff --git a/htdocs/acces_smtp.php b/htdocs/acces_smtp.php
index 2f3aa5c..0ff134b 100644 (file)
--- a/htdocs/acces_smtp.php
+++ b/htdocs/acces_smtp.php
@@ -24,22 +24,23 @@ new_skinned_page('acces_smtp.tpl', AUTH_MDP);
     
 $uid  = Session::getInt('uid');
 $pass = Env::get('smtppass1');
+$log  = Env::getMixed('log');
 
 if ( Env::get('op') == "Valider" && Env::get('smtppass1') == Env::get('smtppass2') && strlen($pass) >= 6 ) {
 
     $globals->db->query("update auth_user_md5 set smtppass = '$pass' where user_id = $uid");
-    $_SESSION['log']->log("passwd_ssl");
     $page->trig('Mot de passe enregistré');
+    $log->log("passwd_ssl");
 
 } elseif (Env::get('op') == "Supprimer") {
 
     $globals->db->query("update auth_user_md5 set smtppass = '' where user_id = $uid");
-    $_SESSION['log']->log("passwd_del");
     $page->trig('Compte SMTP et NNTP supprimé');
+    $log->log("passwd_del");
 
 }
 
-$result = $globals->db->query("select IF(smtppass != '', 'actif', '') from auth_user_md5 where user_id = ".$_SESSION['uid']);
+$result = $globals->db->query("select IF(smtppass != '', 'actif', '') from auth_user_md5 where user_id = ".$uid);
 list($actif) = mysql_fetch_row($result);
 mysql_free_result($result);
 

diff --git a/htdocs/stats/coupure.php b/htdocs/stats/coupure.php
index c4d8426..ce02f9d 100644 (file)
--- a/htdocs/stats/coupure.php
+++ b/htdocs/stats/coupure.php
@@ -28,16 +28,22 @@ function serv_to_str($params) {
                   'smtp' => 'serveur sécurisé d\'envoi de mails',
                   'nntp' => 'serveur des forums de discussion');
     $ret = Array();
-    foreach($flags as $flag)
+    foreach ($flags as $flag) {
         $ret[] = $trad[$flag];
+    }
     return implode(', ',$ret);
 }
-if (isset($_REQUEST['cp_id'])) 
-    $res=$globals->db->query("select UNIX_TIMESTAMP(debut) AS debut, TIME_FORMAT(duree,'%kh%i') AS duree, resume, description, services from coupures where id='{$_REQUEST['cp_id']}'");
-else
-    $res="";
 
-if(($res)&&($cp = mysql_fetch_assoc($res))) {
+if (Env::has('cp_id')) {
+    $res = $globals->db->query("SELECT  UNIX_TIMESTAMP(debut) AS debut,
+                                        TIME_FORMAT(duree,'%kh%i') AS duree,
+                                        resume, description, services
+                                  FROM  coupures
+                                 WHERE  id = ".Env::getInt('cp_id'));
+    $cp = @mysql_fetch_assoc($res);
+}
+
+if($cp) {
     $cp['lg_services'] = serv_to_str($cp['services']);
     $page->assign_by_ref('cp',$cp);
 } else {

diff --git a/htdocs/stats/graph_promo.php b/htdocs/stats/graph_promo.php
index fd06465..af4b473 100644 (file)
--- a/htdocs/stats/graph_promo.php
+++ b/htdocs/stats/graph_promo.php
@@ -20,12 +20,9 @@
  ***************************************************************************/
 
 require_once("xorg.inc.php");
-new_skinned_page('index.tpl',AUTH_COOKIE);
 
-
-// genere le graph de l'evolution du nombre d'inscrits dans une promotion 
-
-$promo = (isset($_REQUEST['promo']) ? intval($_REQUEST["promo"]) : $_SESSION["promo"]);
+new_skinned_page('index.tpl', AUTH_COOKIE);
+$promo = Env::getInt('promo', Session::getInt('promo'));
 
 //nombre de jours sur le graph
 $JOURS=364;
@@ -62,12 +59,26 @@ for ($i=-$JOURS;$i<=0;$i++) {
 //Genere le graphique à la volée avec GNUPLOT
 header( "Content-type: image/png");
 
-$gnuplot="gnuplot <<EOF\n";
-$param1="set term png small color\nset size 640/480\nset xdata time\nset timefmt \"%d/%m/%y\"\n";
-$param2="set format x \"%m/%y\"\nset yr [".round($init_nb*0.90,0).":]\n";
-$title="set title \"Nombre d'inscrits de la promotion ".$promo."\"\n";
-$plot="plot \"-\" using 1:2 title 'inscrits' with lines;\n".$inscrits."e\nEOF\n";
-$plot_command=$gnuplot.$param1.$param2.$title.$plot;
+$ymin = round($init_nb*0.95,0);
+$ymax = round($total  *1.05,0);
+
+$gnuplot = <<<EOF2
+gnuplot <<EOF
+
+set term png small color
+set size 640/480
+set xdata time
+set timefmt "%d/%m/%y"
+
+set format x "%m/%y"
+set yr [$ymin:$ymax]
+
+set title "Nombre d'inscrits de la promotion $promo."
+
+plot "-" using 1:2 title 'inscrits' with lines;
+{$inscrits}e
+EOF
+EOF2;
 
-passthru($plot_command);
+passthru($gnuplot);
 ?>

diff --git a/htdocs/stats/stats_promo.php b/htdocs/stats/stats_promo.php
index 9afda77..1036215 100644 (file)
--- a/htdocs/stats/stats_promo.php
+++ b/htdocs/stats/stats_promo.php
@@ -22,7 +22,8 @@
 require_once("xorg.inc.php");
 new_skinned_page("stats/stats_promo.tpl", AUTH_COOKIE);
 
-$promo = isset($_REQUEST["promo"]) ? intval($_REQUEST["promo"]) : $_SESSION["promo"];
+$promo = Env::getInt('promo', Session::getInt('promo'));
 $page->assign('promo',$promo);
 $page->run();
+
 ?>