X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=0e3c67aa0ec8ddd6aeea599bc3a1fe4149728e3d;hb=645d558d0d1411fc2c1f33c95b2783e1b0ae3e06;hp=8118b8cdee12629af791466c48ca06f168cbc6b9;hpb=fd19aa57f6308c957ae05bfaf5dd78822f2333dd;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 8118b8c..0e3c67a 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -141,10 +141,10 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
$G_lng = langtolng($G_lang);
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "4.7.2";
+$G_brisk_version = "4.8.1";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': prova il nuovo azioni->preferenze.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': prova il nuovo azioni->preferenze, aggiunto stato utente ONLYFIRST.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: server-side infrastructure to manage user preferences added and S customization added.',
'If you want to subscribe our Mailing List, click it!' ) );
@@ -1292,54 +1292,53 @@ class Room
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];
-
- // wagon shutdown
- if ($table->wag_own != -1 && $table->player_n == PLAYERS_N) {
- for ($i = 0 ; $i < TABLES_N ; $i++) {
- if ($table->wag_own == $table->player[$i]) {
- $train_app = sprintf("tra.rem(%d); ", $table_idx);
- $table->wag_reset(time());
- break;
- }
- }
- }
- }
-
- for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $ret = "";
- $user_cur = $this->user[$i];
- if ($user_cur->sess == '' || $user_cur->stat != 'room')
- continue;
+ log_main("room_sitdown ".($user == FALSE ? "USER: FALSE" : "USER: ".$user->name));
- $ret = "gst.st = ".($user_cur->step+1)."; ".$train_app;
- if ($table_idx > -1)
- $ret .= $this->table_content($user_cur, $table_idx);
- $ret .= $this->standup_content($user_cur);
+ $train_app = "";
- if ($user->idx_get() == $i) {
- $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, FALSE);
- $ret .= $this->table[$e]->act_content($user_cur);
- }
+ if ($table_idx > -1 && $table_idx < TABLES_N) {
+ $table = $this->table[$table_idx];
+
+ // wagon shutdown
+ if ($table->wag_own != -1 && $table->player_n == PLAYERS_N) {
+ for ($i = 0 ; $i < TABLES_N ; $i++) {
+ if ($table->wag_own == $table->player[$i]) {
+ $train_app = sprintf("tra.rem(%d); ", $table_idx);
+ $table->wag_reset(time());
+ break;
+ }
+ }
+ }
}
- 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,
- /// ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH));
- $ret .= $table->act_content($user_cur);
- }
+
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ $ret = "";
+ $user_cur = $this->user[$i];
+ if ($user_cur->sess == '' || $user_cur->stat != 'room')
+ continue;
+
+ $ret = "gst.st = ".($user_cur->step+1)."; ".$train_app;
+ if ($table_idx > -1)
+ $ret .= $this->table_content($user_cur, $table_idx);
+ $ret .= $this->standup_content($user_cur);
+
+ if ($user->idx_get() == $i) {
+ $ret .= 'subst = "sitdown"; tra.hide(); ';
+ // clean the action buttons in other tables
+ for ($e = 0 ; $e < TABLES_N ; $e++) {
+ $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,
+ /// ($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;
+ $user_cur->step_inc();
}
- $user_cur->comm[$user_cur->step % COMM_N] = $ret;
- $user_cur->step_inc();
- }
}
function chatt_send($user, $mesg)
@@ -2297,6 +2296,8 @@ class Room
function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
{
+ GLOBAL $G_black_list;
+
printf("NEW_SOCKET (root): %d PATH [%s]\n", intval($new_socket), $path);
$enc = get_encoding($header);
@@ -2365,7 +2366,7 @@ class Room
}
$content = "";
- $user->stream_init($s_a_p->rndstr, $enc, $header_out, $content, $get, $post, $cookie);
+ $user->stream_init($s_a_p->rndstr, $enc, $header, $header_out, $content, $get, $post, $cookie);
$response = headers_render($header_out, -1).chunked_content($user->rd_zls_get(), $content);
$response_l = mb_strlen($response, "ASCII");