remove 3 maincheck arguments because after sac-a-push they are attributes of the...

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index f825c2b..55562e0 100644 (file)
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -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,7 +632,7 @@ 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++) {
@@ -648,9 +646,9 @@ class User {
                       }
                       $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');
@@ -758,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).')');
     }

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 64c100f..cf23ed8 100644 (file)
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -1010,7 +1010,7 @@ class Bin5_user extends User {
         return (sprintf('xstm.stop(); window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page));
     }
 
-    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 $G_with_splash, $G_splash_content, $G_splash_interval, $G_splash_idx;
@@ -1070,9 +1070,9 @@ class Bin5_user extends User {
           }
           log_rd2("NEWSTAT: ".$this->stat);
 
-          $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;
       } /* if ($cur_step == -1) { */
       else {
           /* $sem = Room::lock_data(FALSE); */
@@ -1090,7 +1090,7 @@ class Bin5_user extends User {
                       }
                       log_rd2("lost history, refresh from scratch");
                       printf("xXx LOST HISTORY!\n");
-                      $new_step = -1;
+                      $this->rd_step = -1;
                       break;
                   }
                   for ($i = $cur_step ; $i < $this->step ; $i++) {
@@ -1104,9 +1104,9 @@ class Bin5_user extends User {
                       log_rd2("ADDED TO THE STREAM: ".$this->comm[$ii]);
                       $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');