X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=a2c382940bc8d9b6b6301cba2a91fe2570fc156f;hb=f8ae81cef2871be97c5466319efbafb23599baac;hp=a7709643659227ec8daf35863483916549dec0eb;hpb=5038893a7b944417e7777426f145e2b87f37f4c1;p=brisk.git

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index a770964..a2c3829 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -46,6 +46,10 @@ define('USER_FLAG_S_RABB',  0x800); // done
 define('USER_FLAG_S_SOCC',  0x900); // done
 define('USER_FLAG_S_BABY',  0xa00); // done
 define('USER_FLAG_S_MOP',   0xb00); // done
+define('USER_FLAG_S_BABBO',   0xc00); // done
+define('USER_FLAG_S_RENNA',   0xd00); // done
+define('USER_FLAG_S_PUPAZ',   0xe00); // done
+define('USER_FLAG_S_VISCH',   0xf00); // done
 
 define('USER_FLAG_S_ALL',   0xf00); // done
 
@@ -53,6 +57,7 @@ define('USER_FLAG_S_ALL',   0xf00); // done
 define('USER_FLAG_TY_ALL',     0xff0000); // done
 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_SUSPEND', 0x400000); // done
 define('USER_FLAG_TY_DISABLE', 0x800000); // done
@@ -116,6 +121,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
@@ -130,7 +136,7 @@ class User {
   function User() {
   }
 
-  function create(&$room, $idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
+  static function create(&$room, $idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
     if (($thiz = new User()) == FALSE)
       return (FALSE);
 
@@ -168,7 +174,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   = "";
@@ -213,6 +220,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++)
@@ -232,7 +240,7 @@ class User {
   }
 
 
-  function myclone($from)
+  static function myclone($from)
   {
     if (($thiz = new User()) == FALSE)
       return (FALSE);
@@ -242,7 +250,7 @@ class User {
     return ($thiz);
   }
   
-  function spawn($from, $table, $table_pos)
+  static function spawn($from, $table, $table_pos)
   {
     if (($thiz = new User()) == FALSE)
       return (FALSE);
@@ -277,6 +285,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;
@@ -294,7 +303,22 @@ class User {
     return ($thiz);
   }
 
-  function rd_data_set($curtime, $enc, $stat, $subst, $step, $from)
+  function flags_set($flags, $mask)
+  {
+      $flags_old = $this->flags & (~$mask);
+      $this->flags = ($flags_old | ($flags & $mask));
+  }
+
+  function store_set()
+  {
+      if (($bdb = BriskDB::create()) == FALSE) {
+          return FALSE;
+      }
+      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)
   {
       $this->rd_endtime = $curtime + RD_ENDTIME_DELTA;
       $this->rd_stat    = $stat;
@@ -304,7 +328,7 @@ class User {
       $this->rd_scristp = 0;
       $this->rd_kalive  = $curtime + RD_KEEPALIVE_TOUT;
       $this->rd_zls     = ZLibStream::create($enc);
-      $this->rd_transp  = new Transport_iframe();
+      $this->rd_transp  = Transport::create($transp);
   }
 
   function rd_socket_get() {
@@ -461,7 +485,7 @@ class User {
 
   function reset() {
     $curtime = time();
-    log_legal($curtime, 'xxx', $this, "STAT:LOGOUT", '');
+    log_legal($curtime, $this->ip, $this, "STAT:LOGOUT", '');
 
     $tmp_sess = $this->sess;
     $this->sess = "";
@@ -564,7 +588,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);
@@ -647,13 +672,13 @@ class User {
       return ($ret);
   }  //   function maincheck (...
 
-  public static function stream_fini($init_string, $is_unrecoverable)
+  public static function stream_fini($transp, $init_string, $is_unrecoverable)
 {
     printf("xXx user::stream_fini\n");
 
     // FIXME: dynamic "Transport_" type
-    $tans_class = "Transport_iframe";
-    $body = $tans_class::fini($init_string, self::base_get(), static::blocking_error($is_unrecoverable));
+    $trans_class = Transport::gettype($transp);
+    $body = $trans_class::fini($init_string, self::base_get(), static::blocking_error($is_unrecoverable));
 
     // ELSE IF XHR THEN:
     // return (static::blocking_error($is_unrecoverable));
@@ -675,8 +700,6 @@ function stream_init($init_string, $enc, &$header_out, &$body, $get, $post, $coo
     $curtime = time();
     
     printf("CLASS: [%s] base: [%s]\n", get_class($this), self::base_get());
-    
-    // (webservers_exceeded() || stristr($HTTP_USER_AGENT, "Mozilla/5.0 (Windows NT 6.1; rv:5.0)") || stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_AGENT, "CHROME") ? TRUE : FALSE);
 
     log_load("index_rd_ifra_init.php");
     
@@ -688,8 +711,10 @@ function stream_init($init_string, $enc, &$header_out, &$body, $get, $post, $coo
         $subst = "";
     if (($step  = gpcs_var('step', $get, $post, $cookie)) === FALSE) 
         unset($step);
+    if (($transp  = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
+        $transp = "iframe";
     
-    $this->rd_data_set($curtime, $enc, $stat, $subst, $step, $from);
+    $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);
 
@@ -738,6 +763,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