X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=41cacfdd553e4466551152a7b60d4f3265ae6a65;hb=70234232cbab5617dcae7a3719b7d7a75f63cf62;hp=881bfa45cdf9953fdc4f67fe521897749120567b;hpb=e20771063d5274fedf3ce46d907599c8ec219251;p=brisk.git diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index 881bfa4..41cacfd 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -1051,7 +1051,7 @@ class Bin5 { // if ($user_cur->sess == '' || $user_cur->stat != 'room') if ($user_cur->sess == '') continue; - if ($user_cur->name == $name_new) { + if (strcasecmp($user_cur->name, $name_new) == 0) { $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; "; $premsg = sprintf($mlang_brisk['nickdupl'][$G_lang], xcape($name_new)); @@ -1105,10 +1105,7 @@ class Bin5 { (BIN5_PLAYERS_N == 3 ? 0: $this->user[$table->player[($user_cur->table_pos+4) % BIN5_PLAYERS_N]]->flags), (BIN5_PLAYERS_N == 3 ? "" : xcape($this->user[$table->player[($user_cur->table_pos+4) % BIN5_PLAYERS_N]]->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,ENT_COMPAT,"UTF-8"), $itou); + $user_cur->comm[$user_cur->step % COMM_N] .= $user_cur->myname_innerHTML(); } $user_cur->step_inc(); } @@ -1372,10 +1369,7 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again) $ret .= "background_set();"; /* USERS INFO */ - $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 .= $user->myname_innerHTML(); $ret .= sprintf('set_names([%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"]); ', $room->user[$table->player[($table_pos) % BIN5_PLAYERS_N]]->flags, xcape($room->user[$table->player[($table_pos) % BIN5_PLAYERS_N]]->name),