X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=622132c1c919f460d6a56149c60383ee327fe018;hb=db7f0cc6514cef0d5009a7a69ba49303bbf9e2db;hp=81abb2b92714ee96d549f506b3b8aa0b4087800c;hpb=ba124be15839e2a62fa793b70869e0209f8daf90;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 81abb2b..622132c 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -48,7 +48,7 @@ define(EXPIRE_TIME_SMAMMA, 360); define(EXPIRE_TIME_WAG, 10); define(WAKEUP_TIME, 12); // BAN_TIME da allineare anche in commons.js -define(BAN_TIME, 900); +define(BAN_TIME, 3600); define(GARBAGE_TIMEOUT, 10); define(NICKSERV, "BriskServ"); @@ -75,9 +75,9 @@ require_once("$DOCUMENT_ROOT/Etc/".BRISK_CONF); $G_false = FALSE; $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 ); -$G_brisk_version = "spawn-0.14.2"; +$G_brisk_version = "2.1.2 - trusty"; -$root_wellarr = Array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': Più risalto a Start - Beta8.', +$root_wellarr = Array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': Autenticazione, tavoli riservati e ban efficaci.', '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.'); @@ -168,13 +168,15 @@ class Card { } // end class Card class Table { + var $idx; var $player; var $player_n; var $card; var $mazzo; var $gstart; var $turn; - + var $auth_only; + var $wag_own; var $wag_com; var $wag_tout; @@ -208,13 +210,14 @@ class Table { { } - function &create() + function &create($idx) { GLOBAL $G_false; if (($thiz =& new Table()) == FALSE) return ($G_false); + $thiz->idx = $idx; $thiz->player = array(); $thiz->player_n = 0; $thiz->card = FALSE; @@ -223,6 +226,9 @@ class Table { $thiz->asta_card = -1; $thiz->asta_pnt = -1; $thiz->mult = 1; + + $thiz->auth_only = FALSE; + $thiz->points = array( ); $thiz->points_n = 0; $thiz->total = array( 0, 0, 0, 0, 0); @@ -256,6 +262,7 @@ class Table { if (($thiz =& new Table()) == FALSE) return ($G_false); + $thiz->idx = $from->idx; $thiz->player = array(); for ($i = 0 ; $i < $from->player_n ; $i++) $thiz->player[$i] = $from->player[$i]; @@ -265,6 +272,8 @@ class Table { $thiz->gstart = $from->gstart; $thiz->turn = $from->turn; + $thiz->auth_only = $from->auth_only; + $thiz->wag_own = $from->wag_own; $thiz->wag_com = $from->wag_com; $thiz->wag_tout = $from->wag_taut; @@ -304,12 +313,15 @@ class Table { if (($thiz =& new Table()) == FALSE) return ($G_false); + $thiz->idx = $from->idx; $thiz->player_n = $from->player_n; $thiz->card = &$thiz->bunch_create(); $thiz->mazzo = $from->mazzo; $thiz->gstart = $from->gstart; $thiz->turn = $from->turn; + $thiz->auth_only = $from->auth_only; + $thiz->wag_own = $from->wag_own; $thiz->wag_com = $from->wag_com; $thiz->wag_tout = $from->wag_taut; @@ -526,8 +538,59 @@ class Table { return ($ct); } + + + + + // $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)); + + // function act_content($isstanding, $sitted, $table, $cur_table, $allowed) + function act_content(&$user) + { + $ret = ""; + $isstanding = ($user->subst == 'standup'); + $sitted = $this->player_n; + $table = $this->idx; + $cur_table = $user->table; + $allowed = TRUE; + + if ($isstanding) { + if ($sitted < PLAYERS_N) { + if ($this->auth_only) { + if ($user->flags & USER_FLAG_AUTH) + $act = "sitreser"; + else + $act = 'reserved'; + } + else { + $act = 'sit'; + } + } + else { + $act = 'none'; + } + } + else { + if ($table == $cur_table) + $act = 'wake'; + else + $act = 'none'; + } + + if ($act != '') + $ret = sprintf('j_tab_act_cont(%d, \'%s\');', $table, $act); + + return ($ret); + } + + } // end class Table + +// User flags +define(USER_FLAG_AUTH, 0x02); + class User { var $name; // name of the user var $sess; // session of the user @@ -547,6 +610,7 @@ class User { var $table; // id of the current table (if in table state) var $table_pos; // idx on the table var $table_token;// token that identify a game on a table + var $flags; // Bitfield with: AUTHENTICATE: 0x02 var $the_end; // Flag to change the end of the session var $chat_lst; // Last chat line @@ -578,6 +642,8 @@ class User { $thiz->asta_pnt = -1; $thiz->handpt = -1; $thiz->exitislock = TRUE; + + $thiz->flags = 0x00; $thiz->chattime = array_fill(0, CHAT_N, 0); $thiz->chat_cur = 0; @@ -621,6 +687,8 @@ class User { $thiz->handpt = $from->handpt; $thiz->exitislock = $from->exitislock; + $thiz->flags = $from->flags; + $thiz->chattime = array(); for ($i = 0 ; $i < CHAT_N ; $i++) $thiz->chattime[$i] = $from->chattime[$i]; @@ -670,12 +738,15 @@ class User { $thiz->exitislock = $from->exitislock; $thiz->the_end = $from->the_end; + $thiz->flags = $from->flags; + $thiz->chattime = array_fill(0, CHAT_N, 0); $thiz->chat_cur = 0; $thiz->chat_lst = ""; $thiz->chat_ban = 0; $thiz->chat_dlt = 0; + $thiz->table = $table; $thiz->table_pos = $table_pos; $thiz->table_token = $from->table_token; @@ -806,8 +877,17 @@ class Room { $this->user[$i] =& User::create("", ""); } - for ($i = 0 ; $i < TABLES_N ; $i++) - $this->table[$i] =& Table::create(); + for ($i = 0 ; $i < TABLES_N ; $i++) { + $this->table[$i] =& Table::create($i); + if ($i < 12) { + $row = ( (((int)($i / 4)) % 2) == 0 ); + $col = ($i % 2 == 0); + $this->table[$i]->auth_only = (($row && $col) || (!$row && !$col)); + } + else { + $this->table[$i]->auth_only = FALSE; + } + } $this->garbage_timeout = 0; } @@ -984,12 +1064,14 @@ class Room { $ret .= root_wellcome($user); $ret .= sprintf('subst = "%s";', $user->subst); - $ret .= sprintf('$("myname").innerHTML = "%s";', xcape($user->name)); + $itin = ($user->flags & USER_FLAG_AUTH ? "" : ""); + $itou = ($user->flags & USER_FLAG_AUTH ? "" : ""); + $ret .= sprintf('$("myname").innerHTML = "%s%s%s";', $itin, xcape($user->name), $itou); for ($i = 0 ; $i < TABLES_N ; $i++) { $ret .= $this->table_content($user, $i); - $act_content = table_act_content(($user->subst == 'standup'), - $this->table[$i]->player_n, $i, $user->table); - $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $i, $act_content); + // $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); else @@ -1057,7 +1139,7 @@ class Room { $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)) { - $ret .= 'gst.st_loc++; the_end=true; window.onunload = null; document.location.assign("index.php");|'; + $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"); } @@ -1067,22 +1149,25 @@ class Room { $ret .= $this->table_content($user_cur, $table_idx); $ret .= $this->standup_content($user_cur); - $act_content = table_act_content(FALSE, 0, $table_idx, $user->table); - $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content); - - + // $ret .= table_act_content(FALSE, 0, $table_idx, $user->table, FALSE); + $ret .= $table->act_content($user); + if ($user_cur == $user) { // set the new status $ret .= 'subst = "standup"; tra.show(); '; // 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->table)); + if ($this->table[$e]->player_n < PLAYERS_N) { + // $ret .= table_act_content(TRUE, 0, $e, $user->table, + // ($this->table[$e]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH)); + $ret .= $this->table[$e]->act_content($user); + } } } else { - $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); + // $ret .= table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table, + // ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH)); + $ret .= $table->act_content($user_cur); } } log_wr("ROOM_WAKEUP: ".$ret); @@ -1156,9 +1241,11 @@ class Room { $ret .= $this->table_content($user_cur, $table_idx); $ret .= $this->standup_content($user_cur); - $act_content = table_act_content(FALSE, 0, $table_idx, $user_cur->table); - $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content); - + // $ret .= table_act_content(FALSE, 0, $table_idx, $user_cur->table, + // ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH)); + $ret .= $table->act_content($user_cur); + + for ($tab_idx = 0 ; $tab_idx < $user_tab_n ; $tab_idx++) if ($user_cur == $user_tab[$tab_idx]) break; @@ -1183,8 +1270,10 @@ class Room { log_main("JOIN_WAKEUP wup_idx ".$wup_idx." wup_n ".$user_wup_n); 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); + // $ret .= table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table, + // ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH)); + $ret .= $table->act_content($user_cur); + log_main("JOIN_WAKEUP end more"); } log_wr("ROOM_JOIN_WAKEUP: ".$ret); @@ -1218,7 +1307,9 @@ class Room { $ret .= $this->table_content($user_cur, $table_idx); if ($user_cur == $user) { - $ret .= sprintf('$("myname").innerHTML = "%s: ";', xcape($user->name)); + $itin = ($user->flags & USER_FLAG_AUTH ? "" : ""); + $itou = ($user->flags & USER_FLAG_AUTH ? "" : ""); + $ret .= sprintf('$("myname").innerHTML = "%s%s%s: ";', $itin, xcape($user->name), $itou); } $user_cur->comm[$user_cur->step % COMM_N] = $ret; $user_cur->step_inc(); @@ -1264,14 +1355,15 @@ class Room { $ret .= 'subst = "sitdown"; tra.hide(); '; // clean the action buttons in other tables for ($e = 0 ; $e < TABLES_N ; $e++) { - $act_content = table_act_content(FALSE, 0, $e, $user_cur->table); - $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $e, $act_content); + // $ret .= table_act_content(FALSE, 0, $e, $user_cur->table, FALSE); + $ret .= $this->table[$e]->act_content($user_cur); } } else if ($table_idx > -1) { if ($table->player_n == PLAYERS_N) { - $act_content = table_act_content(($user_cur->subst == 'standup'), PLAYERS_N, $table_idx, $user_cur->table); - $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content); + // $ret .= table_act_content(($user_cur->subst == 'standup'), PLAYERS_N, $table_idx, $user_cur->table, + /// ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH)); + $ret .= $table->act_content($user_cur); } } $user_cur->comm[$user_cur->step % COMM_N] = $ret; @@ -1337,7 +1429,15 @@ class Room { } // /tav chat command else if (strncmp($msg, "/alarm ", 7) == 0) { - $alarm_check = "/alarm ".$G_alarm_passwd." "; + if (strncmp($msg, "/alarm to ", 10) == 0) { + $sp_pos = strpos($msg, " ", 10); + $target = substr($msg, 10, $sp_pos - 10); + $alarm_check = "/alarm to ".$target." ".$G_alarm_passwd." "; + } + else { + $target = ""; + $alarm_check = "/alarm ".$G_alarm_passwd." "; + } do { if (strncmp($msg, $alarm_check, strlen($alarm_check)) != 0) { $msg = "
La password digitata non è corretta.

