X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=87185da28b58a1a463528a6034913faacc9c6300;hb=182eff6ad1aafbdcb765a4190a24a1c8f2f93f6b;hp=c5bc2de83802155bffedb7514780b26a6e7f7772;hpb=29a83e580080f589142bc8639d8a757503fd3175;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index c5bc2de..87185da 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -131,16 +131,15 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
);
-$G_false = FALSE;
$G_lng = langtolng($G_lang);
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "3.2.0";
+$G_brisk_version = "3.4.3";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': informazioni al tavolo sul chiamante, nuovo stato di supporter del sito.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
- 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: caller information on the table, new supporter status.',
+ 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: test version for the new volatile data management, ticker management refactored.',
'If you want to subscribe our Mailing List, click it!' ) );
$G_room_help = array( 'it' => '
@@ -384,19 +383,17 @@ class Table {
{
}
- function &create($idx)
+ function create($idx)
{
- GLOBAL $G_false;
-
if (($thiz =& new Table()) == FALSE)
- return ($G_false);
+ return (FALSE);
$thiz->idx = $idx;
$thiz->player = array();
$thiz->player_n = 0;
$thiz->auth_only = FALSE;
- $thiz->wag_own = NULL;
+ $thiz->wag_own = -1;
$thiz->wag_com = "";
$thiz->wag_tout = 0;
@@ -408,10 +405,8 @@ class Table {
return ($thiz);
}
- function copy(&$from)
+ function copy($from)
{
- GLOBAL $G_false;
-
$this->idx = $from->idx;
$this->player = array();
for ($i = 0 ; $i < $from->player_n ; $i++)
@@ -432,24 +427,20 @@ class Table {
$this->wakeup_time = $from->wakeup_time;
}
- function &myclone(&$from)
+ function myclone($from)
{
- GLOBAL $G_false;
-
if (($thiz =& new Table()) == FALSE)
- return ($G_false);
+ return (FALSE);
$this->copy($from);
return ($thiz);
}
- function &spawn(&$from)
+ function spawn($from)
{
- GLOBAL $G_false;
-
if (($thiz =& new Table()) == FALSE)
- return ($G_false);
+ return (FALSE);
$thiz->idx = $from->idx;
$thiz->player = array();
@@ -471,11 +462,11 @@ class Table {
return ($thiz);
}
- function wag_set(&$user, $mesg)
+ function wag_set($user_idx, $mesg)
{
log_main("WAG_SET");
- $this->wag_own = &$user;
+ $this->wag_own = $user_idx;
$this->wag_com = $mesg;
$this->wag_tout = 0;
}
@@ -485,17 +476,17 @@ class Table {
log_main("WAG_RESET");
unset($this->wag_own);
- $this->wag_own = NULL;
+ $this->wag_own = -1;
$this->wag_com = "";
$this->wag_tout = $timeout;
}
- function getPlayer($idx)
+ function player_get($idx)
{
return ($this->player[$idx]);
}
- function setPlayer($idx, $player)
+ function player_set($idx, $player)
{
$this->player[$idx] = $player;
}
@@ -645,13 +636,11 @@ class User {
function User() {
}
- function &create($idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
- GLOBAL $G_false;
-
+ function create($idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
// error_log("User::create BEGIN", 0);
if (($thiz =& new User()) == FALSE)
- return ($G_false);
+ return (FALSE);
$thiz->idx = $idx;
$thiz->code = -1;
@@ -687,10 +676,8 @@ class User {
return ($thiz);
}
- function copy(&$from)
+ function copy($from)
{
- GLOBAL $G_false;
-
$this->idx = $from->idx;
$this->code = $from->code;
$this->name = $from->name;
@@ -707,8 +694,10 @@ class User {
$i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N));
for ($i = $i_start ; $i < $from->step ; $i++) {
- $ii = $i % COMM_N;
- $this->comm[$ii] = $from->comm[$ii];
+ $ii = $i % COMM_N;
+ if (isset($from->comm[$ii])) {
+ $this->comm[$ii] = $from->comm[$ii];
+ }
}
$this->asta_card = $from->asta_card;
$this->asta_pnt = $from->asta_pnt;
@@ -735,24 +724,20 @@ class User {
}
- function &myclone(&$from)
+ function myclone($from)
{
- GLOBAL $G_false;
-
if (($thiz =& new User()) == FALSE)
- return ($G_false);
+ return (FALSE);
$thiz->copy($from);
return ($thiz);
}
- function &spawn(&$from, $table, $table_pos)
+ function spawn($from, $table, $table_pos)
{
- GLOBAL $G_false;
-
if (($thiz =& new User()) == FALSE)
- return ($G_false);
+ return (FALSE);
$thiz->idx = $from->idx;
$thiz->code = $from->code;
@@ -823,39 +808,46 @@ class User {
*/
}
- function step_set($step) {
- $this->step = $step;
-
- do {
- if (validate_sess($this->sess) == FALSE)
- break;
- if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
- if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
- break;
- fwrite($fp, pack("LL",$this->step, $this->idx));
- fclose($fp);
-
- return (TRUE);
- } while (0);
+ function step_set($step)
+ {
+ $this->step = $step & 0x7fffffff;
+
+ do {
+ if (validate_sess($this->sess) == FALSE)
+ break;
+ if (file_exists(PROXY_PATH) == FALSE)
+ mkdir(PROXY_PATH);
+ if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
+ break;
+ fwrite($fp, pack("LL",$this->step, $this->idx));
+ fclose($fp);
- return (FALSE);
+ log_main("step_set [".$this->sess. "] [".$this->step."]");
+
+ return (TRUE);
+ } while (0);
+
+ return (FALSE);
}
-
+
function step_inc($delta = 1) {
- $this->step += $delta;
-
- if (validate_sess($this->sess)) {
- if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
- $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
- fwrite($fp, pack("LL", $this->step, $this->idx));
- fclose($fp);
-
- return (TRUE);
- }
-
- return (FALSE);
+ $this->step += $delta;
+ /* modularization because unpack() not manage unsigned 32bit int correctly */
+ $this->step &= 0x7fffffff;
+
+ if (validate_sess($this->sess)) {
+ if (file_exists(PROXY_PATH) == FALSE)
+ mkdir(PROXY_PATH);
+ $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
+ fwrite($fp, pack("LL", $this->step, $this->idx));
+ fclose($fp);
+
+ log_main("step_inc [".$this->sess. "] [".$this->step."]");
+
+ return (TRUE);
+ }
+
+ return (FALSE);
}
function reset() {
@@ -879,12 +871,12 @@ class User {
// SHSPLIT save and load function for the User class.
- function &load_data($id)
+ static function load_data($id, $sess)
{
- GLOBAL $G_false, $sess;
-
// error_log("User::load_data BEGIN", 0);
+ log_main("load_data: id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
+
$doexit = FALSE;
do {
if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
@@ -903,7 +895,11 @@ class User {
if ($shm = shm_attach($tok, $shm_sz)) {
$user = @shm_get_var($shm, $tok);
- log_only("bri == ".($user == FALSE ? "FALSE" : "TRUE")." bri === ".($user === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($user) ? "TRUE" : "FALSE"));
+ if ($sess != FALSE && $user->sess != $sess) {
+ $doexit = TRUE;
+ break;
+ }
+ log_only("user == ".($user == FALSE ? "FALSE" : "TRUE")." user === ".($user === FALSE ? "FALSE" : "TRUE")." user isset ".(isset($user) ? "TRUE" : "FALSE"));
if (isset($user))
log_only("bri count ".count($user));
@@ -911,7 +907,7 @@ class User {
log_only("INIT MAIN DATA");
// SHSPLIT FIXME: init_data for User class ??
- $user =& User::create($id, "", "");
+ $user = User::create($id, "", "");
if (@shm_put_var($shm, $tok, $user) == FALSE) {
log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
log_only(serialize($user));
@@ -926,18 +922,17 @@ class User {
//
// SHSPLIT: load users from the shared memory
//
- $ret = &$user;
- return ($ret);
+ return ($user);
} while (0);
if ($doexit)
exit();
- return ($G_false);
+ return (FALSE);
}
- function save_data(&$user, $id)
+ function save_data($user, $id)
{
GLOBAL $sess;
@@ -973,39 +968,39 @@ class User {
}
+ static function step_get($sess)
+ {
+ $fp = FALSE;
+ do {
+ if (validate_sess($sess) == FALSE)
+ break;
+
+ if (file_exists(PROXY_PATH) == FALSE)
+ mkdir(PROXY_PATH);
+ if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
+ break;
+ if (($s = fread($fp, 8)) == FALSE)
+ break;
+ if (strlen($s) != 8)
+ break;
+ $arr = unpack('Ls/Li', $s);
+ fclose($fp);
+
+ // log_rd2("A0: ".$arr[0]." A1: ".$arr[1]);
+ return ($arr);
+ } while (0);
+
+ if ($fp != FALSE)
+ fclose($fp);
+
+ log_rd2("STEP_GET [".$sess."]: return false ");
+
+ return (FALSE);
+ }
} // end class User
-function step_get($sess) {
- $fp = FALSE;
- do {
- if (validate_sess($sess) == FALSE)
- break;
-
- if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
- if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
- break;
- if (($s = fread($fp, 8)) == FALSE)
- break;
- if (strlen($s) != 8)
- break;
- $arr = unpack('Ls/Li', $s);
- fclose($fp);
-
- // log_rd2("A0: ".$arr[0]." A1: ".$arr[1]);
- return ($arr);
- } while (0);
-
- if ($fp != FALSE)
- fclose($fp);
-
- log_rd2("STEP_GET: return false ");
-
- return (FALSE);
-}
-
function step_unproxy($sess) {
log_rd2("UNPROXY: ".PROXY_PATH."/".$sess.".step");
if (file_exists(PROXY_PATH) == FALSE)
@@ -1190,7 +1185,7 @@ class Room {
log_rd2("AUTO LOGOUT.");
if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table')
- $this->room_wakeup(&$user_cur);
+ $this->room_wakeup($user_cur);
else if ($user_cur->subst == 'standup')
$this->room_outstandup(&$user_cur);
else
@@ -1200,7 +1195,7 @@ class Room {
if ($user_cur->laccwr + EXPIRE_TIME_SMAMMA < $curtime) { // lo rimettiamo in piedi
if ($user_cur->stat == 'room' && $user_cur->subst == 'sitdown') {
- $this->room_wakeup(&$user_cur);
+ $this->room_wakeup($user_cur);
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
/* MLANG:
Sei stato inattivo per ".(EXPIRE_TIME_SMAMMA/60.0)." minuti.
Quindi ritorni tra i Giocatori in piedi.", "torna ai tavoli" */
$user_cur->comm[$user_cur->step % COMM_N] .= show_notify($mlang_brisk['tabtout_a'][$G_lang].(EXPIRE_TIME_SMAMMA/60.0).$mlang_brisk['tabtout_b'][$G_lang], 0, $mlang_brisk['btn_backstand'][$G_lang], 400, 100);
@@ -1257,8 +1252,8 @@ class Room {
// $ret .= table_act_content(($user->subst == 'standup'), $this->table[$i]->player_n, $i, $user->table,
// ($this->table[$i]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH));
$ret .= $this->table[$i]->act_content($user);
- if ($this->table[$i]->wag_own != NULL)
- $ret .= sprintf('tra.add(%d, "%s: %s"); ', $i, $this->table[$i]->wag_own->name, $this->table[$i]->wag_com);
+ if ($this->table[$i]->wag_own != -1)
+ $ret .= sprintf('tra.add(%d, "%s: %s"); ', $i, $this->user[$this->table[$i]->wag_own]->name, $this->table[$i]->wag_com);
else
$ret .= sprintf('tra.rem(%d); ', $i);
}
@@ -1268,7 +1263,7 @@ class Room {
}
- function room_wakeup(&$user)
+ function room_wakeup($user)
{
$table_idx = $user->table;
$table = &$this->table[$table_idx];
@@ -1285,7 +1280,7 @@ class Room {
$user_cur = &$this->user[$table->player[$i]];
log_main("PREIMPOST: INLOOP name: ".$user_cur->name);
- if ($user_cur != $user) {
+ if ($user->idx_get() != $table->player[$i]) {
$user_cur->stat_set("room");
$user_cur->subst = "sitdown";
$user_cur->laccwr = $curtime;
@@ -1304,11 +1299,10 @@ class Room {
$user->laccwr = $curtime;
}
- $remove_wagon = false;
- if($table->wag_own == $user) {
- $remove_wagon = true;
+ $remove_wagon = FALSE;
+ if($table->wag_own == $user->idx_get()) {
$table->wag_reset($curtime);
-
+ $remove_wagon = TRUE;
}
@@ -1316,14 +1310,14 @@ class Room {
$table->user_rem(&$this, &$user);
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $user_cur = &$this->user[$i];
+ $user_cur = $this->user[$i];
if ($user_cur->sess == '' || $user_cur->stat != 'room')
continue;
// log_main("VALORI: name: ".$user_cur->name."from_table: ".$from_table." tab: ".$user_cur->table." taix: ".$table_idx." ucur: ".$user_cur." us: ".$user);
$ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : "");
- if ($from_table && ($user_cur->table == $table_idx || $user_cur == $user)) {
+ if ($from_table && ($user_cur->table == $table_idx || $user->idx_get() == $i)) {
$ret .= 'gst.st_loc++; the_end=true; window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");|';
// $ret .= 'gst.st_loc++; document.location.assign("index.php");|';
log_main("DOCUMENT.index.php: from table");
@@ -1337,7 +1331,7 @@ class Room {
// $ret .= table_act_content(FALSE, 0, $table_idx, $user->table, FALSE);
$ret .= $table->act_content($user);
- if ($user_cur == $user) {
+ if ($user->idx_get() == $i) {
// set the new status
$ret .= 'subst = "standup"; tra.show(); ';
// clean the action buttons in other tables
@@ -1393,13 +1387,13 @@ class Room {
$user_cur->table = -1;
$user_wup[$user_wup_n++] = &$user_cur;
- $remove_wagon = false;
- if($table->wag_own == $user_cur) {
- $remove_wagon = true;
+ $remove_wagon = FALSE;
+ if($table->wag_own == $table->player[$i]) {
+ $remove_wagon = TRUE;
$table->wag_reset($curtime);
}
}
- $user_tab[$user_tab_n++] = &$user_cur;
+ $user_tab[$user_tab_n++] = $table->player[$i];
}
}
@@ -1432,8 +1426,8 @@ class Room {
for ($tab_idx = 0 ; $tab_idx < $user_tab_n ; $tab_idx++)
- if ($user_cur == $user_tab[$tab_idx])
- break;
+ if ($user_tab[$tab_idx] == $i)
+ break;
// for users that wakeup the room will be reconstructed by index_rd.php
if ($tab_idx < $user_tab_n) {
@@ -1491,7 +1485,7 @@ class Room {
if ($table_idx > -1)
$ret .= $this->table_content($user_cur, $table_idx);
- if ($user_cur == $user) {
+ if ($user->idx_get() == $i) {
$itin = ($user->flags & USER_FLAG_AUTH ? "" : "");
$itou = ($user->flags & USER_FLAG_AUTH ? "" : "");
$ret .= sprintf('$("myname").innerHTML = "%s%s%s: ";', $itin, xcape($user->name), $itou);
@@ -1503,24 +1497,23 @@ class Room {
log_main("table_update: post");
}
- function room_sitdown(&$user, $table_idx)
+ function room_sitdown($user, $table_idx)
{
log_main("room_sitdown ".($user == FALSE ? "USER: FALSE" : "USER: ".$user->name));
$train_app = "";
if ($table_idx > -1 && $table_idx < TABLES_N) {
- $table = &$this->table[$table_idx];
+ $table = $this->table[$table_idx];
// wagon shutdown
- if ($table->wag_own != NULL && $table->player_n == PLAYERS_N) {
+ if ($table->wag_own != -1 && $table->player_n == PLAYERS_N) {
for ($i = 0 ; $i < TABLES_N ; $i++) {
- $user_cur =& $this->user[$table->player[$i]];
- if ($user_cur == $table->wag_own) {
- $train_app = sprintf("tra.rem(%d); ", $table_idx);
- $table->wag_reset(time());
- break;
- }
+ if ($table->wag_own == $table->player[$i]) {
+ $train_app = sprintf("tra.rem(%d); ", $table_idx);
+ $table->wag_reset(time());
+ break;
+ }
}
}
}
@@ -1536,7 +1529,7 @@ class Room {
$ret .= $this->table_content($user_cur, $table_idx);
$ret .= $this->standup_content($user_cur);
- if ($user_cur == $user) {
+ if ($user->idx_get() == $i) {
$ret .= 'subst = "sitdown"; tra.hide(); ';
// clean the action buttons in other tables
for ($e = 0 ; $e < TABLES_N ; $e++) {
@@ -1556,7 +1549,7 @@ class Room {
}
}
- function chatt_send(&$user, $mesg)
+ function chatt_send($user, $mesg)
{
GLOBAL $G_base, $G_alarm_passwd, $mlang_brisk, $G_lang;
$only_you = FALSE;
@@ -1592,7 +1585,7 @@ class Room {
$table = &$this->table[$user->table];
- if ($table->wag_own != NULL) {
+ if ($table->wag_own != -1) {
// MLANG
Il messaggio di segnalazione del tavolo è già attivato.
$msg = $mlang_brisk['tickjust'][$G_lang];
$to_user = show_notify($msg, 0, "chiudi", 400, 100);
@@ -1612,7 +1605,7 @@ class Room {
$msg = substr($msg, 5);
- $table->wag_set($user, $msg);
+ $table->wag_set($user->idx_get(), $msg);
$to_user = sprintf('tra.add(%d, "%s");', $user->table, xcape(sprintf("%s: %s", $user->name, $msg)));
$to_room = $to_user;
/* for old isolation management $is_ticker = TRUE; */
@@ -1875,11 +1868,10 @@ class Room {
if ($to_room != FALSE) {
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $user_cur = &$this->user[$i];
+ $user_cur = $this->user[$i];
if ($target != "" && $user_cur->name != $target)
continue;
- // if ($user_cur->sess == '' || $user_cur->stat != 'room')
- if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user_cur == $user)
+ if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user->idx_get() == $i)
continue;
if ($is_normchat == TRUE) {
@@ -1961,9 +1953,9 @@ class Room {
return;
} // function chatt_send( ...
- function &get_user($sess, &$idx)
+ function get_user($sess, &$idx)
{
- GLOBAL $PHP_SELF, $G_false;
+ GLOBAL $PHP_SELF;
if (validate_sess($sess)) {
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
@@ -1982,11 +1974,11 @@ class Room {
log_main(sprintf("get_user: Wrong strlen [%s]",$sess));
}
- return ($G_false);
+ return (FALSE);
}
/*
- * function &add_user(&$room, &$sess, &$idx, $name, $pass, $ip)
+ * function add_user(&$room, &$sess, &$idx, $name, $pass, $ip)
*
* RETURN VALUE:
* if ($idx > -1 && ret == FALSE) => duplicated nick
@@ -1997,14 +1989,12 @@ class Room {
* if ($idx == -$idx && ret == user) => SUCCESS (but the login exists in the auth db)
*/
- function &add_user(&$sess, &$idx, $name, $pass, $ip)
+ function add_user(&$sess, &$idx, $name, $pass, $ip)
{
- GLOBAL $G_base, $G_false, $CO_list;
+ GLOBAL $G_base, $CO_list;
$idx = 0;
- error_log("add_user: G_false: [".$G_false."]", 0);
-
$authenticate = FALSE;
$user_type = 0;
$login_exists = FALSE;
@@ -2016,7 +2006,7 @@ class Room {
if (($name_new = validate_name($name)) == FALSE) {
$idx = -2;
- return ($G_false);
+ return (FALSE);
}
log_auth("XXX", sprintf("ARRIVA: [%s] pass:[%s]", $sess, ($pass == FALSE ? "FALSE" : $pass)));
@@ -2034,12 +2024,12 @@ class Room {
log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE"));
if ($authenticate != FALSE) {
- error_log(print_r(&$authenticate, TRUE),0);
+ // error_log(print_r(&$authenticate, TRUE),0);
$user_type = $authenticate->type_get();
}
else {
$idx = -3;
- return ($G_false);
+ return (FALSE);
}
}
else {
@@ -2205,13 +2195,13 @@ class Room {
return ($ret);
}
- return ($G_false);
+ return (FALSE);
}
- function standup_update(&$user)
+ function standup_update($user)
{
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $user_cur = &$this->user[$i];
+ $user_cur = $this->user[$i];
if ($user_cur->sess == '')
continue;
@@ -2219,7 +2209,7 @@ class Room {
if ($user_cur->stat == 'room') {
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".$this->standup_content($user_cur);
- if ($user_cur == $user) {
+ if ($user->idx_get() == $i) {
$itin = ($user->flags & USER_FLAG_AUTH ? "" : "");
$itou = ($user->flags & USER_FLAG_AUTH ? "" : "");
@@ -2234,17 +2224,17 @@ class Room {
}
// Static functions
- static function &create()
+ static function create()
{
- $room =& new Room();
+ $room = new Room();
return $room;
}
- function &load_data()
+ function load_data()
{
- GLOBAL $G_false, $sess;
+ GLOBAL $sess;
$doexit = FALSE;
// error_log("Room::load_data BEGIN", 0);
@@ -2276,10 +2266,10 @@ class Room {
// error_log("DE CHE", 0);
- $room =& Room::create();
+ $room = Room::create();
if (Room::save_data($room) == FALSE)
- return $G_false;
+ return FALSE;
return $room;
}
@@ -2295,14 +2285,13 @@ class Room {
//
// SHSPLIT: load users from the shared memory
//
- $ret = &$room;
- return ($ret);
+ return ($room);
} while (0);
if ($doexit)
exit();
- return ($G_false);
+ return (FALSE);
}
@@ -2430,8 +2419,8 @@ class Room {
if ($user->stat != 'room')
return;
- for ($e = 0 , $ct = 0 ; $ct < 4 && $e < MAX_PLAYERS ; $e++) {
- if ($this->user[$e]->sess == "" || $this->user[$e]->stat != "room" || $this->user[$e]->name == "")
+ for ($i = 0 , $ct = 0 ; $ct < 4 && $i < MAX_PLAYERS ; $i++) {
+ if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "")
continue;
$ct++;
}
@@ -2440,20 +2429,19 @@ class Room {
$content = ' j_stand_cont( [ ';
- for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) {
- if ($this->user[$e]->sess == "" || $this->user[$e]->stat != "room" || $this->user[$e]->name == "")
+ for ($i = 0 , $ct = 0 ; $i < MAX_PLAYERS ; $i++) {
+ if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "")
continue;
- $flags = $this->user[$e]->flags;
+ $flags = $this->user[$i]->flags;
- if ($this->user[$e]->subst == "standup") {
- if ($this->user[$e] == $user)
- {
- $flags |= 1;
+ if ($this->user[$i]->subst == "standup") {
+ if ($user->idx_get() == $i) {
+ $flags |= 1;
}
-
- $content .= sprintf('%s[ %d, "%s" ]',($ct > 0 ? ', ' : ''), $flags, xcape($this->user[$e]->name));
- $ct++;
+
+ $content .= sprintf('%s[ %d, "%s" ]',($ct > 0 ? ', ' : ''), $flags, xcape($this->user[$i]->name));
+ $ct++;
}
}
$content .= ' ]);';
@@ -2478,16 +2466,16 @@ class Room {
$content = "[ ";
for ($i = 0 ; $i < $table->player_n ; $i++) {
- $user_cur = &$this->user[$table->player[$i]];
-
- $flags = $user_cur->flags;
-
- if ($user_cur == $user)
- $flags |= 1;
-
- log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx));
-
- $content .= sprintf('%s[ %d, "%s" ]',($i == 0 ? '' : ', '), $flags, xcape($user_cur->name));
+ $user_cur = &$this->user[$table->player[$i]];
+
+ $flags = $user_cur->flags;
+
+ if ($user->idx_get() == $table->player[$i])
+ $flags |= 1;
+
+ log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx));
+
+ $content .= sprintf('%s[ %d, "%s" ]',($i == 0 ? '' : ', '), $flags, xcape($user_cur->name));
}
$content .= ' ]';