X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=d5e82ee4ac5d60cd58b239dad924e765436e8828;hb=d841ff52fc567de174bad9323d6bce06825f3762;hp=70441e83b49507bc41b3621e4a5bebcc1985f479;hpb=c44fdb25ba51dd26cf59b93ea0edb88331510aab;p=brisk.git diff --git a/web/Obj/user.phh b/web/Obj/user.phh index 70441e8..d5e82ee 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 @@ -98,6 +105,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; // @@ -156,6 +164,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; @@ -289,7 +298,7 @@ class User { return ($thiz); } - function rd_data_set($curtime, $enc, $stat, $subst, $step, $from) + function rd_data_set($curtime, $transp, $enc, $stat, $subst, $step, $from) { $this->rd_endtime = $curtime + RD_ENDTIME_DELTA; $this->rd_stat = $stat; @@ -299,6 +308,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 +465,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 = ""; @@ -641,29 +651,14 @@ 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) { - $cla = get_called_class(); printf("xXx user::stream_fini\n"); - // IF IFRAME THEN: - $body = ""; - $body .= sprintf(" - - - - - -"); - $body .= sprintf("\n", $init_string); - $body .= sprintf("", 0, escpush(static::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 (static::blocking_error($is_unrecoverable)); return ($body); @@ -687,12 +682,6 @@ function stream_init($init_string, $enc, &$header_out, &$body, $get, $post, $coo // (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) @@ -703,25 +692,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; } @@ -747,11 +724,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); @@ -761,12 +734,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()