change of the placings calculation

diff --git a/web/briskin5/Obj/placing.phh b/web/briskin5/Obj/placing.phh
index d0ce4b9..583fce7 100644 (file)
--- a/web/briskin5/Obj/placing.phh
+++ b/web/briskin5/Obj/placing.phh
@@ -27,16 +27,16 @@
 
 define(TOP_NUM, 10);
 define(TRI_LIMIT, (90 * 24 * 60 * 60));
-// define(TRI_FEW_GAMES, 60);
-define(TRI_FEW_GAMES, 140);
+define(TRI_MIN_GAMES, 70);
+define(TRI_MAX_GAMES, 140);
 
 define(MON_LIMIT, (30 * 24 * 60 * 60));
-// define(MON_FEW_GAMES, 20);
-define(MON_FEW_GAMES, 70);
+define(MON_MIN_GAMES, 35);
+define(MON_MAX_GAMES, 70);
 
 define(WEE_LIMIT, (7 * 24 * 60 * 60));
-// define(WEE_FEW_GAMES, 10);
-define(WEE_FEW_GAMES, 35);
+define(WEE_MIN_GAMES, 10);
+define(WEE_MAX_GAMES, 35);
 
 
 class Ptsgam {
@@ -51,7 +51,7 @@ class Ptsgam {
     $this->gam = $gam;
   }
 
-  function &clone()
+  function &myclone()
   {
     $ret = new Ptsgam($this->username, $this->pts, $this->gam);
 
@@ -99,21 +99,44 @@ function ptsgam_cmp($a, $b)
 
 function placings_show(&$user) 
 {
-  $ret = sprintf("<div style='padding: auto;'><table class='placings'>");
-  $ret .= sprintf("<tr><td style='background-color: #f0f0ff;'><br><b>Settimanale</b><br>(non meno di %d partite)<br><br>%s<br></td>", WEE_FEW_GAMES, placing_show($user, "wee_hi") );
-  $ret .= sprintf("<td style='background-color: #f0f0ff;'><br><b>Settimanale</b><br>(meno di %d partite)<br><br>%s<br></td></tr>\n", WEE_FEW_GAMES, placing_show($user, "wee_lo") );
+  $mtime = placing_time();
+  $tm = placing_date($mtime);
+  $ret = sprintf("<div style='padding: auto;'><h2><b>CLASSIFICHE</b></h2>(aggiornate alle ore %s del %s)<table class='placings'>", $tm[0], $tm[1]);
 
-  $ret .= sprintf("<tr><td style='background-color: #fffff0;'><br><b>Mensile</b><br>(non meno di %d partite)<br><br>%s<br></td>", MON_FEW_GAMES, placing_show($user, "mon_hi") );
-  $ret .= sprintf("<td style='background-color: #fffff0;'><br><b>Mensile</b><br>(meno di %d partite)<br><br>%s<br></td></tr>\n", MON_FEW_GAMES, placing_show($user, "mon_lo") );
+  $tmwee = placing_date($mtime - WEE_LIMIT + (3600));
+  $ret .= sprintf("<tr><td style='background-color: #f0f0ff;'><br><b>Settimanale</b><br>dal %s al %s<br>(non meno di %d partite)<br><br>%s<br></td>", $tmwee[1], $tm[1], WEE_MAX_GAMES, placing_show($user, "wee_hi") );
+  $ret .= sprintf("<td style='background-color: #f0f0ff;'><br><b>Settimanale</b><br>dal %s al %s<br>(meno di %d partite, più di %d)<br><br>%s<br></td></tr>\n", $tmwee[1], $tm[1], WEE_MAX_GAMES, WEE_MIN_GAMES, placing_show($user, "wee_lo") );
 
-  $ret .= sprintf("<tr><td style='background-color: #fff0f0;'><br><b>Trimestrale</b><br>(non meno di %d partite)<br><br>%s<br></td>", TRI_FEW_GAMES, placing_show($user, "tri_hi")); 
-  $ret .= sprintf("<td style='background-color: #fff0f0;'><br><b>Trimestrale</b><br>(meno di %d partite)<br><br>%s<br></td></tr>", TRI_FEW_GAMES, placing_show($user, "tri_lo")); 
+  $tmmon = placing_date($mtime - MON_LIMIT + (3600));
+  $ret .= sprintf("<tr><td style='background-color: #fffff0;'><br><b>Mensile</b><br>dal %s al %s<br>(non meno di %d partite)<br><br>%s<br></td>", $tmmon[1], $tm[1], MON_MAX_GAMES, placing_show($user, "mon_hi") );
+  $ret .= sprintf("<td style='background-color: #fffff0;'><br><b>Mensile</b><br>dal %s al %s<br>(meno di %d partite, più di %d)<br><br>%s<br></td></tr>\n", $tmmon[1], $tm[1], MON_MAX_GAMES, MON_MIN_GAMES, placing_show($user, "mon_lo") );
+
+  $tmtri = placing_date($mtime - TRI_LIMIT + (3600));
+  $ret .= sprintf("<tr><td style='background-color: #fff0f0;'><br><b>Trimestrale</b><br>dal %s al %s<br>(non meno di %d partite)<br><br>%s<br></td>", $tmtri[1], $tm[1], TRI_MAX_GAMES, placing_show($user, "tri_hi")); 
+  $ret .= sprintf("<td style='background-color: #fff0f0;'><br><b>Trimestrale</b><br>dal %s al %s<br>(meno di %d partite, più di %d)<br><br>%s<br></td></tr>", $tmtri[1], $tm[1], TRI_MAX_GAMES, TRI_MIN_GAMES, placing_show($user, "tri_lo")); 
 
 
   $ret .= sprintf("</table></div>");
   return ($ret);
 }
 
+function placing_time()
+{
+  if (($fp = @fopen(LEGAL_PATH."/class_wee_lo.log", 'r')) == FALSE) {
+    return (FALSE);
+  }
+  $st = fstat($fp);
+  fclose($fp);
+
+  return ( $st['mtime'] );
+}
+
+function placing_date($mtime)
+{
+  return array( date('G:i', $mtime), date('j/n/y', $mtime) );
+}
+  
+
 function placing_show(&$user, $suff) 
 {
   $tail = FALSE;
@@ -141,13 +164,13 @@ function placing_show(&$user, $suff)
 
     if ($i < TOP_NUM) {
       $ret .= sprintf("<tr><td>%d</td><td>%s%s%s</td><td>%s</td><td>(%d/%d)</td></tr>", $i+1, 
-                      ($pg->username == $user->name ? "<b>" : ""), $pg->username, ($pg->username == $user->name ? "</b>" : ""), $pg->snormpts(), $pg->pts, $pg->gam);
+                      ($pg->username == $user->name ? "<b>" : ""), xcape($pg->username), ($pg->username == $user->name ? "</b>" : ""), $pg->snormpts(), $pg->pts, $pg->gam);
     }
     if ($user != FALSE) {
       if (strcasecmp($pg->username, $user->name) == 0 && $i >= TOP_NUM) {
         $tail = sprintf("<tr><td colspan=4 style='text-align: center'> . . . . . . . . . . </td></tr>");
         $tail .= sprintf("<tr><td>%d</td><td>%s%s%s</td><td>%s</td><td>(%d/%d)</td></tr>", $i+1,
-                         ($pg->username == $user->name ? "<b>" : ""), $pg->username, ($pg->username == $user->name ? "</b>" : ""), $pg->snormpts(), $pg->pts, $pg->gam);
+                         ($pg->username == $user->name ? "<b>" : ""), xcape($pg->username), ($pg->username == $user->name ? "</b>" : ""), $pg->snormpts(), $pg->pts, $pg->gam);
       }
     }
     $old_normpts = $pg->normpts();

diff --git a/web/briskin5/statadm.php b/web/briskin5/statadm.php
index fda759e..abe0042 100644 (file)
--- a/web/briskin5/statadm.php
+++ b/web/briskin5/statadm.php
@@ -126,10 +126,10 @@ function main()
     if ($tri[$i]->gam == 0.0)
       continue;
     printf("%s: %s (%d) <br>\n",  $tri[$i]->username,  $tri[$i]->snormpts(), $tri[$i]->gam);
-    if ($tri[$i]->gam < TRI_FEW_GAMES) 
-      fwrite($fplo, sprintf("%s|%d|%d|\n", xcapelt($tri[$i]->username), $tri[$i]->pts, $tri[$i]->gam));
-    else
+    if ($tri[$i]->gam >= TRI_MAX_GAMES) 
       fwrite($fphi, sprintf("%s|%d|%d|\n", xcapelt($tri[$i]->username), $tri[$i]->pts, $tri[$i]->gam));
+    else if ($tri[$i]->gam > TRI_MIN_GAMES) 
+      fwrite($fplo, sprintf("%s|%d|%d|\n", xcapelt($tri[$i]->username), $tri[$i]->pts, $tri[$i]->gam));
   }
   fclose($fphi);
   fclose($fplo);
