X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fdbase_pgsql.phh;h=3e7a731edca41ef988d49214f9b35e0217d2f848;hb=3ebedb90c5d41ce34cf4dd9dba00f12fb78d024a;hp=004edb91a89f343bd4151ed9654d3b1f06a5ec0d;hpb=312a6acc00ec7f331ab461894c319776eec95cae;p=brisk.git diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh index 004edb9..3e7a731 100644 --- a/web/Obj/dbase_pgsql.phh +++ b/web/Obj/dbase_pgsql.phh @@ -2,7 +2,7 @@ /* * brisk - dbase_pgsql.phh * - * Copyright (C) 2006-2011 Matteo Nastasi + * Copyright (C) 2006-2012 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -49,15 +49,31 @@ class DBConn GLOBAL $G_dbauth; if (DBConn::$dbcnnx == FALSE) { - if (!(DBConn::$dbcnnx = @pg_connect ($G_dbauth))) { + if (!(DBConn::$dbcnnx = @pg_connect ($G_dbauth, PGSQL_CONNECT_FORCE_NEW))) { return (FALSE); } } $out = new DBConn(); - + return $out; } + + static function destroy() + { + if (DBConn::$dbcnnx != FALSE) { + DBConn::$dbcnnx = FALSE; + return (pg_close(DBConn::$dbcnnx)); + } + return TRUE; + } + + static function recover() + { + self::destroy(); + return (self::create()); + } + function db() { return ($this->db); @@ -84,8 +100,9 @@ class BriskDB log_main("BriskDB create:start"); do { - if (($dbconn = DBConn::create()) == FALSE) + if (($dbconn = DBConn::create()) == FALSE) { break; + } $ret = new BriskDB($dbconn); } while (0); @@ -93,6 +110,18 @@ class BriskDB return ($ret); } + function query($sql) + { + if (($res = pg_query($this->dbconn->db(), $sql)) == FALSE) { + // try to recover the connection + if (($this->dbconn = DBConn::recover()) == FALSE) + return FALSE; + return (pg_query($this->dbconn->db(), $sql)); + } + + return ($res); + } + function users_load() { } @@ -106,7 +135,7 @@ class BriskDB $user_sql = sprintf("SELECT * FROM %susers WHERE login = lower('%s') AND (type & CAST (X'%08x' as integer)) = 0;", $G_dbpfx, escsql($login), USER_FLAG_TY_DISABLE); - if (($user_pg = pg_query($this->dbconn->db(), $user_sql)) != FALSE) + if (($user_pg = $this->query($user_sql)) != FALSE) if (pg_numrows($user_pg) == 1) return TRUE; @@ -117,9 +146,9 @@ class BriskDB GLOBAL $G_dbpfx; $user_sql = sprintf("SELECT * FROM %susers WHERE login = lower('%s') AND (type & CAST (X'%08x' as integer)) = 0;", $G_dbpfx, escsql($login), USER_FLAG_TY_DISABLE); - if (($user_pg = pg_query($this->dbconn->db(), $user_sql)) == FALSE) + if (($user_pg = $this->query($user_sql)) == FALSE) { return FALSE; - + } if (pg_numrows($user_pg) != 1) return FALSE; @@ -128,7 +157,21 @@ class BriskDB return ($user_obj); } + function user_update_login_time($id, $lintm) + { + GLOBAL $G_dbpfx; + + $user_sql = sprintf("UPDATE %susers SET (lintm) = (date 'epoch' + %d * INTERVAL '1 second') WHERE code = %d;", $G_dbpfx, $lintm, $id); + + // $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; + } + return TRUE; + } function login_verify($login, $pass) { @@ -150,29 +193,23 @@ class BriskDB log_main("login[".$user_obj->code."]: ".$user_obj->login); /* if it exists check for a valid challenge */ - if (($a_sem = Challenges::lock_data()) != FALSE) { - // error_log("loop-2", 0); + if (($a_sem = Challenges::lock_data(TRUE)) != FALSE) { if (($chals = &Challenges::load_data()) != FALSE) { - // error_log("loop-1", 0); for ($e = 0 ; $e < $chals->item_n ; $e++) { - // error_log("loop", 0); log_main("challenge[".$e."]: ".$chals->item[$e]->login); if (strcmp($login, $chals->item[$e]->login) == 0) { - // error_log("loop2", 0); log_main("login_verify [".$pass."] with [".md5($chals->item[$e]->token.$user_obj->pass)."]"); if (strcmp($pass, md5($chals->item[$e]->token.$user_obj->pass)) == 0) { - // error_log("loop3", 0); log_main("login_verify SUCCESS for ".$login); $chals->rem($login); + $this->user_update_login_time($user_obj->code, time()); $ret = LoginDBItem::LoginDBItemFromRecord($user_obj); - // error_log("dbitem: ".print_r($ret, TRUE)); break; } } } // end for ($e = 0 ... - // error_log("end loop-1", 0); } if ($chals->ismod()) { @@ -220,10 +257,8 @@ class BriskDB $user_sql = sprintf("INSERT INTO %susers ( login, pass, email, type) VALUES ('%s', '%s', '%s', %d);", $G_dbpfx, escsql(strtolower($olddb->item[$i]->login)), escsql($olddb->item[$i]->pass), escsql($olddb->item[$i]->email), $olddb->item[$i]->type & USER_FLAG_TY_ALL); - - // if ( ! (($user_pg = pg_exec($dbconn,$order_add_sql)) != FALSE && pg_affected_rows($order_pg) == 1) ) { - if ( ! (($user_pg = pg_query($this->dbconn->db(), $user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) { + if ( ! (($user_pg = $this->query($user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) { $cont .= sprintf("ERROR IN LINE: %s\n", eschtml($user_sql)); return FALSE; @@ -251,7 +286,7 @@ class BriskDB log_main("bin5_points_save: "); do { - if (pg_query($this->dbconn->db(), "BEGIN") == FALSE) { + if ($this->query("BEGIN") == FALSE) { break; } $is_trans = TRUE; @@ -260,11 +295,11 @@ class BriskDB * matches management */ $mtc_sql = sprintf("SELECT * FROM %sbin5_matches WHERE ttok = '%s';", $G_dbpfx, escsql($ttok)); - if (($mtc_pg = pg_query($this->dbconn->db(), $mtc_sql)) == FALSE || pg_numrows($mtc_pg) != 1) { + if (($mtc_pg = $this->query($mtc_sql)) == FALSE || pg_numrows($mtc_pg) != 1) { // match not exists, insert it $mtc_sql = sprintf("INSERT INTO %sbin5_matches (ttok, tidx) VALUES ('%s', %d) RETURNING *;", $G_dbpfx, escsql($ttok), $tidx); - if ( ! (($mtc_pg = pg_query($this->dbconn->db(), $mtc_sql)) != FALSE && + if ( ! (($mtc_pg = $this->query($mtc_sql)) != FALSE && pg_affected_rows($mtc_pg) == 1) ) { log_crit(sprintf("bin5_points_save: failed at insert match [%s]", $mtc_sql)); break; @@ -278,7 +313,7 @@ class BriskDB $gam_sql = sprintf("INSERT INTO %sbin5_games (mcode, tstamp) VALUES (%d, to_timestamp(%d)) RETURNING *;", $G_dbpfx, $mtc_obj->code, $date); - if ( ! (($gam_pg = pg_query($this->dbconn->db(), $gam_sql)) != FALSE && + if ( ! (($gam_pg = $this->query($gam_sql)) != FALSE && pg_affected_rows($gam_pg) == 1) ) { log_crit(sprintf("bin5_points_save: failed at insert game [%s]", $gam_sql)); break; @@ -294,7 +329,7 @@ class BriskDB $pts_sql = sprintf("INSERT INTO %sbin5_points (gcode, ucode, pts) VALUES (%d, %d, %d);", $G_dbpfx, $gam_obj->code, $ucodes[$i], $pts[$i]); - if ( ! (($pts_pg = pg_query($this->dbconn->db(), $pts_sql)) != FALSE && + if ( ! (($pts_pg = $this->query($pts_sql)) != FALSE && pg_affected_rows($pts_pg) == 1) ) { log_crit(sprintf("bin5_points_save: failed at insert point [%s]", $pts_sql)); break; @@ -304,7 +339,7 @@ class BriskDB if ($i < $n) break; - if (pg_query($this->dbconn->db(), "COMMIT") == FALSE) { + if ($this->query("COMMIT") == FALSE) { break; } @@ -314,7 +349,7 @@ class BriskDB } while (0); if ($is_trans) - pg_query($this->dbconn-db(), "ROLLBACK"); + $this->query("ROLLBACK"); return $ret; } @@ -348,4 +383,4 @@ class LoginDBOld } // End class LoginDBOld -?> \ No newline at end of file +?>