refactorization to manage old rules with a separated class

[brisk.git] / web / briskin5 / statadm.php

diff --git a/web/briskin5/statadm.php b/web/briskin5/statadm.php
index f6d40b3..ee06e08 100644 (file)
--- a/web/briskin5/statadm.php
+++ b/web/briskin5/statadm.php
@@ -30,8 +30,6 @@
 
 $G_base = "../";
 
-define('BIN5_TOURNAMENT_NORMAL', 1);
-
 ini_set("max_execution_time",  "240");
 
 require_once("../Obj/brisk.phh");
@@ -335,12 +333,15 @@ function main_pgsql($curtime)
             $old_score = array( 1000000000, 1000000000);
             $old_gam   = array( -1, -1);
             $rank      = array(  0,  0);
-            
+
+            // TAG: POINTS_MANAGEMENT
             $pla_sql = sprintf("SELECT (float4(sum(p.pts)) * 100.0 ) /  float4(count(p.pts)) as score, sum(p.pts) as points, count(p.pts) as games, u.code as ucode, u.login as login
                                 FROM %sbin5_points as p, %sbin5_games as g, %sbin5_matches as m, %susers as u 
                                 WHERE m.tcode = %d AND m.code = g.mcode AND
+                                      ( (u.type & (CAST (X'ff0000' as integer))) <> (CAST (X'800000' as integer)) ) AND
                                       g.tstamp > to_timestamp(%d) AND g.tstamp <= to_timestamp(%d) AND
-                                      p.ucode = u.code AND p.gcode = g.code
+                                      p.ucode = u.code AND p.gcode = g.code AND
+                                      p.pts != 0
                                 GROUP BY u.code, u.login
                                 ORDER BY (float4(sum(p.pts)) * 100.0 ) /  float4(count(p.pts)) DESC, 
                                          count(p.pts) DESC",
@@ -426,7 +427,10 @@ function main()
     
     $ctime = time();
 
-    $curtime = ((int)($ctime / (24 * 3600))) * 24 * 3600 - (((int)substr(date("O", $ctime), 0, -2)) * 3600);
+    if (BIN5_PLAYERS_N != 5)
+        $curtime = $ctime;
+    else
+        $curtime = ((int)($ctime / (24 * 3600))) * 24 * 3600 - (((int)substr(date("O", $ctime), 0, -2)) * 3600);
     if ($ret = $fun_name($curtime))
         echo "Success.<br>\n";
     else