X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=55562e044d8f9241e852a59198d536488fffce22;hb=c0a2e9fabf68a881b9aa2c77c04dd12b9b098785;hp=f52bc3ee65f6f857cbe8bab7f6e51242004fe068;hpb=9a17da4020740578e3a744630fd6be96c8237cab;p=brisk.git

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index f52bc3e..55562e0 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
@@ -513,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)
   {
@@ -532,9 +532,7 @@ class User {
   }
 
 
-
-
-  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, $splashdate, $table_idx, $table_token)
   {
       GLOBAL $G_lang, $mlang_indrd;
       // GLOBAL $first_loop;
@@ -602,9 +600,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;
           }
           /***************
            *             *
@@ -634,17 +632,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');
@@ -699,13 +703,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 = "";
@@ -720,7 +724,13 @@ 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;
   }
@@ -746,7 +756,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, $splashdate, $table_idx, $table_token)) != FALSE) {
         $body .= $this->rd_transp->chunk( $this->rd_scristp++, $ret);
         log_rd2(0, 'index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')');
     }
@@ -760,6 +770,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();
@@ -803,7 +818,7 @@ function chunked_content($content)
         return (sprintf("%X\r\n", $cont_comp_l).$cont_comp."\r\n");
     }
     else {
-        return $content;
+        return $cont_comp;
     }
 }