X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=97b0a3876c9263d779d0e712f85d8b9d13518237;hb=645d558d0d1411fc2c1f33c95b2783e1b0ae3e06;hp=f31d78b2bba0291d70378937de62bb7298a46802;hpb=3dc6d58fd477565017745b33c752232166a0b508;p=brisk.git

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index f31d78b..97b0a38 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -59,6 +59,7 @@ define('USER_FLAG_TY_NORM',    0x010000); // done
 define('USER_FLAG_TY_SUPER',   0x020000); // done
 define('USER_FLAG_TY_CERT',    0x040000); // done
 //  ... other usefull status ...
+define('USER_FLAG_TY_FIRONLY', 0x200000); // done
 define('USER_FLAG_TY_SUSPEND', 0x400000); // done
 define('USER_FLAG_TY_DISABLE', 0x800000); // done
 
@@ -121,6 +122,7 @@ class User {
   var $table_pos;  // idx on the table
   var $table_token;// token that identify a game on a table
   var $flags;      // Bitfield with: AUTHENTICATE: 0x02 
+  var $rec;        // field with user db record or FALSE
   var $the_end;    // Flag to change the end of the session
 
   var $chat_lst;      // Last chat line
@@ -173,7 +175,8 @@ class User {
     $thiz->exitislock = TRUE;
 
     $thiz->flags      = 0x00;
-    
+    $thiz->rec        = FALSE;
+
     $thiz->chattime   = array_fill(0, CHAT_N, 0);
     $thiz->chat_cur   = 0;
     $thiz->chat_lst   = "";
@@ -218,6 +221,7 @@ class User {
     $this->exitislock = $from->exitislock;
 
     $this->flags      = $from->flags;
+    $this->rec        = $from->rec;
 
     $this->chattime   = array();
     for ($i = 0 ; $i < CHAT_N ; $i++)
@@ -282,6 +286,7 @@ class User {
     $thiz->the_end    = $from->the_end;
 
     $thiz->flags      = $from->flags;
+    $thiz->rec        = $from->rec;
 
     $thiz->chattime   = array_fill(0, CHAT_N, 0);
     $thiz->chat_cur   = 0;
@@ -310,7 +315,8 @@ class User {
       if (($bdb = BriskDB::create()) == FALSE) {
           return FALSE;
       }
-      return ($bdb->user_update_flags($this->code, ($this->flags & (USER_FLAG_TY_ALL | USER_FLAG_MAP_AUTH))));
+      return ($bdb->user_prefs_update($this->code, ($this->flags & (USER_FLAG_TY_ALL | USER_FLAG_MAP_AUTH)),
+                                      $this->rec->supp_comp));
   }
 
   function rd_data_set($curtime, $transp, $enc, $stat, $subst, $step, $from)
@@ -583,7 +589,8 @@ class User {
                   $is_super = $this->flags & USER_FLAG_TY_SUPER;
                   $ret .=  show_notify_ex(str_replace("\n", " ", $G_splash_content[$G_lang]), 
                                           ($is_super ? 0 : $G_splash_timeout), 
-                                          $mlang_indrd[($is_super ? 'btn_btotabsup' : 'btn_backtotab')][$G_lang], 
+                                          // $mlang_indrd[($is_super ? 'btn_btotabsup' : 'btn_backtotab')][$G_lang], 
+                                          $mlang_indrd['btn_backtotab'][$G_lang], 
                                           $G_splash_w, $G_splash_h, true, 
                                           ($is_super ? 0 : $G_splash_timeout));
                   $ret .= sprintf('|createCookie("CO_splashdate%d", %d, 24*365, cookiepath);', $G_splash_idx, $curtime);
@@ -689,7 +696,7 @@ class User {
    stat
    step
 */
-function stream_init($init_string, $enc, &$header_out, &$body, $get, $post, $cookie)
+function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $post, $cookie)
 {
     $curtime = time();
     
@@ -710,7 +717,7 @@ function stream_init($init_string, $enc, &$header_out, &$body, $get, $post, $coo
     
     $this->rd_data_set($curtime, $transp, $enc, $stat, $subst, $step, $from);
     
-    $body .= $this->rd_transp->init($enc, &$header_out, $init_string, self::base_get(), $this->rd_scristp);
+    $body .= $this->rd_transp->init($enc, $header, &$header_out, $init_string, self::base_get(), $this->rd_scristp);
 
     return TRUE;
   }
@@ -757,6 +764,21 @@ static function base_get()
     return $c::BASE;
 }
 
+function is_supp_custom()
+{
+    if ($this->rec != FALSE) {
+        if ($this->flags & USER_FLAG_TY_SUPER) {
+            return (TRUE);
+        }
+        /*
+          if ($this->rec->last_dona > 1356994800) {
+              return (TRUE);
+          }
+        */
+    }
+    return (FALSE);
+}
+
 } // end class User