From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Thu, 15 Nov 2012 07:21:00 +0000 (+0100)
Subject: global is_page_streaming variable removed
X-Git-Tag: v4.1.1~7
X-Git-Url: http://mop.ddnsfree.com/gitweb/?p=brisk.git;a=commitdiff_plain;h=879ef1677b59eb159d0b9982a8fb5b056f13bff7

global is_page_streaming variable removed
---

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 0f7c46c..d42d0de 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -587,9 +587,6 @@ class User {
 
   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");'));
   }
@@ -597,12 +594,8 @@ class User {
   // FIXME TO SUPPORT iframe
   protected function page_sync($sess, $page, $table_idx, $table_token)
   {
-      GLOBAL $is_page_streaming;
-      
       // log_rd2("page_sync:".var_export(debug_backtrace()));
       
-      $is_page_streaming = TRUE;
-      
       log_rd2("PAGE_SYNC");
       printf("xXx USER::PAGE_SYNC [%s]\n", get_class($this));
       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));
@@ -613,7 +606,7 @@ class User {
 
   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 $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;
@@ -640,10 +633,9 @@ class User {
           
           $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);
@@ -796,7 +788,7 @@ function stream_init($init_string, $enc, &$header_out, &$body, $get, $post, $coo
     
     printf("CLASS: [%s] base: [%s]\n", get_class($this), self::base_get());
     
-    $is_page_streaming = FALSE; // (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);
+    // (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;
@@ -838,7 +830,7 @@ window.onload = function () { if (xynt_streaming != \"ready\") { xynt_streaming.
 
 function stream_main(&$body, $get, $post, $cookie)
 {
-    GLOBAL $is_page_streaming, $G_splash_idx;
+    GLOBAL $G_splash_idx;
 
     $CO_splashdate = "CO_splashdate".$G_splash_idx;
     if (($splashdate = gpcs_var("$CO_splashdate", $get, $post, $cookie)) === FALSE)
@@ -848,8 +840,7 @@ function stream_main(&$body, $get, $post, $cookie)
     if (($table_token = gpcs_var("table_token", $get, $post, $cookie)) === FALSE)
         $table_token = ""; 
 
-    $is_page_streaming = FALSE;
-    log_rd2("FROM OUTSIDE - STAT: ".$this->rd_stat." SUBST: ".$this->rd_subst." STEP: ".$this->rd_step." FROM: ".$this->rd_from. "IS_PAGE:" . $is_page_streaming);
+    log_rd2("FROM OUTSIDE - STAT: ".$this->rd_stat." SUBST: ".$this->rd_subst." STEP: ".$this->rd_step." FROM: ".$this->rd_from);
     
     
     $pre_main = gettimeofday(TRUE);
@@ -865,8 +856,6 @@ push(\"%s\");
 </script>", $this->rd_scristp++, escpush($ret) );
         
         log_rd2(0, 'index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')');
-        if ($is_page_streaming) 
-            return TRUE;
     }
     printf("xXx POST: rd_step %d\n", $this->rd_step);
 
diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 6190b80..94a8940 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -722,18 +722,12 @@ class Bin5_user extends User {
 
     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));
@@ -741,7 +735,7 @@ class Bin5_user extends User {
 
     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;
@@ -767,10 +761,9 @@ class Bin5_user extends User {
           
           $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);