add ip2int and int2ip functions to be able to store on pg IPV4 ip addresses

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

diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh
index 73712ed..b882c63 100644 (file)
--- a/web/Obj/dbase_pgsql.phh
+++ b/web/Obj/dbase_pgsql.phh
@@ -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) ) {