X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=416dbb4f77c9c9444e598a88ccc9030ee913e4f7;hb=b65dddf6cb8fdc5a98719ed170ca38c2059b362c;hp=e195019d02136821c903a194e43a5f0dc056c668;hpb=dc266dc837089b1fcd578918e73f37008b622f77;p=brisk.git diff --git a/web/Obj/user.phh b/web/Obj/user.phh index e195019..416dbb4 100644 --- a/web/Obj/user.phh +++ b/web/Obj/user.phh @@ -21,6 +21,9 @@ * Suite 330, Boston, MA 02111-1307, USA. */ +require_once("${G_base}Obj/transports.phh"); + + // User flags define('USER_FLAG_AUTH', 0x02); @@ -43,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 @@ -50,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 @@ -98,6 +106,7 @@ class User { var $rd_kalive; // if no message are sent after RD_KEEPALIVE_TOUT secs we send a keepalive from server var $rd_cache; // place where store failed fwrite data var $rd_zls; // zlibstream object handle if compressed stream, else FALSE + var $rd_transp; // class that define stream encapsulation type (iframe, xhr, ...) var $comm; // commands array // var $asta_card; // @@ -112,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 @@ -126,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); @@ -156,6 +166,7 @@ class User { $thiz->rd_kalive = -1; $thiz->rd_cache = ""; $thiz->rd_zls = FALSE; + $thiz->rd_transp = NULL; $thiz->asta_card = -2; $thiz->asta_pnt = -1; @@ -163,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 = ""; @@ -208,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++) @@ -227,7 +240,7 @@ class User { } - function myclone($from) + static function myclone($from) { if (($thiz = new User()) == FALSE) return (FALSE); @@ -237,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); @@ -272,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; @@ -289,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; @@ -299,6 +328,7 @@ class User { $this->rd_scristp = 0; $this->rd_kalive = $curtime + RD_KEEPALIVE_TOUT; $this->rd_zls = ZLibStream::create($enc); + $this->rd_transp = Transport::create($transp); } function rd_socket_get() { @@ -455,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 = ""; @@ -481,7 +511,7 @@ class User { /* INDEX_RD_IFRA PORT */ - protected function blocking_error($is_unrecoverable) + static function blocking_error($is_unrecoverable) { log_crit("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE")); return (sprintf(($is_unrecoverable ? 'xstm.stop(); ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("index.php");')); @@ -641,30 +671,16 @@ 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"); - // IF IFRAME THEN: - $body = ""; - $body .= sprintf(" - - - - - -"); - $body .= sprintf("\n", $init_string); - $body .= sprintf("", 0, escpush(self::blocking_error($is_unrecoverable)) ); + // FIXME: dynamic "Transport_" type + $trans_class = Transport::gettype($transp); + $body = $trans_class::fini($init_string, self::base_get(), static::blocking_error($is_unrecoverable)); + // ELSE IF XHR THEN: - // return (self::blocking_error($is_unrecoverable)); + // return (static::blocking_error($is_unrecoverable)); return ($body); } @@ -683,15 +699,7 @@ 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); - if ($enc != 'plain') - $header_out['Content-Encoding'] = $enc; - $header_out['Cache-Control'] = 'no-cache, must-revalidate'; // HTTP/1.1 - $header_out['Expires'] = 'Mon, 26 Jul 1997 05:00:00 GMT'; // Date in the past - $header_out['Content-type'] = 'text/html; charset="utf-8"'; - log_load("index_rd_ifra_init.php"); if (($from = gpcs_var('from', $get, $post, $cookie)) === FALSE) @@ -702,25 +710,13 @@ 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); - $cc = get_called_class(); - - $body .= sprintf(" - - - - - -"); - $body .= sprintf("\n", $init_string); + $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); + return TRUE; } @@ -746,11 +742,7 @@ function stream_main(&$body, $get, $post, $cookie) $old_step = $this->rd_step; printf("xXx PRE : rd_step %d\n", $this->rd_step); if (($ret = $this->maincheck($old_stat, $old_subst, $old_step, $this->rd_stat, $this->rd_subst, $this->rd_step, $splashdate, $table_idx, $table_token)) != FALSE) { - $body .= sprintf("", $this->rd_scristp++, escpush($ret) ); - + $body .= $this->rd_transp->chunk( $this->rd_scristp++, $ret); log_rd2(0, 'index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')'); } printf("xXx POST: rd_step %d\n", $this->rd_step); @@ -760,12 +752,7 @@ push(\"%s\"); function stream_keepalive($with_ping) { - $ret = (sprintf("", $this->rd_scristp++, ($with_ping ? "\"act_ping();\"" : "null"))); - - return ($ret); + return ($this->rd_transp->chunk( $this->rd_scristp++, ($with_ping ? "act_ping();" : NULL))); } static function base_get()