X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=bd80e1fd91ba6fee8b8e90d66e4d55836dd56053;hb=43038b6a6a2edc22b573ccc0abac9374499154a6;hp=4dd36c9ea8901b6d8b9d700ce6f942857c26bb86;hpb=323f1b5ce4d154e922b024384e6ec8c6f0f6d858;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 4dd36c9..bd80e1f 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -1087,6 +1087,13 @@ class User { return (FALSE); } + function myname_innerHTML() + { + $class_id = ($this->flags & USER_FLAG_AUTH) + 1; + + return (sprintf('$("myname").innerHTML = "%s";', $class_id, + xcape($this->name,ENT_COMPAT,"UTF-8"))); + } } // end class User @@ -1335,9 +1342,8 @@ class Room { } $ret .= sprintf('subst = "%s";', $user->subst); - $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(); + for ($i = 0 ; $i < TABLES_N ; $i++) { $ret .= $this->table_content($user, $i); @@ -1578,9 +1584,7 @@ class Room { $ret .= $this->table_content($user_cur, $table_idx); 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); + $ret .= $user->myname_innerHTML(); } $user_cur->comm[$user_cur->step % COMM_N] = $ret; $user_cur->step_inc(); @@ -2301,11 +2305,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->idx_get() == $i) { - $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); + $user_cur->comm[$user_cur->step % COMM_N] .= $user->myname_innerHTML(); } log_main("FROM STANDUP: NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]);