X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=41e1c1e930180e1596b625b9d4df75550cf82240;hb=98937b122c56a9fd52903551e1e9ca8df50be65b;hp=11b808f6326b132436e2769bd20648d46f8967b6;hpb=1fa5c579ed75be5f76de133e638855d7b966680d;p=brisk.git diff --git a/web/Obj/user.phh b/web/Obj/user.phh index 11b808f..41e1c1e 100644 --- a/web/Obj/user.phh +++ b/web/Obj/user.phh @@ -83,8 +83,8 @@ $mlang_indrd = array( class User { var $room; // reference to the room where the user is registered - var $idx; // index in the users array when you are in game - var $idx_orig; // index in the users array when you aren't in game + var $idx; // index in the room users array when you are in game + var $idx_orig; // index in the room table users array when you aren't in game var $code; // authentication code var $name; // name of the user var $sess; // session of the user @@ -108,6 +108,7 @@ class User { 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 $rd_is_chunked; // is the transport chunked or not ? var $comm; // commands array // var $asta_card; // @@ -168,6 +169,7 @@ class User { $thiz->rd_cache = ""; $thiz->rd_zls = FALSE; $thiz->rd_transp = NULL; + $thiz->rd_is_chunked = FALSE; $thiz->asta_card = -2; $thiz->asta_pnt = -1; @@ -330,6 +332,7 @@ class User { $this->rd_kalive = $curtime + RD_KEEPALIVE_TOUT; $this->rd_zls = ZLibStream::create($enc); $this->rd_transp = Transport::create($transp); + $this->rd_is_chunked = $this->rd_transp->is_chunked(); } function rd_socket_get() { @@ -510,7 +513,7 @@ class User { xcape($this->name,ENT_COMPAT,"UTF-8"))); } - /* INDEX_RD_IFRA PORT */ + /* INDEX_RD PORT */ static function blocking_error($is_unrecoverable) { @@ -528,20 +531,21 @@ class User { return (sprintf('createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); xstm.stop(); window.onunload = null; window.onbeforeunload = null; document.location.assign("%s");', $table_idx, $table_token, $page)); } - - - - protected function maincheck($cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_subst, &$new_step, $splashdate, $table_idx, $table_token) + protected function maincheck($cur_stat, $cur_subst, $cur_step, $get, $post, $cookie) { GLOBAL $G_lang, $mlang_indrd; // GLOBAL $first_loop; GLOBAL $G_with_splash, $G_splash_content, $G_splash_interval, $G_splash_idx; GLOBAL $G_splash_w, $G_splash_h, $G_splash_timeout; - $CO_splashdate = "CO_splashdate".$G_splash_idx; - $$CO_splashdate = $splashdate; - + GLOBAL $G_lice_vers, $G_lice_fname, $G_lice_dthard, $G_lice_dtsoft, $G_lice_idx; + GLOBAL $S_load_stat; + $CO_splashdate = "CO_splashdate".$G_splash_idx; + + if (($splashdate = gpcs_var("$CO_splashdate", $get, $post, $cookie)) === FALSE) + $splashdate = ""; + log_rd("maincheck begin"); $ret = FALSE; @@ -584,8 +588,8 @@ class User { $curtime = time(); if ($G_with_splash && - ($$CO_splashdate < $curtime - $G_splash_interval || - $$CO_splashdate > $curtime)) { + ($splashdate < $curtime - $G_splash_interval || + $splashdate > $curtime)) { $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), @@ -599,9 +603,9 @@ class User { // TODO uncomment and test /* NOTE the sets went common */ - $new_stat = $this->stat; - $new_subst = $this->subst; - $new_step = $this->step; + $this->rd_stat = $this->stat; + $this->rd_subst = $this->subst; + $this->rd_step = $this->step; } /*************** * * @@ -631,17 +635,23 @@ class User { return ($this->page_sync($this->sess, ($to_stat == "table" ? "briskin5/index.php" : "index.php"), $this->table, $this->table_token)); } log_rd2("lost history, refresh from scratch"); - $new_step = -1; + $this->rd_step = -1; break; } for ($i = $cur_step ; $i < $this->step ; $i++) { $ii = $i % COMM_N; log_rd2("ADDED TO THE STREAM: ".$this->comm[$ii]); + if ($this->comm[$ii] == "") { + if ($i == $cur_step) + continue; + else + break; + } $ret .= $this->comm[$ii]; } - $new_stat = $this->stat; - $new_subst = $this->subst; - $new_step = $this->step; + $this->rd_stat = $this->stat; + $this->rd_subst = $this->subst; + $this->rd_step = $this->step; } while (0); log_rd2($this->step, 'index_rd.php: after ret set'); @@ -696,13 +706,13 @@ 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(); printf("CLASS: [%s] base: [%s]\n", get_class($this), self::base_get()); - log_load("index_rd_ifra_init.php"); + log_load("index_rd_init.php"); if (($from = gpcs_var('from', $get, $post, $cookie)) === FALSE) $from = ""; @@ -717,23 +727,19 @@ 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); + $ret = $this->rd_transp->init($enc, $header, &$header_out, $init_string, self::base_get(), $this->rd_scristp); + + if ($ret === FALSE) { + return FALSE; + } + + $body .= $ret; return TRUE; } function stream_main(&$body, $get, $post, $cookie) { - GLOBAL $G_splash_idx; - - $CO_splashdate = "CO_splashdate".$G_splash_idx; - if (($splashdate = gpcs_var("$CO_splashdate", $get, $post, $cookie)) === FALSE) - $splashdate = ""; - if (($table_idx = gpcs_var("table_idx", $get, $post, $cookie)) === FALSE) - $table_idx = ""; - if (($table_token = gpcs_var("table_token", $get, $post, $cookie)) === FALSE) - $table_token = ""; - log_rd2("FROM OUTSIDE - STAT: ".$this->rd_stat." SUBST: ".$this->rd_subst." STEP: ".$this->rd_step." FROM: ".$this->rd_from); @@ -743,7 +749,7 @@ function stream_main(&$body, $get, $post, $cookie) $old_subst = $this->rd_subst; $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) { + if (($ret = $this->maincheck($old_stat, $old_subst, $old_step, $get, $post, $cookie)) != FALSE) { $body .= $this->rd_transp->chunk( $this->rd_scristp++, $ret); log_rd2(0, 'index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')'); } @@ -757,6 +763,11 @@ function stream_keepalive($with_ping) return ($this->rd_transp->chunk( $this->rd_scristp++, ($with_ping ? "act_ping();" : NULL))); } +function stream_close() +{ + return ($this->rd_transp->close()); +} + static function base_get() { $c = get_called_class(); @@ -779,6 +790,37 @@ function is_supp_custom() return (FALSE); } +function is_chunked() +{ + return $this->rd_is_chunked; +} + + +function chunked_content($content) +{ + if ($this->rd_zls) { + $cont_comp = $this->rd_zls->compress_chunk($content); + } + else { + $cont_comp = $content; + } + $cont_comp_l = mb_strlen($cont_comp, "ASCII"); + // printf("CHUNK: [%s]\n", $content); + + if ($this->is_chunked()) { + return (sprintf("%X\r\n", $cont_comp_l).$cont_comp."\r\n"); + } + else { + return $cont_comp; + } +} + +function chunked_fini() +{ + return sprintf("0\r\n"); +} + + } // end class User