"; @@ -1346,8 +1446,9 @@ class Room { break; } - $to_user = sprintf('chatt_sub("%s","Alarm %s inviato a tutti.");', - $dt.NICKSERV, xcape(substr($msg, strlen($alarm_check)))); + $to_user = sprintf('chatt_sub("%s", [2, "%s"],"Alarm %s inviato a %s.");', + $dt, NICKSERV, xcape(substr($msg, strlen($alarm_check))), + ($target == "" ? "tutti" : xcape($target)) ); $msg = sprintf("
%s

%s


", $dt.NICKSERV, xcape(substr($msg, strlen($alarm_check)))); @@ -1360,7 +1461,7 @@ class Room { do { if (($name_new = validate_name(substr($msg, 6))) == FALSE) { - $to_user = sprintf('chatt_sub("%s","Il nickname deve contenere almeno una lettera dell\'alfabeto o una cifra.");', $dt.NICKSERV); + $to_user = sprintf('chatt_sub("%s", [2,"%s"],"Il nickname deve contenere almeno una lettera dell\'alfabeto o una cifra.");', $dt, NICKSERV); break; } @@ -1374,12 +1475,34 @@ class Room { break; } if ($i < MAX_PLAYERS) { - $to_user = sprintf('chatt_sub("%s","Nickname %s già in uso.");', $dt.NICKSERV, xcape($name_new)); + $to_user = sprintf('chatt_sub("%s", [2, "%s"],"Nickname %s già in uso.");', $dt, NICKSERV, xcape($name_new)); break; } - + + if ($user->flags & USER_FLAG_AUTH) { + if (strcasecmp($user->name,$name_new) != 0) { + if ($user->subst == 'standup' || ($user->subst != 'standup' && $this->table[$user->table]->auth_only == FALSE)) { + $user->flags &= ~USER_FLAG_AUTH; // Remove auth if name changed + for ($i = 0 ; $i < TABLES_N ; $i++) { + $to_user .= $this->table[$i]->act_content($user); + } + } + else { + $to_user = sprintf('chatt_sub("%s", [2, "%s"],"Non puoi cambiare nick a un tavolo per soli autenticati.");', $dt, NICKSERV); + break; + } + } + } $user->name = $name_new; // OK - nick changed + /* se nome gia' in uso, segnala cosa potrebbe capitare */ + if (($user->flags & USER_FLAG_AUTH) == 0) { + $userdb = new LoginDB(); + if ($userdb->login_exists($name_new)) { + $to_user .= sprintf('chatt_sub("%s", [2, "%s"],"Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN.");', $dt, NICKSERV, xcape($name_new)); + } + } + log_main("chatt_send start set"); $update_room = TRUE; @@ -1406,13 +1529,13 @@ class Room { } if ($only_you) { - $to_user = sprintf('chatt_sub("%s","%s");', $dt.xcape($user->name), xcape("== chat ban ==")); + $to_user = sprintf('chatt_sub("%s", [%d, "%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape("== chat ban ==")); } else { - $to_user = sprintf('chatt_sub("%s","%s");', $dt.xcape($user->name), xcape($msg)); + $to_user = sprintf('chatt_sub("%s", [%d, "%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape($msg)); // temporary silentiation for troll (will became array check) if (strcasecmp($user->name,'JackRokka') != 0 && $user->sess != '47ea653f602e8') - $to_room = $to_user; + $to_room = $to_user; } log_legal($curtime, $user->sess, $user->name, @@ -1441,6 +1564,8 @@ class Room { if ($to_room != FALSE) { for ($i = 0 ; $i < MAX_PLAYERS ; $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) continue; @@ -1477,6 +1602,8 @@ class Room { // stat must be "table" by definition $bri_user =& $bri->user[$i]; + if ($target != "" && $bri_user->name != $target) + continue; log_main("writa: ".$user_mesg); $bri_user->comm[$bri_user->step % COMM_N] = "gst.st = ".($bri_user->step+1)."; "; $bri_user->comm[$bri_user->step % COMM_N] .= $to_tabl; @@ -1528,19 +1655,32 @@ class Room { return ($G_false); } + + /* - * function &add_user(&$room, &$sess, &$idx, $name, $ip) + * function &add_user(&$room, &$sess, &$idx, $name, $pass, $ip) * * RETURN VALUE: - * if ($idx != -1 && ret == FALSE) => duplicated nick - * if ($idx == -2 && ret == FALSE) => invalid name - * if ($idx == -1 && ret == FALSE) => no space left - * if (ret == TRUE) => SUCCESS + * if ($idx > -1 && ret == FALSE) => duplicated nick + * if ($idx == -2 && ret == FALSE) => invalid name + * if ($idx == -3 && ret == FALSE) => wrong password + * if ($idx == -1 && ret == FALSE) => no space left + * if ($idx == 0 && ret == user) => SUCCESS + * if ($idx == -$idx && ret == user) => SUCCESS (but the login exists in the auth db */ - function &add_user(&$sess, &$idx, $name, $ip) + + + + function &add_user(&$sess, &$idx, $name, $pass, $ip) { GLOBAL $G_false; + $idx = 0; + + $authenticate = FALSE; + $login_exists = FALSE; + $ghost = -1; + $ghost_auth = FALSE; $idx = -1; $idfree = -1; @@ -1549,10 +1689,26 @@ class Room { return ($G_false); } - log_auth("XXX", sprintf("ARRIVA: [%s]", $sess)); + log_auth("XXX", sprintf("ARRIVA: [%s] pass:[%s]", $sess, ($pass == FALSE ? "FALSE" : $pass))); if (validate_sess($sess) == FALSE) $sess = ""; + /* if pass != FALSE verify the login with pass */ + log_auth("XXX", "auth1"); + $userdb = new LoginDB(); + if ($pass != FALSE) { + log_auth("XXX", "auth2"); + $authenticate = $userdb->login_verify($name_new, $pass); + log_auth("XXX", "authenticate: ".($authenticate == TRUE ? "TRUE" : "FALSE")); + + if ($authenticate == FALSE) { + $idx = -3; + return ($G_false); + } + } + else { + $login_exists = $userdb->login_exists($name_new); + } for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { /* free user ? */ if (strcmp($sess, $this->user[$i]->sess) == 0) { @@ -1561,10 +1717,17 @@ class Room { } if ($idfree == -1 && strcmp("", $this->user[$i]->sess) == 0) { $idfree = $i; + continue; // NOTE: CHECK IT !! } - if (strcmp($this->user[$i]->name, $name_new) == 0) { - $idx = $i; - break; + if (strcasecmp($this->user[$i]->name, $name_new) == 0) { + if ($authenticate == FALSE) { + $idx = $i; + break; + } + else { + $ghost = $i; + $ghost_auth = ($this->user[$i]->flags & USER_FLAG_AUTH); + } } } if ($idx == -1) @@ -1572,13 +1735,44 @@ class Room { log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name_new)); - if ($idx != -1 && $i == MAX_PLAYERS) { + if ($ghost > -1 && $authenticate) { + /* swap session */ + + $ghost_user =& $this->user[$ghost]; + $curtime = time(); + $ghost_user->step_inc(); + if ($sess == "") { + $sess = uniqid(""); + $ghost_user->sess = $sess; + } + else { + $ghost_user->sess = $sess; + } + + // If user at the table we need to update the table data too + $table_idx = $ghost_user->table; + if ($ghost_user->stat == "table" && $this->table[$table_idx]->player_n == PLAYERS_N) { + if (($brisem = Briskin5::lock_data($table_idx)) != FALSE) { + if (($bri = &Briskin5::load_data($table_idx)) != FALSE) { + if ($bri->the_end != TRUE) { + $bri->user[$ghost_user->table_pos]->step_inc(); + $bri->user[$ghost_user->table_pos]->sess = $sess; + Briskin5::save_data(&$bri); + } + } + Briskin5::unlock_data($brisem); + } + } + + $idx = $ghost; + return ($this->user[$ghost]); + } + else if ($idx != -1 && $i == MAX_PLAYERS) { /* SUCCESS */ $curtime = time(); if ($sess == "") { - $this->user[$idx]->sess = uniqid(""); - $sess = $this->user[$idx]->sess; - + $sess = uniqid(""); + $this->user[$idx]->sess = $sess; } else { $this->user[$idx]->sess = $sess; @@ -1592,9 +1786,53 @@ class Room { $this->user[$idx]->laccwr = $curtime; $this->user[$idx]->bantime = 0; $this->user[$idx]->ip = $ip; + + $this->user[$idx]->flags = ($authenticate ? USER_FLAG_AUTH : 0x00); + + if ($ghost > -1) { + log_main("ghost: rename!"); + $ghost_user =& $this->user[$ghost]; + + if ($ghost_auth == FALSE) { + for ($sfx = 1 ; $sfx <= MAX_PLAYERS ; $sfx++) { + $ghostname = 'ghost'.$sfx; + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + if (strcmp("", $this->user[$i]->sess) == 0) + continue; + + if (strcmp($this->user[$i]->name, $ghostname) == 0) { + $ghostname = ''; + break; + } + } + if ($ghostname != '') + break; + } + + $ghost_user->name = $ghostname; + + if ($ghost_user->stat == 'room' && $ghost_user->subst == 'standup') { + $this->standup_update(&$ghost_user); + } + else { + log_main("chatt_send pre table update"); + $this->table_update(&$ghost_user); + log_main("chatt_send post table update"); + } + } // if ($ghost_auth == FALSE + else { + // FIXME: cacciare il vecchio utente room && table (if needed) + $ghost_user->the_end = TRUE; + $ghost_user->lacc = 0; + $this->garbage_manager(TRUE); + } + } // if ($ghost > -1) { + log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name_new)); - - return ($this->user[$idx]); + $real_idx = $idx; + if ($login_exists) + $idx = -($idx + 1); + return ($this->user[$real_idx]); } return ($G_false); @@ -1611,9 +1849,13 @@ 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) - $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s: ";', xcape($user->name)); - + if ($user_cur == $user) { + $itin = ($user->flags & USER_FLAG_AUTH ? "" : ""); + $itou = ($user->flags & USER_FLAG_AUTH ? "" : ""); + + $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s%s%s: ";', + $itin, xcape($user->name), $itou); + } log_main("FROM STANDUP: NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]); $user_cur->step_inc(); @@ -1683,7 +1925,6 @@ class Room { { GLOBAL $sess; - $ret = FALSE; $shm = FALSE; // var_dump($room); @@ -1711,7 +1952,7 @@ class Room { if ($shm) shm_detach($shm); - return ($ret); + return (FALSE); } function lock_data() @@ -1746,6 +1987,7 @@ class Room { return (sem_release($res)); } + function standup_content($user) { $ret = ""; @@ -1760,39 +2002,32 @@ class Room { $ct++; } - $content .= sprintf('', $ct); + // $content .= sprintf('
', $ct); + $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 == "") continue; + $flags = $this->user[$e]->flags; if ($this->user[$e]->subst == "standup") { - if (($ct % 4) == 0) { - $content .= ''; - } if ($this->user[$e] == $user) - { $hilion = ""; $hilioff = ""; } - else - { $hilion = ""; $hilioff = ""; } + { + $flags |= 1; + } - $content .= sprintf('',$hilion, xcape($this->user[$e]->name), $hilioff); - if (($ct % 4) == 3) { - $content .= ''; - } + $content .= sprintf('%s[ %d, "%s" ]',($ct > 0 ? ', ' : ''), $flags, xcape($this->user[$e]->name)); $ct++; } } - $content .= '
%s%s%s
'; + $content .= ' ]);'; - $content2 = ''; - $ret .= sprintf('$("standup").innerHTML = "%s"; $("esco").innerHTML = "%s";', - $content, $content2); - - return ($ret); + return ($content); } - function table_content($user, $table_idx) + function table_content_old($user, $table_idx) { $content = ""; $ret = ""; @@ -1830,6 +2065,42 @@ class Room { } + function table_content($user, $table_idx) + { + $content = ""; + $ret = ""; + // TODO + // + // Si possono usare i dati nella classe table + // + + $sess = $user->sess; + $table = &$this->table[$table_idx]; + + if ($user->stat != 'room') + return; + + $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)); + } + + $content .= ' ]'; + + $ret .= sprintf('j_tab_cont(%d, %s);', $table_idx, $content); + + return ($ret); + } + } // end class Room function make_seed() @@ -2088,7 +2359,7 @@ function unlock_banlist($res) return (sem_release($res)); } -function table_act_content($isstanding, $sitted, $table, $cur_table) +function table_act_content_old($isstanding, $sitted, $table, $cur_table) { $ret = ""; @@ -2106,6 +2377,30 @@ function table_act_content($isstanding, $sitted, $table, $cur_table) return ($ret); } +function table_act_content($isstanding, $sitted, $table, $cur_table, $allowed) +{ + $ret = ""; + + if ($isstanding) { + if ($sitted < PLAYERS_N) { + if ($allowed) + $act = 'sit'; + else + $act = 'reserved'; + } + } + else { + if ($table == $cur_table) + $act = 'wake'; + else + $act = 'none'; + } + + if ($act != '') + $ret = sprintf('j_tab_act_cont(%d, \'%s\');', $table, $act); + + return ($ret); +} function show_notify($text, $tout, $butt, $w, $h) { @@ -2286,7 +2581,7 @@ function root_wellcome($user) $dt = date("H:i ", $curtime); for ($i = 0 ; $i < count($root_wellarr) ; $i++) - $ret .= sprintf('chatt_sub("%s","%s");', $dt.NICKSERV, str_replace('"', '\"', $root_wellarr[$i])); + $ret .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, str_replace('"', '\"', $root_wellarr[$i])); return ($ret); } @@ -2297,7 +2592,7 @@ function table_wellcome($user) $ret = ""; for ($i = 0 ; $i < count($table_wellarr) ; $i++) - $ret .= sprintf('chatt_sub("ChanServ: ","%s");', str_replace('"', '\"', $table_wellarr[$i])); + $ret .= sprintf('chatt_sub("%s", [2, "ChanServ: "],"%s");', "", str_replace('"', '\"', $table_wellarr[$i])); return ($ret); } @@ -2334,12 +2629,24 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again) $ret .= "background_set();"; /* USERS INFO */ - $ret .= sprintf('$("myname").innerHTML = "%s";', xcape($user->name)); - $ret .= sprintf('set_names(" %s", " %s", " %s", " %s", " %s"); ', + $itin = ($user->flags & USER_FLAG_AUTH ? "" : ""); + $itou = ($user->flags & USER_FLAG_AUTH ? "" : ""); + + $ret .= sprintf('$("myname").innerHTML = "%s%s%s";', $itin, xcape($user->name), $itou); + $ret .= sprintf('set_names([%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"]); ', + $room->user[$table->player[($table_pos)%PLAYERS_N]]->flags, xcape($room->user[$table->player[($table_pos)%PLAYERS_N]]->name), + + $room->user[$table->player[($table_pos+1)%PLAYERS_N]]->flags, xcape($room->user[$table->player[($table_pos+1)%PLAYERS_N]]->name), + + $room->user[$table->player[($table_pos+2)%PLAYERS_N]]->flags, xcape($room->user[$table->player[($table_pos+2)%PLAYERS_N]]->name), + + (PLAYERS_N == 3 ? 0 : $room->user[$table->player[($table_pos+3)%PLAYERS_N]]->flags), (PLAYERS_N == 3 ? "" : xcape($room->user[$table->player[($table_pos+3)%PLAYERS_N]]->name)), + + (PLAYERS_N == 3 ? 0 : $room->user[$table->player[($table_pos+4)%PLAYERS_N]]->flags), (PLAYERS_N == 3 ? "" : xcape($room->user[$table->player[($table_pos+4)%PLAYERS_N]]->name))); } /* NOTIFY FOR THE CARD MAKER */