/*
* 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
var $db = FALSE;
function DBConn()
+ {
+ $this->db = DBConn::$dbcnnx;
+ }
+
+ static function create()
{
GLOBAL $G_dbauth;
if (DBConn::$dbcnnx == FALSE) {
- if (!(DBConn::$dbcnnx = @pg_connect ($G_dbauth))) {
- echo "DB connection failed.";
- exit;
+ if (!(DBConn::$dbcnnx = @pg_connect ($G_dbauth, PGSQL_CONNECT_FORCE_NEW))) {
+ return (FALSE);
}
}
- $this->db = DBConn::$dbcnnx;
- return;
+ $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);
var $item;
var $item_n;
- function BriskDB()
+ function BriskDB($dbconn)
+ {
+ $this->dbconn = $dbconn;
+ }
+
+ static function create()
{
- GLOBAL $DOCUMENT_ROOT, $G_dbpfx, $G_false;
+ GLOBAL $DOCUMENT_ROOT, $G_dbpfx;
+
+ $ret = FALSE;
+
log_main("BriskDB create:start");
- $this->dbconn = new DBConn();
+ do {
+ if (($dbconn = DBConn::create()) == FALSE) {
+ break;
+ }
+
+ $ret = new BriskDB($dbconn);
+ } while (0);
- log_main("BriskDB create:end");
+ 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()
/* check the existence of the nick in the BriskDB */
log_main("login_exists: ".$login);
- $user_sql = sprintf("SELECT * FROM %susers WHERE login = lower('%s');", $G_dbpfx, escsql($login));
- if (($user_pg = pg_query($this->dbconn->db(), $user_sql)) != FALSE)
+ $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 = $this->query($user_sql)) != FALSE)
if (pg_numrows($user_pg) == 1)
return TRUE;
return FALSE;
}
- function &getrecord_bylogin($login) {
- GLOBAL $G_false, $G_dbpfx;
+ function getrecord_bylogin($login) {
+ GLOBAL $G_dbpfx;
- $user_sql = sprintf("SELECT * FROM %susers WHERE login = lower('%s');", $G_dbpfx, escsql($login));
- if (($user_pg = pg_query($this->dbconn->db(), $user_sql)) == FALSE)
- return $ret;
-
+ $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 = $this->query($user_sql)) == FALSE) {
+ return FALSE;
+ }
if (pg_numrows($user_pg) != 1)
- return $ret;
+ return FALSE;
$user_obj = pg_fetch_object($user_pg, 0);
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)
+ function login_verify($login, $pass)
{
- GLOBAL $G_dbpfx, $G_false;
+ GLOBAL $G_dbpfx;
- $ret = &$G_false;
+ $ret = FALSE;
log_main("login_verify: ".$login);
//O for ($i = 0 ; $i < $this->item_n ; $i++) {
//O log_main("login_verify: BEGIN");
- if (($user_obj = $this->getrecord_bylogin($login)) == FALSE)
- return $ret;
+ if (($user_obj = $this->getrecord_bylogin($login)) == FALSE) {
+ return FALSE;
+ }
log_main("login[".$user_obj->code."]: ".$user_obj->login);
/* if it exists check for a valid challenge */
- if (($a_sem = Challenges::lock_data()) != FALSE) {
+ if (($a_sem = Challenges::lock_data(TRUE)) != FALSE) {
if (($chals = &Challenges::load_data()) != FALSE) {
for ($e = 0 ; $e < $chals->item_n ; $e++) {
-
log_main("challenge[".$e."]: ".$chals->item[$e]->login);
if (strcmp($login, $chals->item[$e]->login) == 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) {
+ if (strcmp($pass, md5($chals->item[$e]->token.$user_obj->pass)) == 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);
- return ($ret);
- //O break;
+ break;
}
}
} // end for ($e = 0 ...
return ($ret);
}
- function &getitem_bylogin($login, &$id) {
- GLOBAL $G_false;
-
- $ret = &$G_false;
+ function getitem_bylogin($login, &$id) {
+ $ret = FALSE;
$id = -1;
log_main("getitem_bylogin: ".$login);
for ($i = 0 ; $i < $olddb->count() ; $i++) {
$user_sql = sprintf("INSERT INTO %susers ( login, pass, email, type) VALUES ('%s', '%s', '%s', %d);",
- $G_dbpfx, escsql($olddb->item[$i]->login), escsql($olddb->item[$i]->pass),
+ $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;
return TRUE;
}
- function &getdbconn()
+ function getdbconn()
{
- $ret = $this->dbconn;
- return ($ret);
+ return ($this->dbconn);
}
// ttok text UNIQUE,
log_main("bin5_points_save: ");
do {
- if (pg_query($this->dbconn->db(), "BEGIN") == FALSE) {
+ if ($this->query("BEGIN") == FALSE) {
break;
}
$is_trans = TRUE;
* 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;
$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;
$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;
if ($i < $n)
break;
- if (pg_query($this->dbconn->db(), "COMMIT") == FALSE) {
+ if ($this->query("COMMIT") == FALSE) {
break;
}
} while (0);
if ($is_trans)
- pg_query($this->dbconn-db(), "ROLLBACK");
+ $this->query("ROLLBACK");
return $ret;
}
return ($this->item_n);
}
+} // End class LoginDBOld
-
-}
-
-
- if (0 == 1) {
-
-
-
-
-
-
- function count()
- {
- // sprintf("select count(code) from %sbrisk");
- return ($this->item_n);
- }
-
- function getlogin_byidx($idx)
- {
- if ($idx >= $this->item_n)
- return FALSE;
- return ($this->item[$idx]->login);
- }
-
- function &getitem_bylogin($login, &$id)
- {
- GLOBAL $G_false;
-
- log_main("login_exists: ".$login);
-
- /* check the existence of the nick in the LoginDB */
- for ($i = 0 ; $i < $this->item_n ; $i++) {
- if (strcasecmp($this->item[$i]->login, $login) == 0) {
- log_main("login[".$i."]: ".$this->item[$i]->login);
- $ret = &$this->item[$i];
- $id = $i;
- return ($ret);
- }
- }
- $id = -1;
- return ($G_false);
- }
-
- function getmail($login)
- {
- log_main("getmail");
-
- /* check the existence of the nick in the LoginDB */
- for ($i = 0 ; $i < $this->item_n ; $i++) {
- if (strcasecmp($this->item[$i]->login, $login) == 0) {
- log_main("login[".$i."]: ".$this->item[$i]->login);
- return ($this->item[$i]->email);
- }
- }
- return (FALSE);
- }
-
- function gettype($login)
- {
- log_main("getmail");
-
- /* check the existence of the nick in the LoginDB */
- for ($i = 0 ; $i < $this->item_n ; $i++) {
- if (strcasecmp($this->item[$i]->login, $login) == 0) {
- log_main("login[".$i."]: ".$this->item[$i]->login);
- return ($this->item[$i]->type);
- }
- }
- return (FALSE);
- }
-
- function &login_verify($login, $pass)
- {
- GLOBAL $G_false;
-
- $ret = &$G_false;
-
- log_main("login_verify: ".$login);
-
- /* check the existence of the nick in the LoginDB */
- for ($i = 0 ; $i < $this->item_n ; $i++) {
- log_main("login_verify: LOOP");
- if (strcasecmp($this->item[$i]->login, $login) == 0) {
- log_main("login[".$i."]: ".$this->item[$i]->login);
-
- /* if it exists check for a valid challenge */
- if (($a_sem = Challenges::lock_data()) != FALSE) {
-
- if (($chals = &Challenges::load_data()) != FALSE) {
- for ($e = 0 ; $e < $chals->item_n ; $e++) {
-
- log_main("challenge[".$i."]: ".$chals->item[$e]->login);
- if (strcmp($login, $chals->item[$e]->login) == 0) {
- log_main("login_verify [".$pass."] with [".md5($chals->item[$e]->token.$this->item[$i]->pass)."]");
-
- if (strcmp($pass , md5($chals->item[$e]->token.$this->item[$i]->pass)) == 0) {
- log_main("login_verify SUCCESS for ".$login);
-
- $chals->rem($login);
- $ret = &$this->item[$i];
- break;
- }
- }
- } // end for ($e = 0 ...
- }
-
- if ($chals->ismod()) {
- Challenges::save_data(&$chals);
- }
-
- Challenges::unlock_data($a_sem);
- }
- break;
- } // if (strcasecmp($this->item[$i]->login, ...
- }
-
- return ($ret);
- }
-
- } // if (0 == 1) {
-
-
-?>
\ No newline at end of file
+?>
projects / brisk.git / blobdiff