X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=cf23ed8bced03363c6b9a2c288526ce95b8e2371;hb=c0a2e9fabf68a881b9aa2c77c04dd12b9b098785;hp=64c100ffdd504083f0c3181f6c6f697f727a0570;hpb=2eb2a4a01946e05b11b5309e1ed75cf7bdc9b7d2;p=brisk.git diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index 64c100f..cf23ed8 100644 --- 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');