@@ -149,10 +149,10 @@ function main()
     if ($mon[$i]->gam == 0.0)
       continue;
     printf("%s: %s (%d) <br>\n",  $mon[$i]->username,  $mon[$i]->snormpts(), $mon[$i]->gam);
-    if ($mon[$i]->gam < MON_FEW_GAMES) 
-      fwrite($fplo, sprintf("%s|%d|%d|\n", xcapelt($mon[$i]->username), $mon[$i]->pts, $mon[$i]->gam));
-    else
+    if ($mon[$i]->gam >= MON_MAX_GAMES) 
       fwrite($fphi, sprintf("%s|%d|%d|\n", xcapelt($mon[$i]->username), $mon[$i]->pts, $mon[$i]->gam));
+    else if ($mon[$i]->gam > MON_MIN_GAMES) 
+      fwrite($fplo, sprintf("%s|%d|%d|\n", xcapelt($mon[$i]->username), $mon[$i]->pts, $mon[$i]->gam));
   }
   fclose($fphi);
   fclose($fplo);
@@ -171,10 +171,10 @@ function main()
     if ($wee[$i]->gam == 0.0) 
       continue;
     printf("%s: %s (%d) <br>\n",  $wee[$i]->username,  $wee[$i]->snormpts(), $wee[$i]->gam);
-    if ($wee[$i]->gam < WEE_FEW_GAMES) 
-      fwrite($fplo, sprintf("%s|%d|%d|\n", xcapelt($wee[$i]->username), $wee[$i]->pts, $wee[$i]->gam));
-    else
+    if ($wee[$i]->gam >= WEE_MAX_GAMES) 
       fwrite($fphi, sprintf("%s|%d|%d|\n", xcapelt($wee[$i]->username), $wee[$i]->pts, $wee[$i]->gam));
+    else if ($wee[$i]->gam > WEE_MIN_GAMES) 
+      fwrite($fplo, sprintf("%s|%d|%d|\n", xcapelt($wee[$i]->username), $wee[$i]->pts, $wee[$i]->gam));
   }
   fclose($fphi);
   fclose($fplo);