cont command: missing update of ttok and table id fixed

[brisk.git] / web / Obj / dbase_pgsql.phh

diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh
index ba8fc60..05a42f7 100644 (file)
--- a/web/Obj/dbase_pgsql.phh
+++ b/web/Obj/dbase_pgsql.phh
@@ -157,15 +157,27 @@ class BriskDB
         return ($user_obj);
     }
 
+    function getrecord_bycode($code) {
+        GLOBAL $G_dbpfx;
+
+        $user_sql = sprintf("SELECT * FROM %susers WHERE code = %d;",  $G_dbpfx, $code);
+        if (($user_pg  = $this->query($user_sql)) == FALSE) {
+            return FALSE;
+        }
+        if (pg_numrows($user_pg) != 1)
+            return FALSE;
+
+        $user_obj = pg_fetch_object($user_pg, 0);
+
+        return ($user_obj);
+    }
+
     function user_update_login_time($code, $lintm)
     {
         GLOBAL $G_dbpfx;
 
         $user_sql = sprintf("UPDATE %susers SET (lintm) = (date 'epoch' + %d * INTERVAL '1 second') WHERE code = %d;", $G_dbpfx, $lintm, $code);
 
-        // $user_pg = $this->query($user_sql);
-        // $row_n = pg_affected_rows($user_pg);
-        // fprintf(STDERR, "query: %s   NUM: %d\n", ($user_pg == FALSE ? "FALSE" : "TRUE"), $row_n);
         if ( ! (($user_pg  = $this->query($user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) {
              return FALSE;
         }
@@ -178,7 +190,37 @@ class BriskDB
         GLOBAL $G_dbpfx;
 
         $user_sql = sprintf("UPDATE %susers SET (type, supp_comp) = (%d, '%s') WHERE code = %d;",
-                            $G_dbpfx, $flags, $supp_comp, $code);
+                            $G_dbpfx, $flags, escsql($supp_comp), $code);
+        fprintf(STDERR, "REQUEST [%s]\n", $user_sql);
+        if ( ! (($user_pg  = $this->query($user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) {
+             return FALSE;
+        }
+        fprintf(STDERR, "REQUEST GOOD [%s]\n", $user_sql);
+
+        return TRUE;
+    }
+
+    function user_state_update($code, $flags, $disa_reas)
+    {
+        GLOBAL $G_dbpfx;
+
+        $user_sql = sprintf("UPDATE %susers SET (type, disa_reas) = (%d, %d) WHERE code = %d;",
+                            $G_dbpfx, $flags, $disa_reas, $code);
+        fprintf(STDERR, "REQUEST [%s]\n", $user_sql);
+        if ( ! (($user_pg  = $this->query($user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) {
+             return FALSE;
+        }
+        fprintf(STDERR, "REQUEST GOOD [%s]\n", $user_sql);
+
+        return TRUE;
+    }
+
+    function user_tos_update($code, $tos_vers)
+    {
+        GLOBAL $G_dbpfx;
+
+        $user_sql = sprintf("UPDATE %susers SET (tos_vers) = ('%s') WHERE code = %d;",
+                            $G_dbpfx, escsql($tos_vers), $code);
         fprintf(STDERR, "REQUEST [%s]\n", $user_sql);
         if ( ! (($user_pg  = $this->query($user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) {
              return FALSE;
@@ -255,6 +297,17 @@ class BriskDB
         return (LoginDBItem::LoginDBItemFromRecord($user_obj));
     }
 
+    function getitem_bycode($code) {
+        $ret = FALSE;
+
+        log_main("getitem_bycode: ".$code);
+
+        if (($user_obj = $this->getrecord_bycode($code)) == FALSE)
+            return $ret;
+
+        return (LoginDBItem::LoginDBItemFromRecord($user_obj));
+    }
+
     // TODO FOR DB
     function getmail($login)
     {
@@ -346,6 +399,7 @@ class BriskDB
     function match_continue($match_code, $table, $tidx)
     {
         GLOBAL $G_dbpfx;
+        $sql_ttok = escsql($table->table_token);
 
         if (($users = $this->users_get($match_code, FALSE /*without minmaxidx*/, TRUE /*new game*/)) == FALSE) {
             log_crit(sprintf("%s::%s: retrieve users fails", __CLASS__, __FUNCTION__));
@@ -414,10 +468,20 @@ class BriskDB
         $gam_obj = pg_fetch_object($gam_pg, 0);
 
         $table->old_reason = game_description($gam_obj->act, 'html', $gam_obj->mult,
-                                              $gam_obj->asta_win, $users[$gam_obj->asta_win]['login'],
-                                              $gam_obj->friend, $users[$gam_obj->friend]['login'],
+                                              $gam_obj->asta_win, ($gam_obj->asta_win != -1 ?
+                                                                   $users[$gam_obj->asta_win]['login'] : ""),
+                                              $gam_obj->friend, ($gam_obj->friend != -1 ?
+                                                                 $users[$gam_obj->friend]['login'] : ""),
                                               $gam_obj->pnt, $gam_obj->asta_pnt);
 
+        // update matches with new ttok and table idx
+        $mtc_sql = sprintf("UPDATE %sbin5_matches SET (ttok, tidx) = ('%s', %d) WHERE code = %d RETURNING *;",
+                           $G_dbpfx, $sql_ttok, $tidx, $match_code);
+        if (($mtc_pg  = $this->query($mtc_sql)) == FALSE || pg_numrows($mtc_pg) != 1) {
+            log_crit(sprintf("%s::%s: update matches table failed", __CLASS__, __FUNCTION__));
+            return (FALSE);
+        }
+
         return (TRUE);
     }