projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
omogenized function definition syntax (no space between name and parentesis
[brisk.git]
/
web
/
briskin5
/
Obj
/
briskin5.phh
diff --git
a/web/briskin5/Obj/briskin5.phh
b/web/briskin5/Obj/briskin5.phh
index
64c100f
..
4111281
100644
(file)
--- a/
web/briskin5/Obj/briskin5.phh
+++ b/
web/briskin5/Obj/briskin5.phh
@@
-1010,13
+1010,11
@@
class Bin5_user extends User {
return (sprintf('xstm.stop(); window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page));
}
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($
get, $post, $cookie
)
{
{
- GLOBAL $G_lang
, $mlang_indrd
;
+ GLOBAL $G_lang;
GLOBAL $G_with_splash, $G_splash_content, $G_splash_interval, $G_splash_idx;
GLOBAL $G_splash_w, $G_splash_h, $G_splash_timeout;
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;
- $$CO_splashdate = $splashdate;
GLOBAL $S_load_stat;
GLOBAL $S_load_stat;
@@
-1026,14
+1024,14
@@
class Bin5_user extends User {
$curtime = time();
/* Nothing changed, return. */
$curtime = time();
/* Nothing changed, return. */
- if ($
cur
_step == $this->step)
+ if ($
this->rd
_step == $this->step)
return (FALSE);
return (FALSE);
- log_rd2("do other cur_stat[".$
cur_stat."] user->stat[".$this->stat."] cur_step[".$cur
_step."] user_step[".$this->step."]");
+ log_rd2("do other cur_stat[".$
this->rd_stat."] user->stat[".$this->stat."] cur_step[".$this->rd
_step."] user_step[".$this->step."]");
- if ($
cur
_step == -1) {
+ if ($
this->rd
_step == -1) {
/*
/*
- * if $
cur
_step == -1 load the current state from the main struct
+ * if $
this->rd
_step == -1 load the current state from the main struct
*/
$S_load_stat['wR_minusone']++;
*/
$S_load_stat['wR_minusone']++;
@@
-1044,7
+1042,7
@@
class Bin5_user extends User {
if ($this->trans_step != -1) {
log_rd2("TRANS USATO ".$this->trans_step);
if ($this->trans_step != -1) {
log_rd2("TRANS USATO ".$this->trans_step);
- $
cur
_step = $this->trans_step;
+ $
this->rd
_step = $this->trans_step;
$this->trans_step = -1;
}
else {
$this->trans_step = -1;
}
else {
@@
-1054,7
+1052,7
@@
class Bin5_user extends User {
/* this part I suppose is read only on $this->room structure */
/* this part I suppose is read only on $this->room structure */
- if ($
cur
_step == -1) {
+ if ($
this->rd
_step == -1) {
log_rd2("PRE-NEWSTAT");
/***************
log_rd2("PRE-NEWSTAT");
/***************
@@
-1070,18
+1068,18
@@
class Bin5_user extends User {
}
log_rd2("NEWSTAT: ".$this->stat);
}
log_rd2("NEWSTAT: ".$this->stat);
- $
new_stat =
$this->stat;
- $
new
_subst = $this->subst;
- $
new_step =
$this->step;
- } /* if ($
cur
_step == -1) { */
+ $
this->rd_stat =
$this->stat;
+ $
this->rd
_subst = $this->subst;
+ $
this->rd_step =
$this->step;
+ } /* if ($
this->rd
_step == -1) { */
else {
/* $sem = Room::lock_data(FALSE); */
$S_load_stat['rU_heavy']++;
else {
/* $sem = Room::lock_data(FALSE); */
$S_load_stat['rU_heavy']++;
- if ($
cur
_step < $this->step) {
+ if ($
this->rd
_step < $this->step) {
do {
do {
- if ($
cur
_step + COMM_N < $this->step) {
- if (
($cur_stat != $this->stat)
) {
+ if ($
this->rd
_step + COMM_N < $this->step) {
+ if (
$this->rd_stat != $this->stat
) {
$to_stat = $this->stat;
/* Room::unlock_data($sem); */
log_load("RESYNC");
$to_stat = $this->stat;
/* Room::unlock_data($sem); */
log_load("RESYNC");
@@
-1090,13
+1088,13
@@
class Bin5_user extends User {
}
log_rd2("lost history, refresh from scratch");
printf("xXx LOST HISTORY!\n");
}
log_rd2("lost history, refresh from scratch");
printf("xXx LOST HISTORY!\n");
- $
new
_step = -1;
+ $
this->rd
_step = -1;
break;
}
break;
}
- for ($i = $
cur
_step ; $i < $this->step ; $i++) {
+ for ($i = $
this->rd
_step ; $i < $this->step ; $i++) {
$ii = $i % COMM_N;
if ($this->comm[$ii] == "") {
$ii = $i % COMM_N;
if ($this->comm[$ii] == "") {
- if ($i == $
cur
_step)
+ if ($i == $
this->rd
_step)
continue;
else
break;
continue;
else
break;
@@
-1104,9
+1102,9
@@
class Bin5_user extends User {
log_rd2("ADDED TO THE STREAM: ".$this->comm[$ii]);
$ret .= $this->comm[$ii];
}
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');
} while (0);
log_rd2($this->step, 'index_rd.php: after ret set');
@@
-1130,14
+1128,14
@@
class Bin5_user extends User {
} /* if ($this->the_end == TRUE) { ... */
} /* if ($this->the_end == TRUE) { ... */
} /* if ($this->the_end == TRUE) { ... */
} /* if ($this->the_end == TRUE) { ... */
- } /* if ($
cur
_step < $this->step) { */
+ } /* if ($
this->rd
_step < $this->step) { */
/* Room::unlock_data($sem); */
/* Room::unlock_data($sem); */
- } /* else of if ($
cur
_step == -1) { */
+ } /* else of if ($
this->rd
_step == -1) { */
return ($ret);
return ($ret);
- } // function maincheck
(...
+ } // function maincheck(...
function continue_set($match_code)
{
function continue_set($match_code)
{
@@
-1169,7
+1167,7
@@
class Bin5 {
var $delay_mgr;
var $delay_mgr;
- function Bin5
($room, $table_idx, $table_token, $get, $post, $cookie) {
+ function Bin5($room, $table_idx, $table_token, $get, $post, $cookie) {
$this->user = array();
$this->table = array();
$this->user = array();
$this->table = array();