X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2FObj%2Fbrisk.phh;h=ea4350c307675f8033d41a41131409a7e46e4ce3;hb=d8a1c5edd2bd5e451ede18a111c2a703036b721f;hp=261413725b0240f11919dfed6c8ffadaac41158e;hpb=bc29696ba05142894c798c81931ab2bf23dae5c3;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 2614137..ea4350c 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -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 = "2.0.0";
+$G_brisk_version = "2.1.1 - trusty";
-$root_wellarr = Array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': Nuova versione stabile.',
+$root_wellarr = Array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': Autenticazione e tavoli riservati.',
'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,56 @@ 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 {
+ 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 +607,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 +639,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 +684,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 +735,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 +874,12 @@ 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);
+ $row = ( (((int)($i / 4)) % 2) == 0 );
+ $col = ($i % 2 == 0);
+ $this->table[$i]->auth_only = (($row && $col) || (!$row && !$col));
+ }
$this->garbage_timeout = 0;
}
@@ -984,12 +1056,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);
- $ret .= 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 +1131,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,24 +1141,25 @@ class Room {
$ret .= $this->table_content($user_cur, $table_idx);
$ret .= $this->standup_content($user_cur);
- $ret .= 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));
- $ret .= table_act_content(TRUE, 0, $e, $user->table);
+ // $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 {
- $ret .= 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);
@@ -1158,9 +1233,11 @@ class Room {
$ret .= $this->table_content($user_cur, $table_idx);
$ret .= $this->standup_content($user_cur);
- $ret .= 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;
@@ -1185,8 +1262,10 @@ class Room {
log_main("JOIN_WAKEUP wup_idx ".$wup_idx." wup_n ".$user_wup_n);
log_main("JOIN_WAKEUP more");
- $ret .= 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);
@@ -1220,7 +1299,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();
@@ -1266,14 +1347,15 @@ class Room {
$ret .= 'subst = "sitdown"; tra.hide(); ';
// clean the action buttons in other tables
for ($e = 0 ; $e < TABLES_N ; $e++) {
- $ret .= 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) {
- $ret .= 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;
@@ -1339,7 +1421,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.
";
@@ -1348,8 +1438,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))));
@@ -1362,7 +1453,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;
}
@@ -1376,12 +1467,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;
@@ -1408,13 +1521,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,
@@ -1443,6 +1556,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;
@@ -1479,6 +1594,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;
@@ -1530,19 +1647,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;
@@ -1551,10 +1681,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) {
@@ -1563,10 +1709,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)
@@ -1574,13 +1727,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;
@@ -1594,9 +1778,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);
@@ -1613,9 +1841,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();
@@ -1747,53 +1979,6 @@ class Room {
return (sem_release($res));
}
- function standup_content_old($user)
- {
- $ret = "";
- $content = "";
-
- 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 == "")
- continue;
- $ct++;
- }
-
- $content .= sprintf('
%s%s%s | ',$hilion, xcape($this->user[$e]->name), $hilioff); - if (($ct % 4) == 3) { - $content .= '