projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
step_proxy added
[brisk.git]
/
web
/
index_rd.php
diff --git
a/web/index_rd.php
b/web/index_rd.php
index
a8193b6
..
20a7c14
100644
(file)
--- a/
web/index_rd.php
+++ b/
web/index_rd.php
@@
-23,7
+23,7
@@
require_once("brisk.phh");
require_once("brisk.phh");
-log_load($sess, "LOAD: index_rd.php
"
);
+log_load($sess, "LOAD: index_rd.php
".$QUERY_STRING
);
$first_loop = TRUE;
$the_end = FALSE;
$first_loop = TRUE;
$the_end = FALSE;
@@
-49,6
+49,13
@@
function unrecerror()
return (sprintf('the_end=true; window.onunload = null; document.location.assign("index.php");'));
}
return (sprintf('the_end=true; window.onunload = null; document.location.assign("index.php");'));
}
+function page_sync($page)
+{
+ GLOBAL $is_page_streaming;
+
+ $is_page_streaming = TRUE;
+ return (sprintf('the_end=true; window.onunload = null; document.location.assign("%s");', $page));
+}
@@
-58,14
+65,16
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
GLOBAL $is_page_streaming, $first_loop;
$ret = FALSE;
GLOBAL $is_page_streaming, $first_loop;
$ret = FALSE;
-
-
+ $bri = FALSE;
+
+ log_rd2($sess, "M");
/* Sync check (read only without modifications */
ignore_user_abort(TRUE);
if (($sem = lock_data()) != FALSE) {
/* Sync check (read only without modifications */
ignore_user_abort(TRUE);
if (($sem = lock_data()) != FALSE) {
- $bri = &load_data();
// Aggiorna l'expire time lato server
if ($first_loop == TRUE) {
// Aggiorna l'expire time lato server
if ($first_loop == TRUE) {
+ log_rd2($sess, "F");
+ $bri = &load_data();
if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
unlock_data($sem);
ignore_user_abort(FALSE);
if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
unlock_data($sem);
ignore_user_abort(FALSE);
@@
-73,13
+82,11
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
}
log_auth($sess, "update lacc");
$user->lacc = time();
}
log_auth($sess, "update lacc");
$user->lacc = time();
- save_data($bri);
- $first_loop = FALSE;
-
-
+
$bri->garbage_manager(FALSE);
save_data($bri);
$bri->garbage_manager(FALSE);
save_data($bri);
+ $first_loop = FALSE;
}
unlock_data($sem);
ignore_user_abort(FALSE);
}
unlock_data($sem);
ignore_user_abort(FALSE);
@@
-88,12
+95,25
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
return (FALSE);
}
return (FALSE);
}
+ if (validate_sess($sess)) {
+ $proxy_step = step_get($sess);
+ // log_rd2($sess, "Postget".$proxy_step."zizi");
+
+ if ($cur_step == $proxy_step) {
+ log_rd2($sess, "P");
+ return;
+ }
+ }
+
+ if ($bri == FALSE)
+ $bri = &load_data();
+
if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
return (unrecerror());
}
/* Nothing changed, return. */
if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
return (unrecerror());
}
/* Nothing changed, return. */
- if ($cur_st
at == $user->stat && $cur_st
ep == $user->step)
+ if ($cur_step == $user->step)
return;
log_rd2($sess, "do other ++".$cur_stat."++".$user->stat."++".$cur_step."++".$user->step);
return;
log_rd2($sess, "do other ++".$cur_stat."++".$user->stat."++".$cur_step."++".$user->step);
@@
-164,6
+184,12
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
if ($cur_step < $user->step) {
do {
if ($cur_step + COMM_N < $user->step) {
if ($cur_step < $user->step) {
do {
if ($cur_step + COMM_N < $user->step) {
+ if (($cur_stat != $user->stat)) {
+ $to_stat = $user->stat;
+ unlock_data($sem);
+ ignore_user_abort(FALSE);
+ return (page_sync($to_stat == "table" ? "table.php" : "index.php"));
+ }
log_rd2($sess, "lost history, refresh from scratch");
$new_step = -1;
break;
log_rd2($sess, "lost history, refresh from scratch");
$new_step = -1;
break;
@@
-180,7
+206,10
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
if ($user->the_end == TRUE) {
log_rd2($sess, "LOGOUT BYE BYE!!");
log_auth($user->sess, "Explicit logout.");
if ($user->the_end == TRUE) {
log_rd2($sess, "LOGOUT BYE BYE!!");
log_auth($user->sess, "Explicit logout.");
+ $tmp_sess = $user->sess;
$user->sess = "";
$user->sess = "";
+ step_unproxy($tmp_sess);
+
$user->name = "";
$user->the_end = FALSE;
$user->name = "";
$user->the_end = FALSE;
@@
-246,7
+275,7
@@
for ($i = 0 ; time() < $endtime ; $i++) {
$old_step = $step;
// log_rd($sess, "POST MAIN ".$step);;
usleep(200000);
$old_step = $step;
// log_rd($sess, "POST MAIN ".$step);;
usleep(200000);
- if (($i %
5
) == 0) {
+ if (($i %
10
) == 0) {
// log_rd2($sess, "TIME: ".time());
echo '_';
flush();
// log_rd2($sess, "TIME: ".time());
echo '_';
flush();