X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2FObj%2Fbrisk.phh;h=543a57ef7886986371cfca25a0db7ada56f37ae2;hb=712bcb053a139bd4b537b6236ea8bae3128ce293;hp=8bc7fd0b7924b8ea52b4157ffd1c952ef7702e7e;hpb=0632c5a6e44489f41d3b13b2d81d67c9e916ffd3;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 8bc7fd0..543a57e 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -55,9 +55,9 @@ define(BRISK_DEBUG, 0);
$G_false = FALSE;
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "spawn-0.0.3";
+$G_brisk_version = "spawn-0.0.6";
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo layout che permette più tavoli, più tavoli.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': riscritta tutta l\'architettura dati del server, tutto piè veloce e leggero.',
'Se vuoi iscriverti alla Mailing List, cliccala!' );
$table_wellarr = Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non può risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.');
@@ -916,6 +916,8 @@ class Room {
$curtime = time();
$user_wup = array();
$user_wup_n = 0;
+ $user_tab = array();
+ $user_tab_n = 0;
log_main("JOIN WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
for ($i = 0 ; $i < $table->player_n ; $i++) {
@@ -936,6 +938,7 @@ class Room {
$user_cur->table = -1;
$user_wup[$user_wup_n++] = &$user_cur;
}
+ $user_tab[$user_tab_n++] = &$user_cur;
}
}
@@ -965,29 +968,20 @@ class Room {
$act_content = table_act_content(FALSE, 0, $table_idx, $user_cur->table);
$ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
- for ($wup_idx = 0 ; $wup_idx < $user_wup_n ; $wup_idx++)
- if ($user_cur == $user_wup[$wup_idx])
+ for ($tab_idx = 0 ; $tab_idx < $user_tab_n ; $tab_idx++)
+ if ($user_cur == $user_tab[$tab_idx])
break;
+ // for users that wakeup the room will be reconstructed by index_rd.php
+ if ($tab_idx < $user_tab_n)
+ continue;
+
log_main("JOIN_WAKEUP wup_idx ".$wup_idx." wup_n ".$user_wup_n);
- if ($wup_idx < $user_wup_n) {
- log_main("JOIN_WAKEUP less");
- // set the new status
- $ret .= 'stat = "room"; subst = "standup"; ';
- // clean the action buttons in other tables
- for ($e = 0 ; $e < TABLES_N ; $e++) {
- if ($this->table[$e]->player_n < PLAYERS_N)
- $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $e, table_act_content(TRUE, 0, $e, $user_cur->table));
- }
- log_main("JOIN_WAKEUP end less");
- }
- else {
- log_main("JOIN_WAKEUP more");
- $act_content = table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table);
- $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
- log_main("JOIN_WAKEUP end more");
- }
+ log_main("JOIN_WAKEUP more");
+ $act_content = table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table);
+ $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
+ log_main("JOIN_WAKEUP end more");
}
log_wr("ROOM_JOIN_WAKEUP: ".$ret);
$user_cur->comm[$user_cur->step % COMM_N] = $ret;
@@ -1414,10 +1408,8 @@ function log_only2($log) {
$ssess = "XXXX";
else
$ssess = $sess;
-
- // if (($fp = @fopen("/tmp/brisk_only2.log", 'a')) != FALSE) {
- if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("ONL2: [%s] [%s]\n", $ssess, $log));
fclose($fp);
}
@@ -1433,10 +1425,8 @@ function log_only($log) {
$ssess = "XXXX";
else
$ssess = $sess;
-
- // if (($fp = @fopen("/tmp/brisk_only.log", 'a')) != FALSE) {
- if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("ONLY: [%s] [%s]\n", $ssess, $log));
fclose($fp);
}
@@ -1452,10 +1442,8 @@ function log_main($log) {
$ssess = "XXXX";
else
$ssess = $sess;
-
- // if (($fp = @fopen("/tmp/brisk_main.log", 'a')) != FALSE) {
- if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("MAIN: [%s] [%s]\n", $ssess, $log));
fclose($fp);
}
@@ -1472,9 +1460,7 @@ function log_rd($log) {
else
$ssess = $sess;
-
- // if (($fp = @fopen("/tmp/brisk_rd.log", 'a')) != FALSE) {
- if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("READ: [%s] [%s]\n", $ssess, $log));
fclose($fp);
}
@@ -1492,8 +1478,7 @@ function log_rd2($log) {
$ssess = $sess;
- // if (($fp = @fopen("/tmp/brisk_rd2.log", 'a')) != FALSE) {
- if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("REA2: [%s] [%s]\n", $ssess, $log));
fclose($fp);
}
@@ -1510,9 +1495,7 @@ function log_send($log) {
else
$ssess = $sess;
-
- // if (($fp = @fopen("/tmp/brisk_send.log", 'a')) != FALSE) {
- if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("SEND: [%s] [%s]\n", $ssess, $log));
fclose($fp);
}
@@ -1528,10 +1511,8 @@ function log_lock($log) {
$ssess = "XXXX";
else
$ssess = $sess;
-
- // if (($fp = @fopen("/tmp/brisk_lock.log", 'a')) != FALSE) {
- if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("LOCK: [%s] [%s]\n", $ssess, $log));
fclose($fp);
}
@@ -1548,9 +1529,7 @@ function log_wr($log) {
else
$ssess = $sess;
-
- // if (($fp = @fopen("/tmp/brisk_wr.log", 'a')) != FALSE) {
- if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("WRIT: [%s] [%s]\n", $ssess, $log));
fclose($fp);
}
@@ -1567,9 +1546,7 @@ function log_load($log) {
else
$ssess = $sess;
-
- // if (($fp = @fopen("/tmp/brisk_load.log", 'a')) != FALSE) {
- if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("LOAD: [%s] [%s]\n", $ssess, $log));
fclose($fp);
}
@@ -1579,8 +1556,7 @@ function log_auth($sess, $log) {
if ((BRISK_DEBUG & DBG_AUTH) == 0)
return;
- // if (($fp = @fopen("/tmp/brisk_auth.log", 'a')) != FALSE) {
- if (($fp = @fopen("/tmp/brisk.log", 'a')) != FALSE) {
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("AUTH: [%s] [%d] [%s]\n", $sess, time(), $log));
fclose($fp);
}
@@ -1591,7 +1567,7 @@ function log_legal($timecur, $sess, $name, $where, $mesg)
{
GLOBAL $_SERVER;
- if (($fp = @fopen(LEGAL_PATH, 'a')) != FALSE) {
+ if (($fp = @fopen(LEGAL_PATH."/legal.log", 'a')) != FALSE) {
/* Unix time | session | nickname | IP | where was | mesg */
fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|\n", $timecur, $sess, $name, $_SERVER['REMOTE_ADDR'], $where , $mesg));
fclose($fp);