stream page fast reload bug fixed

[brisk.git] / web / briskin5 / Obj / briskin5.phh
diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh

index c5ad7ce..30f33bb 100644 (file)
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -718,7 +718,37 @@ class Bin5_user extends User {
          return ($ret);
      }
  
-    static function blocking_error($is_unrecoverable)
+public static function stream_fini($is_unrecoverable)
+{
+    GLOBAL $G_four_rnd_string;
+
+    printf("xXx user::stream_fini\n");
+
+    // IF IFRAME THEN:
+    $body = "";
+    $body .= sprintf("<html>
+<head>
+<script type=\"text/javascript\" src=\"%scommons.js\"></script>
+<script type=\"text/javascript\" src=\"%sxynt-http-streaming-ifra.js\"></script>
+<script type=\"text/javascript\">
+var http_streaming = \"ready\";", self::base_get(), self::base_get());
+    $body .= sprintf("
+window.onload = function () { if (http_streaming != \"ready\") { http_streaming.reload(); } };
+</script>
+</head>
+<body>");
+    $body .= sprintf("<!-- \n%s -->\n", $G_four_rnd_string);
+    $body .= sprintf("<script id='hs%d' type='text/javascript'><!--
+push(\"%s\");
+// -->
+</script>", 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;
          
@@ -1429,6 +1459,8 @@ class Bin5 {
          if (($table_token = gpcs_var('table_token', $get, $post, $cookie)) === FALSE) 
              unset($table_token);
  
+        force_no_cache($header_out);
+
          switch ($path) {
          case "":
          case "index.php":
@@ -1437,8 +1469,6 @@ class Bin5 {
              $content = ob_get_contents();
              ob_end_clean();
          
-            force_no_cache($header_out);
-
              $s_a_p->pgflush_try_add($new_socket, 20, $header_out, $content);
              return TRUE;
          
@@ -1450,8 +1480,6 @@ class Bin5 {
              $content = ob_get_contents();
              ob_end_clean();
              
-            force_no_cache($header_out);
-
              $s_a_p->pgflush_try_add($new_socket, 20, $header_out, $content);
              return TRUE;