X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fdbase_pgsql.phh;h=f7cb1a94e60f4ee37cb3616270972a0231846306;hb=66f94441ec85a5555c7280aff03ba7e5d661c364;hp=6bdb294de49f86769a6a71d5d6cdbcd02cc88032;hpb=ea90fe3a8a0952838a454d3613952597b1e58959;p=brisk.git diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh index 6bdb294..f7cb1a9 100644 --- a/web/Obj/dbase_pgsql.phh +++ b/web/Obj/dbase_pgsql.phh @@ -2,7 +2,7 @@ /* * brisk - dbase_pgsql.phh * - * Copyright (C) 2006-2012 Matteo Nastasi + * Copyright (C) 2006-2015 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -122,6 +122,11 @@ class BriskDB return ($res); } + function last_error() + { + return pg_last_error($this->dbconn->db); + } + function users_load() { } @@ -133,8 +138,8 @@ class BriskDB /* check the existence of the nick in the BriskDB */ log_main("login_exists: ".$login); - $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); + $user_sql = sprintf("SELECT * FROM %susers WHERE login = lower('%s')", + $G_dbpfx, escsql($login)); if (($user_pg = $this->query($user_sql)) != FALSE) if (pg_numrows($user_pg) == 1) return TRUE; @@ -160,9 +165,9 @@ class BriskDB function user_add($login, $pass, $email, $type, $disa_reas, $guar_code) { GLOBAL $G_dbpfx; - $usr_sql = sprintf("INSERT INTO %susers (login, pass, email, type, disa_reas, guar_code) - VALUES ('%s', '%s', '%s', %d, %d, %d) RETURNING *;", - $G_dbpfx, escsql(strtolower($login)), escsql($pass), escsql($email), + $usr_sql = sprintf("INSERT INTO %susers (login, pass, email, type, disa_reas, guar_code, lintm) + VALUES ('%s', '%s', '%s', %d, %d, %d, now()) RETURNING *;", + $G_dbpfx, escsql(strtolower($login)), escsql($pass), escsql($email), $type, $disa_reas, $guar_code); if (! (($usr_pg = $this->query($usr_sql)) != FALSE && pg_affected_rows($usr_pg) == 1) ) { @@ -185,6 +190,66 @@ class BriskDB return (TRUE); } + /* + $laddr is native php int (32 or 64 bit) + if ret True is ip is free + */ + function selfreg_check($laddr) + { + GLOBAL $G_dbpfx, $G_selfreg_tout, $G_selfreg_mask; + + $sere_sql = sprintf("DELETE from %sselfreg_chk WHERE atime < now();", $G_dbpfx); + if (($sere_pg = $this->query($sere_sql)) == FALSE) { + return (FALSE); + } + + if (($sere_pg = $this->query($sere_sql)) == FALSE) { + return (FALSE); + } + + $sere_sql = sprintf("SELECT * FROM %sselfreg_chk WHERE (ip & %d) = %d;", + $G_dbpfx, int2four($G_selfreg_mask), int2four($laddr & $G_selfreg_mask)); + if (($sere_pg = $this->query($sere_sql)) == FALSE) { + return(FALSE); + } + + $ret = pg_numrows($sere_pg); + + if ($ret === FALSE) { + return(FALSE); + } + else if ($ret === 0) { + return(TRUE); + } + else if ($ret > 0) { + // already present + return(FALSE); + } + else { + // unreachable branch + return(FALSE); + } + } + + /* + $laddr is native php int (32 or 64 bit) + if ret True is ip is free + */ + function selfreg_set($laddr) + { + GLOBAL $G_dbpfx, $G_selfreg_tout, $G_selfreg_mask; + + $newi_sql = sprintf("INSERT INTO %sselfreg_chk (ip, atime) VALUES (%d, now() + interval '%d seconds');", + $G_dbpfx, int2four($laddr & $G_selfreg_mask), $G_selfreg_tout); + if (($newi_pg = $this->query($newi_sql)) == FALSE) { + return(FALSE); + } + return(TRUE); + } + + /* + to be able to add mail record code into the record itself I must reserve it before. + */ function mail_reserve_code() { GLOBAL $G_dbpfx; @@ -249,6 +314,38 @@ class BriskDB return TRUE; } + function user_update_flag_ty($code, $type, $old_val, $old_reas, $new_val, $new_reas) + { + GLOBAL $G_dbpfx; + + $user_sql = sprintf("UPDATE %susers SET (type, disa_reas) + = (type & ~(CAST (X'%08x' as integer)) | (CAST (X'%08x' as integer)), %d) + WHERE code = %d AND (type & (CAST (X'%08x' as integer))) + = (CAST (X'%08x' as integer)) AND disa_reas = %d;", + $G_dbpfx, $type, ($new_val ? $type : 0), $new_reas, + $code, $type, ($old_val ? $type : 0), $old_reas); + + if ( ! (($user_pg = $this->query($user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) { + return FALSE; + } + + return TRUE; + } + + function user_update_passwd($code, $passwd) + { + GLOBAL $G_dbpfx; + + $user_sql = sprintf("UPDATE %susers SET (pass) = (md5('%s')) WHERE code = %d;", + $G_dbpfx, $passwd, $code); + + if ( ! (($user_pg = $this->query($user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) { + return FALSE; + } + + return TRUE; + } + function user_prefs_update($code, $flags, $supp_comp) { GLOBAL $G_dbpfx; @@ -689,6 +786,53 @@ class BriskDB return $ret; } + function mail_add_fromitem($mail) { + GLOBAL $G_dbpfx; + + $usr_sql = sprintf(" +INSERT INTO %smails (code, ucode, type, tstamp, subj, body_txt, body_htm, hash) + VALUES (%d, %d, %d, to_timestamp(%d), '%s', '%s', '%s', '%s') RETURNING *;", + $G_dbpfx, $mail->code, $mail->ucode, $mail->type, $mail->tstamp, + escsql($mail->subj), escsql($mail->body_txt), escsql($mail->body_htm), + ($mail->hash == NULL ? "" : escsql($mail->hash)) + ); + + if (! (($usr_pg = $this->query($usr_sql)) != FALSE && pg_affected_rows($usr_pg) == 1) ) { + return FALSE; + } + $usr_obj = pg_fetch_object($usr_pg, 0); + + return $usr_obj; + } + + function mail_check($code, $type, $hash) + { + GLOBAL $G_dbpfx; + + $mai_sql = sprintf("SELECT * FROM %smails WHERE code = %d AND type = %d AND hash = '%s';", + $G_dbpfx, $code, $type, escsql($hash)); + if (($mai_pg = $this->query($mai_sql)) == FALSE || pg_numrows($mai_pg) != 1) { + // check failed + return (FALSE); + } + + $mai_obj = pg_fetch_object($mai_pg, 0); + return ($mai_obj); + } + + function mail_delete($code) + { + GLOBAL $G_dbpfx; + + $mai_sql = sprintf("DELETE FROM %smails WHERE code = %d;", $G_dbpfx, $code); + + if (($mai_pg = $this->query($mai_sql)) == FALSE || pg_affected_rows($mai_pg) != 1) { + return (FALSE); + } + return (TRUE); + } + + } // End class BriskDB class LoginDBOld