X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=94a8940b6043d36e741b99ed8ec8cdeb010e8a56;hb=879ef1677b59eb159d0b9982a8fb5b056f13bff7;hp=28ebe2c527036f397b91fa52efe5faf5ef8db000;hpb=2866ca461e9916336ef73fd199210955ab34cbb6;p=brisk.git diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index 28ebe2c..94a8940 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -720,48 +720,14 @@ class Bin5_user extends User { return ($ret); } - public static function stream_fini($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)) ); - // ELSE IF XHR THEN: - // return (self::blocking_error($is_unrecoverable)); - return ($body); -} - - protected function blocking_error($is_unrecoverable) { - GLOBAL $is_page_streaming; - - $is_page_streaming = TRUE; 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");')); } protected function page_sync($sess, $page) { - GLOBAL $is_page_streaming; - - $is_page_streaming = TRUE; log_rd2("PAGE_SYNC"); printf("xXx BIN5_USER::PAGE_SYNC\n"); return (sprintf('xstm.stop(); window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page)); @@ -769,7 +735,7 @@ push(\"%s\"); protected function maincheck($cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_subst, &$new_step, $splashdate, $table_idx, $table_token) { - GLOBAL $G_lang, $mlang_indrd, $is_page_streaming; + GLOBAL $G_lang, $mlang_indrd; 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; @@ -795,10 +761,9 @@ push(\"%s\"); $S_load_stat['wR_minusone']++; - if ($this->the_end == TRUE) { - log_rd2("main_check: the end".var_export(debug_backtrace())); - $is_page_streaming = TRUE; - } + // if ($this->the_end == TRUE) { + // log_rd2("main_check: the end".var_export(debug_backtrace())); + // } if ($this->trans_step != -1) { log_rd2("TRANS USATO ".$this->trans_step);