X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2FObj%2Fbrisk.phh;h=eaba39d19410c25622717607e5463094166425c7;hb=15f97d0b5822a3fed34ec24b6a895da64b024d9a;hp=30d7cef21e1904f13b4cfbb5d45be45767867ff0;hpb=9b3aaa36e632185c5dd838eda214397daf5a6357;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 30d7cef..eaba39d 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -2,7 +2,10 @@
/*
* brisk - brisk.phh
*
- * Copyright (C) 2006-2007 matteo.nastasi@milug.org
+ * Copyright (C) 2006-2008 Matteo Nastasi
+ * mailto: nastasi@alternativeoutput.it
+ * matteo.nastasi@milug.org
+ * web: http://www.alternativeoutput.it
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,24 +22,35 @@
*
*/
+
+define(BRISK_CONF, "brisk.conf.pho");
define(FTOK_PATH, "/var/lib/brisk");
define(LEGAL_PATH, "/tmp/legal_brisk");
define(PROXY_PATH, "/var/lib/brisk_proxy");
-define(TABLES_N, 20);
+define(TABLES_N, 32);
define(PLAYERS_N, 3);
define(MAX_POINTS, 5);
define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
-define(SHM_DIMS, (50000 + 10000 * TABLES_N + 15000 * MAX_PLAYERS));
-define(COMM_N, 12);
+define(SHM_DIMS_MIN, (50000 + 10000 * TABLES_N + 15000 * MAX_PLAYERS));
+define(SHM_DIMS_MAX, SHM_DIMS_MIN + 1048576);
+define(SHM_DIMS_DLT, 65536);
+
+define(COMM_N, 18);
define(COMM_GEN_N, 50);
+
+define(CHAT_N, 3);
+define(CHAT_ILL_TIME, 6);
+
define(SESS_LEN, 13);
define(STREAM_TIMEOUT, 20);
define(EXPIRE_TIME_RD, 180);
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(GARBAGE_TIMEOUT, 10);
-define(NICKSERV, "SERVER");
+define(NICKSERV, "BriskServ");
define(DBG_ONL2, 0x0001);
define(DBG_ONLY, 0x0002);
@@ -48,6 +62,7 @@ define(DBG_LOCK, 0x0040);
define(DBG_WRIT, 0x0080);
define(DBG_LOAD, 0x0100);
define(DBG_AUTH, 0x0200);
+define(DBG_CRIT, 0x0400);
define(BRISK_DEBUG, 0);
@@ -55,12 +70,14 @@ define(BRISK_SINGLE_DEBUG,0);
define(BRISK_SINGLE_SESS, "");
// define(DEBUGGING, "local");
+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.9.1";
+$G_brisk_version = "spawn-0.13.4";
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': chiuso il bug dei tavoli bianchi, versione beta.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': bug del ticker e della carta coperta che rimane sul tavolo chiusi - Beta6.',
'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.');
@@ -87,7 +104,7 @@ Dopo che è iniziata una partita per uscirne dovete chiedere agli altri gi
- Comandi della chat
- /nick <nuovo_nickname> - cambio di nickname
-
- .. to be continue ..
+
- /tav <frase di invitogt; - invito per gli altri giocatori al tavolo dove si è seduti
';
@@ -157,6 +174,10 @@ class Table {
var $mazzo;
var $gstart;
var $turn;
+
+ var $wag_own;
+ var $wag_com;
+ var $wag_tout;
var $asta_pla;
var $asta_pla_n;
@@ -181,6 +202,8 @@ class Table {
var $table_token;
var $table_start;
+ var $wakeup_time;
+
function Table()
{
}
@@ -207,6 +230,11 @@ class Table {
$thiz->briscola = -1;
$thiz->friend = -1;
$thiz->turn = 0;
+
+ $thiz->wag_own = NULL;
+ $thiz->wag_com = "";
+ $thiz->wag_tout = 0;
+
$thiz->old_reason = "";
$thiz->old_asta_pnt = -1;
$thiz->old_pnt = -1;
@@ -215,6 +243,8 @@ class Table {
$thiz->table_token = "";
$thiz->table_start = 0;
+
+ $thiz->wakeup_time = 0;
return ($thiz);
}
@@ -235,6 +265,10 @@ class Table {
$thiz->gstart = $from->gstart;
$thiz->turn = $from->turn;
+ $thiz->wag_own = $from->wag_own;
+ $thiz->wag_com = $from->wag_com;
+ $thiz->wag_tout = $from->wag_taut;
+
$thiz->asta_pla = $from->asta_pla;
$thiz->asta_pla_n = $from->asta_pla_n;
$thiz->asta_card = $from->asta_card;
@@ -258,6 +292,8 @@ class Table {
$thiz->table_token = $from->table_token;
$thiz->table_start = $from->table_start;
+ $thiz->wakeup_time = $from->wakeup_time;
+
return ($thiz);
}
@@ -274,6 +310,10 @@ class Table {
$thiz->gstart = $from->gstart;
$thiz->turn = $from->turn;
+ $thiz->wag_own = $from->wag_own;
+ $thiz->wag_com = $from->wag_com;
+ $thiz->wag_tout = $from->wag_taut;
+
$thiz->asta_pla = $from->asta_pla;
$thiz->asta_pla_n = $from->asta_pla_n;
$thiz->asta_card = $from->asta_card;
@@ -302,6 +342,8 @@ class Table {
$thiz->table_token = $from->table_token;
$thiz->table_start = $from->table_start;
+ $thiz->wakeup_time = $from->wakeup_time;
+
return ($thiz);
}
@@ -317,6 +359,25 @@ class Table {
return ($oret);
}
+ function wag_set(&$user, $mesg)
+ {
+ log_main("WAG_SET");
+
+ $this->wag_own = &$user;
+ $this->wag_com = $mesg;
+ $this->wag_tout = 0;
+ }
+
+ function wag_reset($timeout)
+ {
+ log_main("WAG_RESET");
+
+ unset($this->wag_own);
+ $this->wag_own = NULL;
+ $this->wag_com = "";
+ $this->wag_tout = $timeout;
+ }
+
function bunch_make()
{
$ct = array(0,0,0,0,0);
@@ -488,6 +549,11 @@ class User {
var $table_token;// token that identify a game on a table
var $the_end; // Flag to change the end of the session
+ var $chat_lst; // Last chat line
+ var $chattime; // Array of chat times
+ var $chat_cur; // Current chat line number
+ var $chat_ban; // Time for ban chat
+ var $chat_dlt; // Delta t for ban
function User() {
}
@@ -513,6 +579,12 @@ class User {
$thiz->handpt = -1;
$thiz->exitislock = TRUE;
+ $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 = -1;
$thiz->table_token = "";
@@ -548,6 +620,15 @@ class User {
$thiz->asta_pnt = $from->asta_pnt;
$thiz->handpt = $from->handpt;
$thiz->exitislock = $from->exitislock;
+
+ $thiz->chattime = array();
+ for ($i = 0 ; $i < CHAT_N ; $i++)
+ $thiz->chattime[$i] = $from->chattime[$i];
+ $thiz->chat_cur = $from->chat_cur;
+ $thiz->chat_lst = $from->chat_lst;
+ $thiz->chat_ban = $from->chat_ban;
+ $thiz->chat_dlt = $from->chat_dlt;
+
$thiz->table = $from->table;
$thiz->table_pos = $from->table_pos;
$thiz->table_token = $from->table_token;
@@ -575,19 +656,26 @@ class User {
$thiz->trans_step = $from->trans_step;
$thiz->comm = array();
+ /*
$i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N));
for ($i = $i_start ; $i < $from->step ; $i++) {
log_wr("TRY PUSH:".$i);
$ii = $i % COMM_N;
$thiz->comm[$ii] = $from->comm[$ii];
}
-
+ */
$thiz->asta_card = $from->asta_card;
$thiz->asta_pnt = $from->asta_pnt;
$thiz->handpt = $from->handpt;
$thiz->exitislock = $from->exitislock;
$thiz->the_end = $from->the_end;
+ $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;
@@ -625,8 +713,8 @@ class User {
return (FALSE);
}
- function step_inc() {
- $this->step++;
+ function step_inc($delta = 1) {
+ $this->step += $delta;
if (validate_sess($this->sess)) {
$fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
@@ -638,6 +726,21 @@ class User {
return (FALSE);
}
+
+ function reset() {
+ $tmp_sess = $this->sess;
+ $this->sess = "";
+ step_unproxy($tmp_sess);
+ $this->name = "";
+ while (array_pop($this->comm) != NULL);
+ $this->step = 0;
+ $this->chattime = array_fill(0, CHAT_N, 0);
+ $this->chat_cur = 0;
+ $this->chat_lst = "";
+ $this->chat_ban = 0;
+ $this->chat_dlt = 0;
+ $this->the_end = FALSE;
+ }
} // end class User
@@ -683,6 +786,7 @@ class Room {
var $comm; // commands for many people
var $step; // current step of the comm array
var $garbage_timeout;
+ var $shm_sz;
function Room () {
$this->user = array();
@@ -758,7 +862,7 @@ class Room {
$this->room_join_wakeup(&$user_cur, FALSE, 0);
$table_cur->table_token = "";
-
+ $table_cur->wakeup_time = $curtime + WAKEUP_TIME;
Briskin5::destroy_data($table_idx);
}
else {
@@ -772,14 +876,14 @@ class Room {
}
} // else if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
else if ($no_recovery == FALSE) {
- log_main("ERROR: table ".$table_idx." unrecoverable join");
+ log_crit("ERROR: table ".$table_idx." unrecoverable join");
for ($i = 0 ; $i < $table_cur->player_n ; $i++) {
$user_cur = &$this->user[$table_cur->player[$i]];
$user_cur->subst = "shutdowner";
$user_cur->step_inc();
- $ret = sprintf('stat = "%s"; subst = "%s";', $cur_user->stat, $cur_user->subst);
+ $ret = sprintf('stat = "%s"; subst = "%s";', $user_cur->stat, $user_cur->subst);
$ret .= "gst.st = ".($user_cur->step+1)."; ";
$ret .= show_notify("
I dati del tavolo n° ".$user_cur->table." sono inconsistenti, verranno resettati.
Torni in piedi.
", 2000, "Chiudi.", 400, 110);
$user_cur->comm[$user_cur->step % COMM_N] = $ret;
@@ -812,12 +916,16 @@ class Room {
if ($user_cur->stat == 'table' || $user_cur->stat == 'room') {
log_auth($user_cur->sess, "Autologout session.");
+ $user_cur->reset();
+ /* factorized with ->reset()
$tmp_sess = $user_cur->sess;
$user_cur->sess = "";
step_unproxy($tmp_sess);
$user_cur->name = "";
+ while (array_pop($user_cur->comm) != NULL);
$user_cur->step = 0;
$user_cur->the_end = FALSE;
+ */
log_rd2("AUTO LOGOUT.");
if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table')
@@ -847,6 +955,37 @@ class Room {
return ($ismod);
}
+ function show_room($user_step, &$user)
+ {
+ log_main("show_room: username: ".$user->name);
+
+
+ $ret = sprintf('gst.st = %d; ', $user_step);
+ if ($user->subst == 'standup')
+ $ret .= "tra.show(); ";
+ else
+ $ret .= "tra.hide(); ";
+
+ $ret .= sprintf('stat = "%s";', $user->stat);
+
+ $ret .= root_wellcome($user);
+ $ret .= sprintf('subst = "%s";', $user->subst);
+ $ret .= sprintf('$("myname").innerHTML = "%s";', xcape($user->name));
+ 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);
+ 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
+ $ret .= sprintf('tra.rem(%d); ', $i);
+ }
+ $ret .= $this->standup_content($user);
+
+ return ($ret);
+ }
+
function room_wakeup(&$user)
{
@@ -883,6 +1022,15 @@ class Room {
$user->subst = "standup";
$user->laccwr = $curtime;
}
+
+ $remove_wagon = false;
+ if($table->wag_own == $user) {
+ $remove_wagon = true;
+ $table->wag_reset($curtime);
+
+ }
+
+
/* aggiorna l'array dei giocatori al tavolo. */
$table->user_rem(&$this, &$user);
@@ -893,7 +1041,7 @@ class Room {
log_main("VALORI: name: ".$user_cur->name."from_table: ".$from_table." tab: ".$user_cur->table." taix: ".$table_idx." ucur: ".$user_cur." us: ".$user);
- $ret = "gst.st = ".($user_cur->step+1)."; ";
+ $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++; document.location.assign("index.php");|';
@@ -902,8 +1050,8 @@ class Room {
else if ($user_cur->stat == "room") {
log_main("DOCUMENT.index.php: from table");
- $ret .= table_content($this, $user_cur, $table_idx);
- $ret .= standup_content($this, $user_cur);
+ $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);
@@ -911,7 +1059,7 @@ class Room {
if ($user_cur == $user) {
// set the new status
- $ret .= 'subst = "standup"; ';
+ $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)
@@ -960,6 +1108,12 @@ class Room {
$user_cur->subst = "standup";
$user_cur->table = -1;
$user_wup[$user_wup_n++] = &$user_cur;
+
+ $remove_wagon = false;
+ if($table->wag_own == $user_cur) {
+ $remove_wagon = true;
+ $table->wag_reset($curtime);
+ }
}
$user_tab[$user_tab_n++] = &$user_cur;
}
@@ -981,12 +1135,12 @@ class Room {
log_main("___");
log_main("VALORI name: ".$user_cur->name." tab: ".$user_cur->table." taix: ".$table_idx." ucur: ".$user_cur." us: ".$user);
- $ret = "gst.st = ".($user_cur->step+1)."; ";
+ $ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : "");
if ($user_cur->stat == "room") {
log_main("DOCUMENT.index.php from table");
- $ret .= table_content($this, $user_cur, $table_idx);
- $ret .= standup_content($this, $user_cur);
+ $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);
@@ -998,10 +1152,15 @@ class Room {
// for users that wakeup the room will be reconstructed by index_rd.php
if ($tab_idx < $user_tab_n) {
log_main("PRE show_room username: ".$user_cur->name." STEP: ".$user_cur->step);
+
+// ARRAY_POP DISABLED
+// if ($trans_delta == 0)
+// while (array_pop($user_cur->comm) != NULL);
+
$user_cur->trans_step = $user_cur->step + 1 + $trans_delta;
$user_cur->comm[$user_cur->step % COMM_N] = "";
$user_cur->step_inc();
- $user_cur->comm[$user_cur->step % COMM_N] = show_room(&$this, ($user_cur->step + 1), &$user_cur);
+ $user_cur->comm[$user_cur->step % COMM_N] = $this->show_room(($user_cur->step + 1), &$user_cur);
$user_cur->step_inc();
log_main("POST show_room username: ".$user_cur->name." STEP: ".$user_cur->step);
@@ -1042,7 +1201,7 @@ class Room {
$ret = "gst.st = ".($user_cur->step+1)."; ";
if ($table_idx > -1)
- $ret .= table_content($this, $user_cur, $table_idx);
+ $ret .= $this->table_content($user_cur, $table_idx);
if ($user_cur == $user) {
$ret .= sprintf('$("myname").innerHTML = "%s: ";', xcape($user->name));
@@ -1058,22 +1217,37 @@ class Room {
{
log_main("room_sitdown ".($user == FALSE ? "USER: FALSE" : "USER: ".$user->name));
- if ($table_idx > -1)
+ $train_app = "";
+
+ if ($table_idx > -1 && $table_idx < TABLES_N) {
$table = &$this->table[$table_idx];
-
+
+ // wagon shutdown
+ if ($table->wag_own != NULL && $table->player_n == PLAYERS_N) {
+ for ($i = 0 ; $i < TABLES_N ; $i++) {
+ $user_cur =& $this->user[$table->player[$i]];
+ if ($user_cur == $table->wag_own) {
+ $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;
- $ret = "gst.st = ".($user_cur->step+1)."; ";
+ $ret = "gst.st = ".($user_cur->step+1)."; ".$train_app;
if ($table_idx > -1)
- $ret .= table_content($this, $user_cur, $table_idx);
- $ret .= standup_content($this, $user_cur);
+ $ret .= $this->table_content($user_cur, $table_idx);
+ $ret .= $this->standup_content($user_cur);
if ($user_cur == $user) {
- $ret .= 'subst = "sitdown"; ';
+ $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);
@@ -1093,105 +1267,229 @@ class Room {
function chatt_send(&$user, $mesg)
{
- if ($user->stat == 'table') {
- $table = &$this->table[$user->table];
- }
-
- $user_mesg = substr($mesg,6);
+ GLOBAL $G_alarm_passwd;
+ $only_you = FALSE;
+ // common settings
+ $msg = substr($mesg, 6, 128);
$timecur = time();
-
$dt = date("H:i ", $timecur);
- if (strncmp($user_mesg, "/nick ", 6) == 0) {
+
+ //
+ // Compute actions
+ //
+
+ $to_user = FALSE;
+ $to_all = FALSE;
+ $to_room = FALSE;
+ $to_tabl = FALSE;
+ $update_room = FALSE;
+
+ if (strcmp($msg, "/tav") == 0 ||
+ strncmp($msg, "/tav ", 5) == 0) {
+ do {
+ if ($user->stat != 'room' || $user->subst != 'sitdown') {
+ $msg = "
Per attivare il messaggio di segnalazione del tavolo occorre essere seduti.
";
+ $to_user = show_notify($msg, 0, "chiudi", 400, 100);
+
+ break;
+ }
+
+ $table = &$this->table[$user->table];
+
+ if ($table->wag_own != NULL) {
+ $msg = "
Il messaggio di segnalazione del tavolo è già attivato.
";
+ $to_user = show_notify($msg, 0, "chiudi", 400, 100);
+
+ break;
+ }
+
+ $dtime = $timecur - $table->wag_tout;
+ if ($dtime < EXPIRE_TIME_WAG) {
+ $msg = sprintf("
Il messaggio di segnalazione del tavolo
è disattivato ancora per %d second%s.
",
+ EXPIRE_TIME_WAG - $dtime, (EXPIRE_TIME_WAG - $dtime == 1 ? "o" : "i"));
+ $to_user = show_notify($msg, 0, "chiudi", 400, 100);
+
+ break;
+ }
+
+ $msg = substr($msg, 5);
+
+ $table->wag_set($user, $msg);
+ $to_user = sprintf('tra.add(%d, "%s");', $user->table, xcape(sprintf("%s: %s", $user->name, $msg)));
+ $to_room = $to_user;
+
+ } while (0);
+ } // /tav chat command
+
+ else if (strncmp($msg, "/alarm ", 7) == 0) {
+ $alarm_check = "/alarm ".$G_alarm_passwd." ";
+ do {
+ if (strncmp($msg, $alarm_check, strlen($alarm_check)) != 0) {
+ $msg = "
La password digitata non è corretta.
";
+ $to_user = show_notify($msg, 0, "chiudi", 400, 100);
+
+ break;
+ }
+
+ $to_user = sprintf('chatt_sub("%s","Alarm %s inviato a tutti.");',
+ $dt.NICKSERV, xcape(substr($msg, strlen($alarm_check))));
+
+ // $msg = "
".$dt.NICKSERV."
".xcape(substr($msg, strlen($alarm_check)))."
";
+ $msg = sprintf("
%s%s
%s
",
+ $dt, NICKSERV, xcape(substr($msg, strlen($alarm_check))));
+ $to_all = show_notify($msg, 0, "chiudi", 400, 120);
+ } while (0);
+ } // /alarm chat command
+
+ else if (strncmp($msg, "/nick ", 6) == 0) {
log_main("chatt_send BEGIN");
- if (($name_new = validate_name(substr($user_mesg, 6))) == FALSE) {
- $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
- $user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s","Il nickname deve contenere almeno una lettera o una cifra.");', $dt.NICKSERV, xcape($name_new));
- $user->step_inc();
+ do {
+ if (($name_new = validate_name(substr($msg, 6))) == FALSE) {
+ $to_user = sprintf('chatt_sub("%s","Il nickname deve contenere almeno una lettera o una cifra.");', $dt.NICKSERV, xcape($name_new));
+ break;
+ }
+
+ $msg = "COMMAND ".$msg;
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ $user_cur = &$this->user[$i];
+
+ if ($user_cur->sess == '')
+ continue;
+ if ($user_cur->name == $name_new)
+ break;
+ }
+ if ($i < MAX_PLAYERS) {
+ $to_user = sprintf('chatt_sub("%s","Nickname %s già in uso.");', $dt.NICKSERV, xcape($name_new));
+ break;
+ }
+
+ $user->name = $name_new;
+
+ log_main("chatt_send start set");
+
+ $update_room = TRUE;
+ } while (0);
+ } // nick chat command
+
+ else { // normal chat line
+ if ($timecur < ($user->chat_ban + $user->chat_dlt)) {
+ $only_you = TRUE;
+ $user->chat_dlt = $user->chat_dlt * 2;
+ if ($user->chat_dlt > 120)
+ $user->chat_dlt = 120;
+ }
+ else if ($user->chat_lst == $msg)
+ $only_you = TRUE;
+ else if ($timecur - $user->chattime[($user->chat_cur + 1) % CHAT_N] < CHAT_ILL_TIME) {
+ $user->chat_ban = $timecur;
+ $user->chat_dlt = 5;
+ $only_you = TRUE;
+ }
+ else {
+ $user->chat_ban = 0;
+ $user->chat_dlt = 0;
+ }
- return;
+ if ($only_you) {
+ $to_user = sprintf('chatt_sub("%s","%s");', $dt.xcape($user->name), xcape("== chat ban =="));
}
- $user_mesg = "COMMAND ".$user_mesg;
- // Search dup name
- // change
- // update local graph
- // update remote graphs
- for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $user_cur = &$this->user[$i];
- // if ($user_cur->sess == '' || $user_cur->stat != 'room')
- if ($user_cur->sess == '')
- continue;
- if ($user_cur->name == $name_new) {
- $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
- $user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s","Nickname %s già in uso.");', $dt.NICKSERV, xcape($name_new));
- $user->step_inc();
- break;
- }
+ else {
+ $to_user = sprintf('chatt_sub("%s","%s");', $dt.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;
}
- if ($i == MAX_PLAYERS) {
- $user->name = $name_new;
- log_main("chatt_send start set");
-
+ log_legal($timecur, $user->sess, $user->name,
+ ($user->stat == 'room' ? 'room' : 'table '.$user->table),$msg);
+
+ $user->chat_lst = "$msg";
+ $user->chattime[$user->chat_cur % CHAT_N] = $timecur;
+ $user->chat_cur++;
+ }
- for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- log_main("chatt_send set loop");
-
- $user_cur = &$this->user[$i];
- if ($user_cur->sess == '')
- continue;
- if ($user_cur->stat == 'room') {
- if ($user->stat == 'room' && $user->subst == 'standup') {
- $this->standup_update(&$user);
- }
- else if ($user->stat == 'room' && $user->subst == 'sitdown' ||
- $user->stat == 'table') {
- log_main("chatt_send pre table update");
+ if ($to_all) {
+ $to_room = $to_all;
+ $to_tabl = $to_all;
+ }
- $this->table_update(&$user);
+ //
+ // Output to clients
+ //
- log_main("chatt_send post table update");
- }
- }
- else if ($user_cur->stat == 'table' && $user_cur->table == $user->table) {
- $table = &$this->table[$user->table];
-
- $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
- $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('set_names(" %s", " %s", " %s", " %s", " %s"); ',
- xcape($this->user[$table->player[($user_cur->table_pos)%PLAYERS_N]]->name),
- xcape($this->user[$table->player[($user_cur->table_pos+1)%PLAYERS_N]]->name),
- xcape($this->user[$table->player[($user_cur->table_pos+2)%PLAYERS_N]]->name),
- (PLAYERS_N == 3 ? "" : xcape($this->user[$table->player[($user_cur->table_pos+3)%PLAYERS_N]]->name)),
- (PLAYERS_N == 3 ? "" : xcape($this->user[$table->player[($user_cur->table_pos+4)%PLAYERS_N]]->name)));
- if ($user_cur == $user)
- $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s";',
- xcape($user->name,ENT_COMPAT,"UTF-8"));
- $user_cur->step_inc();
- }
- }
- }
+ if ($to_user != FALSE) {
+ $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+ $user->comm[$user->step % COMM_N] .= $to_user;
+ $user->step_inc();
}
- else {
- for ($i = 0 ; $i < ($user->stat == 'room' ? MAX_PLAYERS : PLAYERS_N) ; $i++) {
- if ($user->stat == 'room') {
- $user_cur = &$this->user[$i];
- if ($user_cur->sess == '' || $user_cur->stat != 'room')
- continue;
- }
- else {
- $user_cur = &$this->user[$table->player[$i]];
- }
-
- $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
- $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('chatt_sub("%s","%s");',
- $dt.xcape($user->name), xcape($user_mesg));
- $user_cur->step_inc();
+
+ if ($to_room != FALSE) {
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ $user_cur = &$this->user[$i];
+ // if ($user_cur->sess == '' || $user_cur->stat != 'room')
+ if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user_cur == $user)
+ continue;
+
+ $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
+ $user_cur->comm[$user_cur->step % COMM_N] .= $to_room;
+ $user_cur->step_inc();
}
- log_legal($timecur, $user->sess, $user->name,
- ($user->stat == 'room' ? 'room' : 'table '.$user->table),$user_mesg);
}
- }
+
+ if ($to_tabl) {
+ // Before all align times with table timeout
+ for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
+ $table_cur =& $this->table[$table_idx];
+ // if the table is complete and exists its shared mem we get the info about users lacc
+
+ if ($table_cur->player_n == PLAYERS_N) {
+ log_main("PLAYERS == N TABLE ".$table_idx);
+
+ if (($sem = Briskin5::lock_data($table_idx)) != FALSE) {
+ log_main("bin5 lock data success");
+
+ $no_recovery = FALSE;
+ if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
+ if ($table_cur->table_token != $bri->table_token) {
+ log_main("ERROR: not matching table_token. Room: ".$table_cur->table_token." Table: ".$bri->table_token);
+ $bri = FALSE;
+ }
+ }
+
+ if ($bri != FALSE) {
+ $bri_table = &$bri->table[0];
+ for ($i = 0 ; $i < $bri_table->player_n ; $i++) {
+ // stat must be "table" by definition
+ $bri_user =& $bri->user[$i];
+
+ 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;
+ $bri_user->step_inc();
+ }
+ Briskin5::save_data(&$bri);
+ }
+ Briskin5::unlock_data($sem);
+ } // bri::lock_data
+ } // if ($table_cur->player_n == PLAYERS_N) {
+ } // for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
+ } // if ($to_tabl == true ...
+
+ if ($update_room) {
+ if ($user->stat == 'room' && $user->subst == 'standup') {
+ $this->standup_update(&$user);
+ }
+ else if ($user->stat == 'room' && $user->subst == 'sitdown') {
+ log_main("chatt_send pre table update");
+ $this->table_update(&$user);
+ log_main("chatt_send post table update");
+ }
+ } // if ($update_room ...
+
+ return;
+ } // function chatt_send( ...
function &get_user($sess, &$idx)
{
@@ -1299,7 +1597,7 @@ class Room {
log_main("STANDUP START: ".$user_cur->stat);
if ($user_cur->stat == 'room') {
- $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".standup_content($this, $user_cur);
+ $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));
@@ -1322,34 +1620,47 @@ class Room {
function &load_data()
{
GLOBAL $G_false, $sess;
+ $doexit = FALSE;
+ do {
+ if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
+ log_main("ftok failed");
+ $doexit = TRUE;
+ break;
+ }
- if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
- echo "FTOK FAILED";
- exit;
- }
-
- if ($shm = shm_attach($tok, SHM_DIMS)) {
- $room = @shm_get_var($shm, $tok);
-
- log_only("bri == ".($room == FALSE ? "FALSE" : "TRUE")." bri === ".($room === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($room) ? "TRUE" : "FALSE"));
- if (isset($room))
- log_only("bri count ".count($room));
-
- if ($room == FALSE) {
- log_only("INIT MAIN DATA");
+ if (($shm_sz = sharedmem_sz($tok)) == -1) {
+ log_main("shmop_open failed");
+ }
+
+ if ($shm_sz == -1)
+ $shm_sz = SHM_DIMS_MIN;
+
+ if ($shm = shm_attach($tok, $shm_sz)) {
+ $room = @shm_get_var($shm, $tok);
+
+ log_only("bri == ".($room == FALSE ? "FALSE" : "TRUE")." bri === ".($room === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($room) ? "TRUE" : "FALSE"));
+ if (isset($room))
+ log_only("bri count ".count($room));
- $room =& Room::init_data();
- if (shm_put_var($shm, $tok, $room) == FALSE) {
- log_only("PUT_VAR FALLITA ".strlen(serialize($room)));
- log_only(serialize($room));
+ if ($room == FALSE) {
+ log_only("INIT MAIN DATA");
+
+ $room =& Room::init_data();
+ if (@shm_put_var($shm, $tok, $room) == FALSE) {
+ log_only("PUT_VAR FALLITA ".strlen(serialize($room)));
+ log_only(serialize($room));
+ }
}
+ $room->shm_sz = $shm_sz;
+
+ shm_detach($shm);
}
-
- shm_detach($shm);
-
$ret = &$room;
return ($ret);
- }
+ } while (0);
+
+ if ($doexit)
+ exit();
return ($G_false);
}
@@ -1361,29 +1672,29 @@ class Room {
$ret = FALSE;
$shm = FALSE;
- $isacq = FALSE;
// var_dump($room);
if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1)
return (FALSE);
- do {
- $isacq = TRUE;
-
- if (($shm = shm_attach($tok, SHM_DIMS)) == FALSE)
+ while ($room->shm_sz < SHM_DIMS_MAX) {
+ if (($shm = shm_attach($tok, $room->shm_sz)) == FALSE)
break;
// log_only("PUT_VAR DI ".strlen(serialize($room)));
- if (shm_put_var($shm, $tok, $room) == FALSE) {
- log_only("PUT_VAR FALLITA ".strlen(serialize($room)));
- log_only(serialize($room));
+ if (shm_put_var($shm, $tok, $room) != FALSE) {
+ shm_detach($shm);
+ return (TRUE);
+ }
+ if (shm_remove($shm) === FALSE) {
+ log_only("REMOVE FALLITA");
break;
}
- // log_main("QUI CI ARRIVA [".$room->user[0]->name."]");
- $ret = TRUE;
- } while (0);
-
+ shm_detach($shm);
+ $room->shm_sz += SHM_DIMS_DLT;
+ }
+
if ($shm)
shm_detach($shm);
@@ -1421,6 +1732,91 @@ class Room {
return (sem_release($res));
}
+
+ function standup_content($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('', $ct);
+
+ for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) {
+ if ($this->user[$e]->sess == "" || $this->user[$e]->stat != "room" || $this->user[$e]->name == "")
+ continue;
+
+
+ if ($this->user[$e]->subst == "standup") {
+ if (($ct % 4) == 0) {
+ $content .= '';
+ }
+ if ($this->user[$e] == $user)
+ { $hilion = ""; $hilioff = ""; }
+ else
+ { $hilion = ""; $hilioff = ""; }
+
+ $content .= sprintf('%s%s%s | ',$hilion, xcape($this->user[$e]->name), $hilioff);
+ if (($ct % 4) == 3) {
+ $content .= '
';
+ }
+ $ct++;
+ }
+ }
+ $content .= '
';
+
+ $content2 = '';
+ $ret .= sprintf('$("standup").innerHTML = "%s"; $("esco").innerHTML = "%s";',
+ $content, $content2);
+
+ return ($ret);
+ }
+
+ 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;
+
+ for ($i = 0 ; $i < $table->player_n ; $i++) {
+ $user_cur = &$this->user[$table->player[$i]];
+
+ if ($user_cur == $user)
+ { $hilion = ""; $hilioff = ""; }
+ else
+ { $hilion = ""; $hilioff = ""; }
+
+ log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx));
+
+ $content .= sprintf("%s%s%s
",$hilion, xcape($user_cur->name), $hilioff);
+ }
+ /*
+ for ( ; $i < PLAYERS_N ; $i++)
+ $content .= "
";
+ */
+
+ $ret .= sprintf('$("table%d").innerHTML = "%s";', $table_idx, $content);
+
+ return ($ret);
+ }
+
+
} // end class Room
function make_seed()
@@ -1450,6 +1846,26 @@ function log_only2($log) {
}
}
+function log_crit($log) {
+ GLOBAL $sess;
+
+ if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CRIT) == 0)
+ return;
+
+ if (isset($sess) == FALSE)
+ $ssess = "XXXX";
+ else
+ $ssess = $sess;
+
+ if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CRIT) == 0)
+ return;
+
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("CRIT: [%s] [%s]\n", $ssess, $log));
+ fclose($fp);
+ }
+}
+
function log_only($log) {
GLOBAL $sess;
@@ -1677,89 +2093,6 @@ function table_act_content($isstanding, $sitted, $table, $cur_table)
return ($ret);
}
-function table_content($room, $user, $table_idx)
-{
- $content = "";
- $ret = "";
- // TODO
- //
- // Si possono usare i dati nella classe table
- //
-
- $sess = $user->sess;
- $table = &$room->table[$table_idx];
-
- if ($user->stat != 'room')
- return;
-
- for ($i = 0 ; $i < $table->player_n ; $i++) {
- $user_cur = &$room->user[$table->player[$i]];
-
- if ($user_cur == $user)
- { $hilion = ""; $hilioff = ""; }
- else
- { $hilion = ""; $hilioff = ""; }
-
- log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx));
-
- $content .= sprintf("%s%s%s
",$hilion, xcape($user_cur->name), $hilioff);
- }
- /*
- for ( ; $i < PLAYERS_N ; $i++)
- $content .= "
";
- */
-
- $ret .= sprintf('$("table%d").innerHTML = "%s";', $table_idx, $content);
-
- return ($ret);
-}
-
-function standup_content(&$room, $user)
-{
- $ret = "";
- $content = "";
-
- if ($user->stat != 'room')
- return;
-
- for ($e = 0 , $ct = 0 ; $ct < 4 && $e < MAX_PLAYERS ; $e++) {
- if ($room->user[$e]->sess == "" || $room->user[$e]->stat != "room" || $room->user[$e]->name == "")
- continue;
- $ct++;
- }
-
- $content .= sprintf('', $ct);
-
- for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) {
- if ($room->user[$e]->sess == "" || $room->user[$e]->stat != "room" || $room->user[$e]->name == "")
- continue;
-
-
- if ($room->user[$e]->subst == "standup") {
- if (($ct % 4) == 0) {
- $content .= '';
- }
- if ($room->user[$e] == $user)
- { $hilion = ""; $hilioff = ""; }
- else
- { $hilion = ""; $hilioff = ""; }
-
- $content .= sprintf('%s%s%s | ',$hilion, xcape($room->user[$e]->name), $hilioff);
- if (($ct % 4) == 3) {
- $content .= '
';
- }
- $ct++;
- }
- }
- $content .= '
';
-
- $content2 = '';
- $ret .= sprintf('$("standup").innerHTML = "%s"; $("esco").innerHTML = "%s";',
- $content, $content2);
-
- return ($ret);
-}
-
function show_notify($text, $tout, $butt, $w, $h)
{
@@ -1931,8 +2264,11 @@ function root_wellcome($user)
GLOBAL $root_wellarr;
$ret = "";
+ $timecur = time();
+ $dt = date("H:i ", $timecur);
+
for ($i = 0 ; $i < count($root_wellarr) ; $i++)
- $ret .= sprintf('chatt_sub("ChanServ: ","%s");', str_replace('"', '\"', $root_wellarr[$i]));
+ $ret .= sprintf('chatt_sub("%s","%s");', $dt.NICKSERV, str_replace('"', '\"', $root_wellarr[$i]));
return ($ret);
}
@@ -1948,28 +2284,6 @@ function table_wellcome($user)
return ($ret);
}
-function show_room(&$room, $user_step, &$user)
-{
- log_main("show_room: username: ".$user->name);
-
-
- $ret = sprintf('gst.st = %d;', $user_step);
- $ret .= sprintf('stat = "%s";', $user->stat);
-
- $ret .= root_wellcome($user);
- $ret .= sprintf('subst = "%s";', $user->subst);
- $ret .= sprintf('$("myname").innerHTML = "%s";', xcape($user->name,ENT_COMPAT,"UTF-8"));
- for ($i = 0 ; $i < TABLES_N ; $i++) {
- $ret .= table_content($room, $user, $i);
- $act_content = table_act_content(($user->subst == 'standup'),
- $room->table[$i]->player_n, $i, $user->table);
- $ret .= sprintf('$("table_act%d").innerHTML = "%s";', $i, $act_content);
- }
- $ret .= standup_content($room, $user);
-
- return ($ret);
-}
-
/* show table
@@ -2002,7 +2316,7 @@ function show_table(&$room, &$user, $sendstep, $is_transition, $is_again)
$ret .= "background_set();";
/* USERS INFO */
- $ret .= sprintf('$("myname").innerHTML = "%s";', xcape($user->name,ENT_COMPAT,"UTF-8"));
+ $ret .= sprintf('$("myname").innerHTML = "%s";', xcape($user->name));
$ret .= sprintf('set_names(" %s", " %s", " %s", " %s", " %s"); ',
xcape($room->user[$table->player[($table_pos)%PLAYERS_N]]->name),
xcape($room->user[$table->player[($table_pos+1)%PLAYERS_N]]->name),
@@ -2299,4 +2613,18 @@ function secstoword($secs)
return ($ret);
}
+function sharedmem_sz($tok)
+{
+ if (($shm_id = @shmop_open($tok, 'a', 0, 0)) == FALSE) {
+ log_main("shmop_open failed");
+ return (-1);
+ }
+ $shm_sz = shmop_size($shm_id);
+ shmop_close($shm_id);
+
+ log_main("shm_sz: ".$shm_sz." SHM_DIMS: ".SHM_DIMS);
+ return ($shm_sz);
+}
+
+
?>