From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Fri, 30 Oct 2015 07:43:19 +0000 (+0100)
Subject: enabled match and hands counters
X-Git-Tag: v5.1.0~3
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=0b13b1b5ef313a06e58d2d44ffd09670a4dd8eb5;p=brisk.git

enabled match and hands counters
---

diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh
index 6299f81..77c215f 100644
--- a/web/Obj/dbase_pgsql.phh
+++ b/web/Obj/dbase_pgsql.phh
@@ -735,34 +735,28 @@ class BriskDB
                 if ($i < $n)
                     break;
 
-                // FIXME: uncomment when counters are updated
-                if (0 == 1) {
-                    $cnt_sql = sprintf("UPDATE %susers SET (match_cnt, game_cnt)
+                $cnt_sql = sprintf("UPDATE %susers SET (match_cnt, game_cnt)
                                         = (match_cnt+1, game_cnt+1) WHERE %s;",
-                                       $G_dbpfx, $codes_where);
-                    error_log($cnt_sql);
-                    if (($cnt_pg = $this->query($cnt_sql)) == FALSE || pg_affected_rows($cnt_pg) != $n) {
-                        log_crit(sprintf("bin5_points_save: failed increment match and game [%s]", $cnt_sql));
-                        break;
-                    }
+                                   $G_dbpfx, $codes_where);
+                error_log($cnt_sql);
+                if (($cnt_pg = $this->query($cnt_sql)) == FALSE || pg_affected_rows($cnt_pg) != $n) {
+                    log_crit(sprintf("bin5_points_save: failed increment match and game [%s]", $cnt_sql));
+                    break;
                 }
             }
             else {
                 $mtc_obj = pg_fetch_object($mtc_pg,0);
 
-                // FIXME: uncomment when counters are updated
-                if (0 == 1) {
-                    for ($i = 0 ; $i < $n ; $i++) {
-                        $codes_where .= sprintf("%scode = %d", ($i == 0 ? "" : " OR "), $ucodes[$i]);
-                    }
-                    $cnt_sql = sprintf("UPDATE %susers SET (game_cnt)
+                for ($i = 0 ; $i < $n ; $i++) {
+                    $codes_where .= sprintf("%scode = %d", ($i == 0 ? "" : " OR "), $ucodes[$i]);
+                }
+                $cnt_sql = sprintf("UPDATE %susers SET (game_cnt)
                                         = (game_cnt+1) WHERE %s;",
-                                       $G_dbpfx, $codes_where);
-                    error_log($cnt_sql);
-                    if (($cnt_pg = $this->query($cnt_sql)) == FALSE || pg_affected_rows($cnt_pg) != $n) {
-                        log_crit(sprintf("bin5_points_save: failed increment game [%s]", $cnt_sql));
-                        break;
-                    }
+                                   $G_dbpfx, $codes_where);
+                error_log($cnt_sql);
+                if (($cnt_pg = $this->query($cnt_sql)) == FALSE || pg_affected_rows($cnt_pg) != $n) {
+                    log_crit(sprintf("bin5_points_save: failed increment game [%s]", $cnt_sql));
+                    break;
                 }
             }
 
diff --git a/web/brisk.css b/web/brisk.css
index 430c83b..d4bafaa 100644
--- a/web/brisk.css
+++ b/web/brisk.css
@@ -307,4 +307,4 @@ div.apprentice {
     background-color: #ffd780;
     border: 1px solid #ffae00;
     padding: 8px;
-}
\ No newline at end of file
+}
diff --git a/web/index.php b/web/index.php
index ea7f22b..d68f270 100644
--- a/web/index.php
+++ b/web/index.php
@@ -1379,9 +1379,9 @@ type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chi
 <tr><td class="le"><b><?php echo $mlang_room['info_login'][$G_lang]; ?></b></td><td class="ri"><span class="login_id"></span></td></tr>
 <tr><td class="le"><b><?php echo $mlang_room['info_state'][$G_lang]; ?></b></td><td class="ri"><span class="state_id"></span></td></tr>
 <tr><td class="le"><b><?php echo $mlang_room['info_guar'][$G_lang]; ?></b></td><td class="ri"><span class="guar_id"></span></td></tr>
-<tr><td colspan="2" style="background-color: pink;">di seguito le opzioni che verranno attivate successivamente:</td></tr>
 <tr><td class="le"><b><?php echo $mlang_room['info_match'][$G_lang]; ?></b></td><td class="ri"><span class="match_id"></span></td></tr>
 <tr><td class="le"><b><?php echo $mlang_room['info_game'][$G_lang]; ?></b></td><td class="ri"><span class="game_id"></span></td></tr>
+<tr><td colspan="2" style="background-color: pink;">di seguito le opzioni che verranno attivate successivamente:</td></tr>
 <tr><td class="le ri" colspan="2"><b><?php echo $mlang_room['info_frie'][$G_lang]; ?></b></td></tr>
 <tr><td class="le info-opt"><input type="radio" name="friend" class="friend_id" value="black">Da evitare</td>
     <td class="ri info-opt"><input type="radio" name="friend" class="friend_id" value="friend">Amico</td></tr>