X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fdbase_pgsql.phh;h=5f0511edcffc45f6664ca31bfd56111275effe5d;hb=f3852bd3b377919fdbb3e6a3a351a0ce62f30bac;hp=ba8fc6011ce33207812698fe340886b6c762b439;hpb=536da22ebde5fa66e0f7524e9efc0316391f1afd;p=brisk.git diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh index ba8fc60..5f0511e 100644 --- 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__)); @@ -360,7 +414,8 @@ class BriskDB $num_obj = pg_fetch_object($num_pg, 0); $table->points_n = $num_obj->points_n; - $tot_sql = sprintf("SELECT sum(p.pts) AS pts + // TAG: POINTS_MANAGEMENT + $tot_sql = sprintf("SELECT sum(p.pts * (2^g.mult)) AS pts FROM %sbin5_games AS g, %sbin5_points AS p, %susers AS u, %sbin5_table_orders AS o WHERE g.mcode = %d AND g.code = p.gcode AND p.ucode = u.code @@ -376,10 +431,11 @@ class BriskDB $u = 0; foreach ($users as $user) { - $pts_sql = sprintf("SELECT p.pts AS pts + // TAG: POINTS_MANAGEMENT + $pts_sql = sprintf("SELECT p.pts AS pts, g.mult AS mult FROM %sbin5_points as p, %sbin5_games as g WHERE p.gcode = g.code AND g.mcode = %d AND p.ucode = %d - ORDER BY g.code ASC + ORDER BY g.tstamp ASC LIMIT %d OFFSET %d;", $G_dbpfx, $G_dbpfx, $match_code, $user['code'], MAX_POINTS, @@ -396,9 +452,10 @@ class BriskDB log_crit(sprintf("%s::%s: number of points great than number of games", __CLASS__, __FUNCTION__)); return (FALSE); } + // TAG: POINTS_MANAGEMENT for ($i = 0 , $ct = $table->points_n - $pts_n; $ct < $table->points_n ; $ct++, $i++) { $pts_obj = pg_fetch_object($pts_pg, $i); - $table->points[$ct % MAX_POINTS][$u] = $pts_obj->pts; + $table->points[$ct % MAX_POINTS][$u] = $pts_obj->pts * pow(2, $pts_obj->mult); } $tot_obj = pg_fetch_object($tot_pg, $u); $table->total[$u] = $tot_obj->pts; @@ -406,7 +463,7 @@ class BriskDB $u++; } - $gam_sql = sprintf("SELECT * FROM %sbin5_games WHERE mcode = %d ORDER BY code DESC LIMIT 1;", $G_dbpfx, $match_code); + $gam_sql = sprintf("SELECT * FROM %sbin5_games WHERE mcode = %d ORDER BY tstamp DESC LIMIT 1;", $G_dbpfx, $match_code); if (($gam_pg = $this->query($gam_sql)) == FALSE || pg_numrows($gam_pg) != 1) { log_crit(sprintf("%s::%s: get last game fails", __CLASS__, __FUNCTION__)); return (FALSE); @@ -414,10 +471,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); }