X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fdbase_pgsql.phh;h=77c215f83940975a122a5dddf0df4c46388a7545;hb=0b13b1b5ef313a06e58d2d44ffd09670a4dd8eb5;hp=05a42f7ae83de818974f9dde0d3a2adaa84dbd60;hpb=1031fcf6dbc575d963acc2b9522cdc2940957526;p=brisk.git

diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh
index 05a42f7..77c215f 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;
@@ -157,6 +162,130 @@ class BriskDB
         return ($user_obj);
     }
 
+    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, 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) ) {
+            return FALSE;
+        }
+        $usr_obj = pg_fetch_object($usr_pg, 0);
+
+        return $usr_obj;
+    }
+
+    function transaction($cmd) {
+        if ($cmd != "BEGIN" && $cmd != "COMMIT" && $cmd != "ROLLBACK")
+            return FALSE;
+
+        $trans_sql = sprintf("%s;", $cmd);
+        if (($trans_pg  = $this->query($trans_sql)) == FALSE) {
+            return FALSE;
+        }
+
+        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;
+
+        $mail_sql = sprintf("SELECT nextval('%smails_code_seq'::regclass) AS nextval;", $G_dbpfx);
+        if (($mail_pg  = $this->query($mail_sql)) == FALSE) {
+            return FALSE;
+        }
+        if (pg_numrows($mail_pg) != 1)
+            return FALSE;
+
+        $mail_obj = pg_fetch_object($mail_pg, 0);
+
+        return ($mail_obj->nextval);
+    }
+
+    function check_record_by_login_or_email($login, $email) {
+        GLOBAL $G_dbpfx;
+
+        $arr_fie = array('login', 'email');
+        $arr_val = array($login, $email);
+
+        for ($i = 0 ; $i < 2 ; $i++) {
+            $user_sql = sprintf("SELECT * FROM %susers WHERE %s = lower('%s');",
+                                $G_dbpfx, $arr_fie[$i], escsql($arr_val[$i]));
+            if (($user_pg  = $this->query($user_sql)) == FALSE) {
+                fprintf(STDERR, "QUERY [%s]_ FALSE", $user_sql);
+                return (3);
+            }
+            if (pg_numrows($user_pg) == 1) {
+                return ($i + 1);
+            }
+        }
+
+        return (0);
+    }
+
     function getrecord_bycode($code) {
         GLOBAL $G_dbpfx;
 
@@ -185,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;
@@ -414,7 +575,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
@@ -430,10 +592,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,
@@ -450,9 +613,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;
@@ -460,7 +624,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);
@@ -545,6 +709,7 @@ class BriskDB
             /*
              * matches management
              */
+            $codes_where = "";
             $mtc_sql = sprintf("UPDATE %sbin5_matches SET (mazzo_next, mult_next) = (%d, %d) WHERE ttok = '%s' RETURNING *;",
                                $G_dbpfx, $table->mazzo, $table->mult, $sql_ttok);
             if (($mtc_pg  = $this->query($mtc_sql)) == FALSE || pg_numrows($mtc_pg) != 1) {
@@ -565,12 +730,34 @@ class BriskDB
                         log_crit(sprintf("bin5_points_save: failed at insert table order [%s]", $ord_sql));
                         break;
                     }
+                    $codes_where .= sprintf("%scode = %d", ($i == 0  ? "" : " OR "), $ucodes[$i]);
                 }
                 if ($i < $n)
                     break;
+
+                $cnt_sql = sprintf("UPDATE %susers SET (match_cnt, game_cnt)
+                                        = (match_cnt+1, game_cnt+1) WHERE %s;",
+                                   $G_dbpfx, $codes_where);
+                error_log($cnt_sql);
+                if (($cnt_pg = $this->query($cnt_sql)) == FALSE || pg_affected_rows($cnt_pg) != $n) {
+                    log_crit(sprintf("bin5_points_save: failed increment match and game [%s]", $cnt_sql));
+                    break;
+                }
             }
             else {
                 $mtc_obj = pg_fetch_object($mtc_pg,0);
+
+                for ($i = 0 ; $i < $n ; $i++) {
+                    $codes_where .= sprintf("%scode = %d", ($i == 0 ? "" : " OR "), $ucodes[$i]);
+                }
+                $cnt_sql = sprintf("UPDATE %susers SET (game_cnt)
+                                        = (game_cnt+1) WHERE %s;",
+                                   $G_dbpfx, $codes_where);
+                error_log($cnt_sql);
+                if (($cnt_pg = $this->query($cnt_sql)) == FALSE || pg_affected_rows($cnt_pg) != $n) {
+                    log_crit(sprintf("bin5_points_save: failed increment game [%s]", $cnt_sql));
+                    break;
+                }
             }
 
             /*
@@ -622,6 +809,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