+$G_room_about = array( 'it' => '
![](\\"img/brisk_logo64.png\\"){kind=logo}
briscola chiamata in salsa ajax
version '.$G_brisk_version.'
-Copyright 2006-2008 Matteo Nastasi (aka mop)
'; +Copyright 2006-2009 Matteo Nastasi (aka mop)
', + 'en' => '
+
+
+ declaration briscola in ajax sauce (Beta)
+
+
+ declaration briscola in ajax sauce (Beta)
+version '.$G_brisk_version.'
+Copyright 2006-2009 Matteo Nastasi (aka mop)
'); + +$escinp_from = array( "\"" ); +$escinp_to = array( """ ); + +function escinput($s) +{ + GLOBAL $escinp_from, $escinp_to; + + return str_replace($escinp_from, $escinp_to, $s); +} + +function eschtml($s) +{ + return htmlentities($s); +} + +function esclfhtml($s) +{ + return str_replace("\n", "
\n", htmlentities($s)); +} +function langtolng($lang) +{ + GLOBAL $G_lang; + + return ($G_lang == 'en' ? '-en' : ''); +} + +function csplitter($in, $sep) +{ + $st = 0; + $id = 0; + $out = array(); + $out[$id] = ""; + for ($i = 0 ; $i < strlen($in) ; $i++) { + $ini = substr($in, $i, 1); + if ($st == 0) { + if ($ini == '\\') + $st = 1; + else if ($ini == $sep) { + $id++; + $out[$id] = ""; + } + else { + $out[$id] .= $ini; + } + } + else if ($st == 1) { + $out[$id] .= $ini; + $st = 0; + } + } + + return ($out); +} + function xcape($s) { $from = array ( '\\', '@', '|' ); @@ -173,12 +383,10 @@ class Table { { } - function &create($idx) + function create($idx) { - GLOBAL $G_false; - if (($thiz =& new Table()) == FALSE) - return ($G_false); + return (FALSE); $thiz->idx = $idx; $thiz->player = array(); @@ -197,10 +405,8 @@ class Table { return ($thiz); } - function copy(&$from) + function copy($from) { - GLOBAL $G_false; - $this->idx = $from->idx; $this->player = array(); for ($i = 0 ; $i < $from->player_n ; $i++) @@ -221,24 +427,20 @@ class Table { $this->wakeup_time = $from->wakeup_time; } - function &clone(&$from) + function myclone($from) { - GLOBAL $G_false; - if (($thiz =& new Table()) == FALSE) - return ($G_false); + return (FALSE); $this->copy($from); return ($thiz); } - function &spawn(&$from) + function spawn($from) { - GLOBAL $G_false; - if (($thiz =& new Table()) == FALSE) - return ($G_false); + return (FALSE); $thiz->idx = $from->idx; $thiz->player = array(); @@ -260,11 +462,11 @@ class Table { return ($thiz); } - function wag_set(&$user, $mesg) + function wag_set($user, $mesg) { log_main("WAG_SET"); - $this->wag_own = &$user; + $this->wag_own = $user; $this->wag_com = $mesg; $this->wag_tout = 0; } @@ -365,7 +567,12 @@ class Table { // User flags define(USER_FLAG_AUTH, 0x02); + +define(USER_FLAG_MAP_AUTH, 0x0c); define(USER_FLAG_LISTAUTH, 0x04); +define(USER_FLAG_ISOLAUTH, 0x08); + +define(USER_FLAG_DBFAILED, 0x10); // user status define(USER_FLAG_S_NORM, 0x000); // done @@ -376,10 +583,24 @@ define(USER_FLAG_S_EAT, 0x400); // done define(USER_FLAG_S_WRK, 0x500); // done define(USER_FLAG_S_SMK, 0x600); // done define(USER_FLAG_S_EYE, 0x700); // done +define(USER_FLAG_S_RABB, 0x800); // done +define(USER_FLAG_S_SOCC, 0x900); // done +define(USER_FLAG_S_BABY, 0xa00); // done +define(USER_FLAG_S_MOP, 0xb00); // done define(USER_FLAG_S_ALL, 0xf00); // done +/* type of user normal, supporter etc ... */ +define(USER_FLAG_TY_ALL, 0xff0000); // done +define(USER_FLAG_TY_NORM, 0x010000); // done +define(USER_FLAG_TY_SUPER, 0x020000); // done +// ... other usefull status ... +define(USER_FLAG_TY_SUSPEND, 0x400000); // done +define(USER_FLAG_TY_DISABLE, 0x800000); // done + class User { + var $idx; // index in the users array + var $code; // authentication code var $name; // name of the user var $sess; // session of the user var $ip; // ip of the user @@ -410,15 +631,19 @@ class User { var $chat_cur; // Current chat line number var $chat_ban; // Time for ban chat var $chat_dlt; // Delta t for ban + var $shm_sz; + function User() { } - function &create($name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") { - GLOBAL $G_false; + function create($idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") { + // error_log("User::create BEGIN", 0); if (($thiz =& new User()) == FALSE) - return ($G_false); + return (FALSE); + $thiz->idx = $idx; + $thiz->code = -1; $thiz->name = $name; $thiz->sess = $sess; $thiz->ip = $ip; @@ -447,14 +672,14 @@ class User { $thiz->table = $table; $thiz->table_pos = -1; $thiz->table_token = ""; - + $thiz->shm_sz = SHM_DIMS_U_MIN; return ($thiz); } - function copy(&$from) + function copy($from) { - GLOBAL $G_false; - + $this->idx = $from->idx; + $this->code = $from->code; $this->name = $from->name; $this->sess = $from->sess; $this->ip = $from->ip; @@ -492,30 +717,28 @@ class User { $this->table_pos = $from->table_pos; $this->table_token = $from->table_token; $this->the_end = $from->the_end; - + $this->shm_sz = $from->shm_sz; return (TRUE); } - function &clone(&$from) + function myclone($from) { - GLOBAL $G_false; - if (($thiz =& new User()) == FALSE) - return ($G_false); + return (FALSE); $thiz->copy($from); return ($thiz); } - function &spawn(&$from, $table, $table_pos) + function spawn($from, $table, $table_pos) { - GLOBAL $G_false; - if (($thiz =& new User()) == FALSE) - return ($G_false); + return (FALSE); + $thiz->idx = $from->idx; + $thiz->code = $from->code; $thiz->name = $from->name; $thiz->sess = $from->sess; $thiz->ip = $from->ip; @@ -555,9 +778,18 @@ class User { $thiz->table = 0; $thiz->table_pos = $table_pos; $thiz->table_token = $from->table_token; + $thiz->shm_sz = $from->shm_sz; return ($thiz); } + + function idx_get() { + return ($this->idx); + } + + function code_get() { + return ($this->code); + } function stat_set($stat) { log_main("sess: [".$this->sess. "] NEW STAT: [".$stat."]"); @@ -584,7 +816,7 @@ class User { mkdir(PROXY_PATH); if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE) break; - fwrite($fp, pack("l",$this->step), 4); + fwrite($fp, pack("LL",$this->step, $this->idx)); fclose($fp); return (TRUE); @@ -600,7 +832,7 @@ class User { if (file_exists(PROXY_PATH) == FALSE) mkdir(PROXY_PATH); $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w'); - fwrite($fp, pack("l",$this->step), 4); + fwrite($fp, pack("LL", $this->step, $this->idx)); fclose($fp); return (TRUE); @@ -626,12 +858,105 @@ class User { $this->chat_dlt = 0; $this->the_end = FALSE; } -} // end class User + // SHSPLIT save and load function for the User class. + function load_data($id) + { + GLOBAL $sess; + + // error_log("User::load_data BEGIN", 0); + + $doexit = FALSE; + do { + if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) { + log_main("ftok failed"); + $doexit = TRUE; + break; + } + + if (($shm_sz = sharedmem_sz($tok)) == -1) { + log_main("shmop_open failed"); + } + + if ($shm_sz == -1) + $shm_sz = SHM_DIMS_U_MIN; + + if ($shm = shm_attach($tok, $shm_sz)) { + $user = @shm_get_var($shm, $tok); + + log_only("bri == ".($user == FALSE ? "FALSE" : "TRUE")." bri === ".($user === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($user) ? "TRUE" : "FALSE")); + if (isset($user)) + log_only("bri count ".count($user)); + + if ($user == FALSE) { + log_only("INIT MAIN DATA"); + + // SHSPLIT FIXME: init_data for User class ?? + $user =& User::create($id, "", ""); + if (@shm_put_var($shm, $tok, $user) == FALSE) { + log_only("PUT_VAR FALLITA ".strlen(serialize($user))); + log_only(serialize($user)); + } + } + + $user->shm_sz = $shm_sz; + + shm_detach($shm); + } + + // + // SHSPLIT: load users from the shared memory + // + return ($user); + } while (0); + + if ($doexit) + exit(); + + return (FALSE); + } + + + function save_data(&$user, $id) + { + GLOBAL $sess; + + $shm = FALSE; + + // var_dump($user); + // error_log("User::save_data BEGIN", 0); + + if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) { + return (FALSE); + } + while ($user->shm_sz < SHM_DIMS_U_MAX) { + if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE) + break; + + // log_only("PUT_VAR DI ".strlen(serialize($user))); + if (shm_put_var($shm, $tok, $user) != FALSE) { + shm_detach($shm); + return (TRUE); + } + if (shm_remove($shm) === FALSE) { + log_only("REMOVE FALLITA"); + break; + } + shm_detach($shm); + $user->shm_sz += SHM_DIMS_U_DLT; + } + + if ($shm) + shm_detach($shm); + + return (FALSE); + } + +} // end class User function step_get($sess) { @@ -644,15 +969,15 @@ function step_get($sess) { mkdir(PROXY_PATH); if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE) break; - if (($s = fread($fp, 4)) == FALSE) + if (($s = fread($fp, 8)) == FALSE) break; - if (strlen($s) != 4) + if (strlen($s) != 8) break; - $arr = unpack('l', $s); + $arr = unpack('Ls/Li', $s); fclose($fp); // log_rd2("A0: ".$arr[0]." A1: ".$arr[1]); - return ($arr[1]); + return ($arr); } while (0); if ($fp != FALSE) @@ -684,7 +1009,7 @@ class Room { $this->table = array(); for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $this->user[$i] =& User::create("", ""); + $this->user[$i] =& User::create($i, "", ""); } for ($i = 0 ; $i < TABLES_N ; $i++) { @@ -699,16 +1024,19 @@ class Room { $this->table[$i]->auth_only = FALSE; } */ - if ($i < 12) + if ($i < TABLES_AUTH_N) $this->table[$i]->auth_only = TRUE; else $this->table[$i]->auth_only = FALSE; } $this->garbage_timeout = 0; + $this->shm_sz = SHM_DIMS_MIN; } function garbage_manager($force) { + GLOBAL $G_lang, $mlang_brisk, $G_base; + $ismod = FALSE; log_rd2("garbage_manager START"); @@ -718,7 +1046,7 @@ class Room { if ($force || $this->garbage_timeout < $curtime) { // FIXME BRISK4: include for each kind of table - require_once("briskin5/Obj/briskin5.phh"); + require_once("${G_base}briskin5/Obj/briskin5.phh"); // Before all align times with table timeout for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { @@ -801,7 +1129,9 @@ class Room { $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); + // MLANG
I dati del tavolo n° ".$user_cur->table." sono inconsistenti, verranno resettati.
Torni in piedi.
+ $prestr = sprintf($mlang_brisk['tabincon'][$G_lang], $user_cur->table); + $ret .= show_notify($prestr, 2000, $mlang_brisk['btn_close'][$G_lang], 400, 110); $user_cur->comm[$user_cur->step % COMM_N] = $ret; $user_cur->step_inc(); } @@ -855,7 +1185,7 @@ class Room { $this->room_wakeup(&$user_cur); $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; "; /* MLANG:
Sei stato inattivo per ".(EXPIRE_TIME_SMAMMA/60.0)." minuti.
Quindi ritorni tra i Giocatori in piedi.", "torna ai tavoli" */ - $user_cur->comm[$user_cur->step % COMM_N] .= show_notify("
Sei stato inattivo per ".(EXPIRE_TIME_SMAMMA/60.0)." minuti.
Quindi ritorni tra i Giocatori in piedi.", 0, "torna ai tavoli", 400, 100); + $user_cur->comm[$user_cur->step % COMM_N] .= show_notify($mlang_brisk['tabtout_a'][$G_lang].(EXPIRE_TIME_SMAMMA/60.0).$mlang_brisk['tabtout_b'][$G_lang], 0, $mlang_brisk['btn_backstand'][$G_lang], 400, 100); $user_cur->step_inc(); } } @@ -871,12 +1201,16 @@ class Room { function show_room($user_step, &$user) { + GLOBAL $G_lang, $mlang_brisk; log_main("show_room: username: ".$user->name); $ret = sprintf('gst.st = %d; ', $user_step); - if ($user->flags & USER_FLAG_LISTAUTH) { - $ret .= 'list_set(\'auth\', false, \'(solo aut.)\' ); '; + if ($user->flags & USER_FLAG_ISOLAUTH) { + $ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); '; + } + else if ($user->flags & USER_FLAG_LISTAUTH) { + $ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); '; } else { $ret .= 'list_set(\'all\', false, \'\' ); '; @@ -890,11 +1224,17 @@ class Room { $ret .= sprintf('stat = "%s";', $user->stat); $ret .= root_wellcome($user); + if ($user->flags & USER_FLAG_DBFAILED) { + $ret .= "gst.st = ".($user->step+1)."; "; + $ret .= show_notify($mlang_brisk['db_failed'][$G_lang], 0, $mlang_brisk['btn_close'][$G_lang], 400, 140); + } + $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); 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, // ($this->table[$i]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH)); @@ -962,7 +1302,7 @@ class Room { if ($user_cur->sess == '' || $user_cur->stat != 'room') continue; - log_main("VALORI: name: ".$user_cur->name."from_table: ".$from_table." tab: ".$user_cur->table." taix: ".$table_idx." ucur: ".$user_cur." us: ".$user); + // 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)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : ""); if ($from_table && ($user_cur->table == $table_idx || $user_cur == $user)) { @@ -1059,7 +1399,7 @@ class Room { } log_main("___"); - log_main("VALORI name: ".$user_cur->name." tab: ".$user_cur->table." taix: ".$table_idx." ucur: ".$user_cur." us: ".$user); + log_main("VALORI name: ".$user_cur->name." tab: ".$user_cur->table." taix: ".$table_idx); $ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : ""); if ($user_cur->stat == "room") { @@ -1200,13 +1540,14 @@ class Room { function chatt_send(&$user, $mesg) { - GLOBAL $G_alarm_passwd; + GLOBAL $G_base, $G_alarm_passwd, $mlang_brisk, $G_lang; $only_you = FALSE; // common settings $msg = substr($mesg, 6, 128); $curtime = time(); $dt = date("H:i ", $curtime); + $target = ""; // // Compute actions @@ -1217,6 +1558,7 @@ class Room { $to_room = FALSE; $to_tabl = FALSE; $is_normchat = FALSE; + /* for old isolation management $is_ticker = FALSE; */ $update_room = FALSE; if (strcmp($msg, "/tav") == 0 || @@ -1224,7 +1566,7 @@ class Room { do { if ($user->stat != 'room' || $user->subst != 'sitdown') { /* MLANG: "
Per attivare il messaggio di segnalazione del tavolo occorre essere seduti.
", "
Il messaggio di segnalazione del tavolo è già attivato.
", "
Il messaggio di segnalazione del tavolo
è disattivato ancora per %d second%s.
" */ - $msg = "
Per attivare il messaggio di segnalazione del tavolo occorre essere seduti.
"; + $msg = $mlang_brisk['tickmust'][$G_lang]; $to_user = show_notify($msg, 0, "chiudi", 400, 100); break; @@ -1233,7 +1575,8 @@ class Room { $table = &$this->table[$user->table]; if ($table->wag_own != NULL) { - $msg = "
Il messaggio di segnalazione del tavolo è già attivato.
"; + // MLANG
Il messaggio di segnalazione del tavolo è già attivato.
+ $msg = $mlang_brisk['tickjust'][$G_lang]; $to_user = show_notify($msg, 0, "chiudi", 400, 100); break; @@ -1241,9 +1584,10 @@ class Room { $dtime = $curtime - $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); + // MLANG -
Il messaggio di segnalazione del tavolo
è disattivato ancora per %d second%s.
+ $msg = sprintf($mlang_brisk['tickwait'][$G_lang], + EXPIRE_TIME_WAG - $dtime, (EXPIRE_TIME_WAG - $dtime == 1 ? ($G_lang == 'en' ? "" : "o") : ($G_lang == 'en' ? "s" : "i"))); + $to_user = show_notify($msg, 0, $mlang_brisk['btn_close'][$G_lang] , 400, 100); break; } @@ -1253,7 +1597,7 @@ class Room { $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; - + /* for old isolation management $is_ticker = TRUE; */ } while (0); } // /tav chat command @@ -1270,42 +1614,65 @@ class Room { do { if (strncmp($msg, $alarm_check, strlen($alarm_check)) != 0) { /* MLANG: "
La password digitata non è corretta.
" */ - $msg = "
La password digitata non è corretta.
"; - $to_user = show_notify($msg, 0, "chiudi", 400, 100); + $msg = $mlang_brisk['alarpass'][$G_lang]; + $to_user = show_notify($msg, 0, $mlang_brisk['btn_close'][$G_lang], 400, 100); break; } /* MLANG: "Alarm %s inviato a %s." */ - $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)) ); + $prestr = sprintf($mlang_brisk['alarret'][$G_lang], xcape(substr($msg, strlen($alarm_check))), + ($target == "" ? $mlang_brisk['tit_all'][$G_lang] : xcape($target)) ); + $to_user = sprintf('chatt_sub("%s", [2, "%s"],%s);', + $dt, NICKSERV, $prestr); $msg = sprintf("
%s
%s
", $dt.NICKSERV, xcape(substr($msg, strlen($alarm_check)))); /* MLANG: "chiudi" */ - $to_all = show_notify($msg, 0, "chiudi", 400, 120); + $to_all = show_notify($msg, 0, $mlang_brisk['btn_close'][$G_lang], 400, 120); } while (0); } // /alarm chat command else if (strncmp($msg, "/listen ", 8) == 0) { $arg = substr($msg, 8); - if (strcasecmp($arg, "auth") == 0) { + if (strcasecmp($arg, "isolation") == 0) { + $flags_old = 0; + if ($user->stat == 'room' && $user->subst == 'sitdown' && + $user->table >= TABLES_AUTH_N) { + $to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_brisk['listmust'][$G_lang]); + + } + else { + $user->flags &= ~USER_FLAG_MAP_AUTH; + $user->flags |= USER_FLAG_ISOLAUTH; + $to_user = 'list_set(\'isolation\', true, \''.$mlang_brisk['tit_onisol'][$G_lang].'\'); '; + } + } + else if (strcasecmp($arg, "auth") == 0) { + $flags_old = $user->flags; + $user->flags &= ~USER_FLAG_MAP_AUTH; $user->flags |= USER_FLAG_LISTAUTH; - $to_user = 'list_set(\'auth\', true, \'(solo aut.)\'); '; + $to_user = 'list_set(\'auth\', true, \''.$mlang_brisk['tit_onauth'][$G_lang].'\'); '; } else { - $user->flags &= ~USER_FLAG_LISTAUTH; + $flags_old = $user->flags; + $user->flags &= ~USER_FLAG_MAP_AUTH; $to_user = 'list_set(\'all\', true, \'\'); '; + + } + // if from isolation redraw standup area + if (($flags_old ^ $user->flags) & USER_FLAG_ISOLAUTH) { + $to_user .= 'standup_data_old = null; '.$this->standup_content($user); + } } - else if (strncmp($msg, "/garante", 8) == 0) { + else if (strcmp($msg, "/authreq") == 0) { if ($user->flags & USER_FLAG_AUTH) { $to_user = sprintf('authbox(300,200);'); } else { /* MLANG: "Per autenticare qualcuno devi a tua volta essere autenticato.", "Il nickname deve contenere almeno una lettera dell\'alfabeto o una cifra.", "Nickname %s già in uso." */ - $to_user = sprintf('chatt_sub("%s", [2, "%s"],"Per autenticare qualcuno devi a tua volta essere autenticato.");', $dt, NICKSERV); + $to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_brisk['authmust'][$G_lang]); } } else if (strncmp($msg, "/mesgtoadm", 8) == 0) { @@ -1314,7 +1681,7 @@ class Room { } else { /* MLANG: "Per inviare un messaggio devi essere autenticato." */ - $to_user = sprintf('chatt_sub("%s", [2, "%s"],"Per inviare un messaggio devi essere autenticato.");', $dt, NICKSERV); + $to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_brisk['mesgmust'][$G_lang]); } } else if (strncmp($msg, "/nick ", 6) == 0) { @@ -1322,7 +1689,7 @@ class Room { do { if (($name_new = validate_name(substr($msg, 6))) == FALSE) { - $to_user = sprintf('chatt_sub("%s", [2,"%s"],"Il nickname deve contenere almeno una lettera dell\'alfabeto o una cifra.");', $dt, NICKSERV); + $to_user = sprintf('chatt_sub("%s", [2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['nickmust'][$G_lang]); break; } @@ -1336,21 +1703,26 @@ class Room { break; } if ($i < MAX_PLAYERS) { - $to_user = sprintf('chatt_sub("%s", [2, "%s"],"Nickname %s già in uso.");', $dt, NICKSERV, xcape($name_new)); + $prestr = sprintf($mlang_brisk['nickdupl'][$G_lang], xcape($name_new)); + $to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $prestr); break; } /* MLANG: "Non puoi cambiare nick a un tavolo per soli autenticati.", "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */ 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 + if (( ($user->flags & USER_FLAG_MAP_AUTH) != USER_FLAG_ISOLAUTH) && + ($user->subst == 'standup' || + ($user->subst != 'standup' && $this->table[$user->table]->auth_only == FALSE) + ) + ) { + $user->flags &= ~(USER_FLAG_AUTH | USER_FLAG_TY_ALL); // 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); + $to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_brisk['authchan'][$G_lang]); break; } } @@ -1358,11 +1730,14 @@ class Room { $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(); - /* MLANG: "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */ - 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)); - } + if (($bdb = BriskDB::create()) != FALSE) { + $bdb->users_load(); + /* MLANG: "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */ + if ($bdb->login_exists($name_new)) { + $prestr = sprintf($mlang_brisk['nickjust'][$G_lang], xcape($name_new)); + $to_user .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $prestr); + } + } } log_main("chatt_send start set"); @@ -1401,9 +1776,21 @@ class Room { else if (strcasecmp($st_str, "presente") == 0) { $st = USER_FLAG_S_EYE; } + else if (strcasecmp($st_str, "coniglio") == 0) { + $st = USER_FLAG_S_RABB; + } + else if (strcasecmp($st_str, "calcio") == 0) { + $st = USER_FLAG_S_SOCC; + } + else if (strcasecmp($st_str, "pupo") == 0) { + $st = USER_FLAG_S_BABY; + } + else if (strcasecmp($st_str, "pulizie") == 0) { + $st = USER_FLAG_S_MOP; + } else { /* MLANG: "Questo stato non esiste." */ - $to_user = sprintf('chatt_sub("%s", [2,"%s"],"Questo stato non esiste.");', $dt, NICKSERV); + $to_user = sprintf('chatt_sub("%s", [2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['statunkn'][$G_lang]); break; } @@ -1441,8 +1828,8 @@ class Room { else { $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; + // if (strcasecmp($user->name,'JackRokka') != 0 && $user->sess != '47ea653f602e8') + $to_room = $to_user; } log_legal($curtime, $user, @@ -1478,13 +1865,21 @@ class Room { continue; if ($is_normchat == TRUE) { - if ($user_cur->flags & USER_FLAG_LISTAUTH) { + // use MAP_AUTH to check if auth or isolation + if ($user_cur->flags & USER_FLAG_MAP_AUTH) { if (($user->flags & USER_FLAG_AUTH) == 0) { continue; } } } - + /* + else if ($is_ticker) { + if (($user_cur->flags & USER_FLAG_MAP_AUTH) == USER_FLAG_ISOLAUTH) { + if ($user->table >= TABLES_AUTH_N) + 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(); @@ -1493,7 +1888,7 @@ class Room { if ($to_tabl) { // FIXME BRISK4: include for each kind of table - require_once("briskin5/Obj/briskin5.phh"); + require_once("${G_base}briskin5/Obj/briskin5.phh"); // Before all align times with table timeout for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { $table_cur =& $this->table[$table_idx]; @@ -1548,9 +1943,9 @@ class Room { return; } // function chatt_send( ... - function &get_user($sess, &$idx) + function get_user($sess, &$idx) { - GLOBAL $PHP_SELF, $G_false; + GLOBAL $PHP_SELF; if (validate_sess($sess)) { for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { @@ -1569,13 +1964,11 @@ class Room { log_main(sprintf("get_user: Wrong strlen [%s]",$sess)); } - return ($G_false); + return (FALSE); } - - /* - * function &add_user(&$room, &$sess, &$idx, $name, $pass, $ip) + * function add_user(&$room, &$sess, &$idx, $name, $pass, $ip) * * RETURN VALUE: * if ($idx > -1 && ret == FALSE) => duplicated nick @@ -1583,27 +1976,27 @@ class Room { * 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 + * if ($idx == -$idx && ret == user) => SUCCESS (but the login exists in the auth db) */ - - - function &add_user(&$sess, &$idx, $name, $pass, $ip) + function add_user(&$sess, &$idx, $name, $pass, $ip) { - GLOBAL $G_false, $CO_list; + GLOBAL $G_base, $CO_list; $idx = 0; $authenticate = FALSE; + $user_type = 0; $login_exists = FALSE; $ghost = -1; $ghost_auth = FALSE; $idx = -1; $idfree = -1; - + $code = FALSE; + if (($name_new = validate_name($name)) == FALSE) { $idx = -2; - return ($G_false); + return (FALSE); } log_auth("XXX", sprintf("ARRIVA: [%s] pass:[%s]", $sess, ($pass == FALSE ? "FALSE" : $pass))); @@ -1612,19 +2005,30 @@ class Room { /* 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); - } + + if (($bdb = BriskDB::create()) != FALSE) { + $bdb->users_load(); + if ($pass != FALSE) { // TODO: here add a method to $bdb to check if the db is available. + log_auth("XXX", "auth2"); + $authenticate = $bdb->login_verify($name_new, $pass, $code); + log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE")); + + if ($authenticate != FALSE) { + // error_log(print_r(&$authenticate, TRUE),0); + $user_type = $authenticate->type_get(); + } + else { + $idx = -3; + return (FALSE); + } + } + else { + $login_exists = $bdb->login_exists($name_new); + } } else { - $login_exists = $userdb->login_exists($name_new); + // if db is down, send a warning and verify only current users + // no actions at this moment } for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { /* free user ? */ @@ -1632,19 +2036,19 @@ class Room { if ($idx == -1) $idx = $i; } - if ($idfree == -1 && strcmp("", $this->user[$i]->sess) == 0) { + if ($idfree == -1 && strcmp($this->user[$i]->sess, "") == 0) { $idfree = $i; continue; // NOTE: CHECK IT !! } 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 ($authenticate != FALSE) { + $ghost = $i; + $ghost_auth = ($this->user[$i]->flags & USER_FLAG_AUTH); + } + else { + $idx = $i; + break; + } } } if ($idx == -1) @@ -1652,7 +2056,9 @@ class Room { log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name_new)); - if ($ghost > -1 && $ghost_auth && $authenticate) { + /* there is another user logged with your account and you and him have authenticated => che new user + get the session of the old user */ + if ($ghost > -1 && $ghost_auth && ($authenticate != FALSE)) { /* swap session */ $ghost_user =& $this->user[$ghost]; @@ -1670,7 +2076,7 @@ class Room { $table_idx = $ghost_user->table; if ($ghost_user->stat == "table" && $this->table[$table_idx]->player_n == PLAYERS_N) { // FIXME BRISK4: include for each kind of table - require_once("briskin5/Obj/briskin5.phh"); + require_once("${G_base}briskin5/Obj/briskin5.phh"); if (($brisem = Briskin5::lock_data($table_idx)) != FALSE) { if (($bri = &Briskin5::load_data($table_idx)) != FALSE) { if ($bri->the_end != TRUE) { @@ -1706,13 +2112,28 @@ class Room { $this->user[$idx]->bantime = 0; $this->user[$idx]->ip = $ip; - $this->user[$idx]->flags = ($authenticate ? USER_FLAG_AUTH : 0x00); + $this->user[$idx]->flags = $user_type; + $this->user[$idx]->flags |= ($authenticate != FALSE ? USER_FLAG_AUTH : 0x00); + $this->user[$idx]->flags |= ( ($pass != FALSE && $bdb == FALSE) ? USER_FLAG_DBFAILED : 0x00); + log_auth("XXX", sprintf("FLAGS: [%x]", $this->user[$idx]->flags)); + - if ($authenticate) { + if ($authenticate != FALSE) { + $this->user[$idx]->code = $authenticate->code_get(); $this->user[$idx]->flags |= USER_FLAG_LISTAUTH; - if (isset($CO_list) && strcmp($CO_list, "all") == 0) { - $this->user[$idx]->flags &= ~USER_FLAG_LISTAUTH; + if (isset($CO_list)) { + if (strcmp($CO_list, "auth") == 0) { + $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH; + $this->user[$idx]->flags |= USER_FLAG_LISTAUTH; + } + if (strcmp($CO_list, "isolation") == 0) { + $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH; + $this->user[$idx]->flags |= USER_FLAG_ISOLAUTH; + } + else { + $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH; + } } } @@ -1755,17 +2176,19 @@ class Room { } } // if ($ghost > -1) { - log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name_new)); $real_idx = $idx; if ($login_exists) $idx = -($idx + 1); - return ($this->user[$real_idx]); + log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s] count [%d] name [%s] code [%s]", $idx, $sess, $name_new, count($this->user),$this->user[$real_idx]->name, $this->user[$real_idx]->code)); + + $ret = $this->user[$real_idx]; + return ($ret); } - return ($G_false); + return (FALSE); } - function standup_update(&$user) + function standup_update($user) { for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = &$this->user[$i]; @@ -1791,18 +2214,21 @@ class Room { } // Static functions - function &init_data() + static function create() { - $room =& new Room(); + $room = new Room(); return $room; } - - function &load_data() + + function load_data() { - GLOBAL $G_false, $sess; + GLOBAL $sess; $doexit = FALSE; + + // error_log("Room::load_data BEGIN", 0); + do { if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) { log_main("ftok failed"); @@ -1818,37 +2244,48 @@ class Room { $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)); - - 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); + $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"); + shm_detach($shm); + + // error_log("DE CHE", 0); + + $room = Room::create(); + + if (Room::save_data($room) == FALSE) + return FALSE; + + return $room; + } + $room->shm_sz = $shm_sz; + + shm_detach($shm); + + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + $room->user[$i] = User::load_data($i); + } } - $ret = &$room; - return ($ret); + + // + // SHSPLIT: load users from the shared memory + // + return ($room); } while (0); if ($doexit) exit(); - return ($G_false); + return (FALSE); } - function save_data(&$room) + function save_data_orig(&$room) { GLOBAL $sess; @@ -1882,6 +2319,57 @@ class Room { return (FALSE); } + + function save_data(&$room) + { + GLOBAL $sess; + + $ret = FALSE; + $shm = FALSE; + + // var_dump($room); + // error_log("Room::save_data BEGIN", 0); + + if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) + return (FALSE); + + // SHSPLIT: before save the $room you must save users, + // detach from main struct and (then) reattach + $user_park = array(); + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + $user_park[$i] = $room->user[$i]; + $room->user[$i] = 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) { + $ret = TRUE; + break; + } + if (shm_remove($shm) === FALSE) { + log_only("REMOVE FALLITA"); + break; + } + shm_detach($shm); + $room->shm_sz += SHM_DIMS_DLT; + } + + if ($shm) + shm_detach($shm); + + // SHSPLIT: reattach users to the room class + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + User::save_data($user_park[$i], $i); + $room->user[$i] = $user_park[$i]; + } + + return ($ret); + } + function lock_data() { GLOBAL $sess; @@ -1952,44 +2440,6 @@ class Room { return ($content); } - function table_content_old($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); - } - - function table_content($user, $table_idx) { $content = ""; @@ -2035,8 +2485,29 @@ function make_seed() } +function log_mop($step, $log) { + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LMOP) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0) + return; + + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("LMOP: [%f] [%05d] [%s] [%s]\n", gettimeofday(TRUE), $step, $PHP_SELF, $log)); + fclose($fp); + } +} + + function log_only2($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0) return; @@ -2050,13 +2521,13 @@ function log_only2($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("ONL2: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("ONL2: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_crit($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CRIT) == 0) return; @@ -2070,13 +2541,13 @@ function log_crit($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("CRIT: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("CRIT: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_only($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0) return; @@ -2090,13 +2561,13 @@ function log_only($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("ONLY: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("ONLY: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_main($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0) return; @@ -2110,13 +2581,13 @@ function log_main($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("MAIN: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("MAIN: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_rd($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0) return; @@ -2130,13 +2601,13 @@ function log_rd($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("READ: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_rd2($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0) return; @@ -2150,13 +2621,13 @@ function log_rd2($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("REA2: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_send($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0) return; @@ -2170,13 +2641,13 @@ function log_send($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("SEND: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("SEND: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_lock($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0) return; @@ -2190,13 +2661,13 @@ function log_lock($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("LOCK: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("LOCK: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_wr($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0) return; @@ -2210,13 +2681,13 @@ function log_wr($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("WRIT: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("WRIT: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_load($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0) return; @@ -2230,12 +2701,13 @@ function log_load($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("LOAD: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("LOAD: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_auth($sess, $log) { + GLOBAL $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_AUTH) == 0) return; @@ -2243,7 +2715,7 @@ function log_auth($sess, $log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("AUTH: [%s] [%d] [%s]\n", $sess, time(), $log)); + fwrite($fp, sprintf("AUTH: [%s] [%d] [%s] [%s]\n", $sess, time(), $PHP_SELF, $log)); fclose($fp); } } @@ -2264,8 +2736,6 @@ function log_legal($curtime, &$user, $where, $mesg) } - - function lock_banlist() { if (($tok = @ftok(FTOK_PATH."/main", "L")) == -1) { @@ -2287,24 +2757,6 @@ function unlock_banlist($res) return (sem_release($res)); } -function table_act_content_old($isstanding, $sitted, $table, $cur_table) -{ - $ret = ""; - - if ($isstanding) { - if ($sitted < PLAYERS_N) { - $ret = sprintf('', $table, $table); - } - } - else { - if ($table == $cur_table) - $ret = sprintf(''); - else - $ret = ""; - } - return ($ret); -} - function table_act_content($isstanding, $sitted, $table, $cur_table, $allowed) { $ret = ""; @@ -2336,27 +2788,23 @@ function show_notify($text, $tout, $butt, $w, $h) return sprintf('var noti = new notify(gst,"%s",%d,"%s",%d,%d);', $text, $tout, $butt, $w, $h); } -function multoval($mult) +function show_notify_ex($text, $tout, $butt, $w, $h, $is_opaque, $block_time) { - if ($mult == 2) - return ("doppio"); - else if ($mult == 4) - return ("quadruplo"); - else - return (sprintf("%d-plo", $mult)); + log_main("SHOW_NOTIFY OPAQUE: ".$text); + return sprintf('var noti = new notify_ex(gst,"%s",%d,"%s",%d,%d, %s, %d);', $text, $tout, $butt, $w, $h, ($is_opaque ? "true" : "false"), $block_time); } function root_wellcome($user) { - GLOBAL $root_wellarr; + GLOBAL $root_wellarr, $G_lang; $ret = ""; $curtime = time(); $dt = date("H:i ", $curtime); - for ($i = 0 ; $i < count($root_wellarr) ; $i++) - $ret .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, str_replace('"', '\"', $root_wellarr[$i])); + for ($i = 0 ; $i < count($root_wellarr[$G_lang]) ; $i++) + $ret .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, str_replace('"', '\"', $root_wellarr[$G_lang][$i])); return ($ret); } @@ -2391,14 +2839,24 @@ function playsound($filename) function secstoword($secs) { + GLOBAL $G_lang; + $mins = floor($secs / 60); $secs = $secs % 60; - if ($mins > 0) - $ret = sprintf("%d minut%s%s", $mins, ($mins > 1 ? "i" : "o"), ($secs > 0 ? " e " : "")); - - if ($secs > 0) - $ret .= sprintf("%d second%s", $secs, ($secs > 1 ? "i" : "o")); - + if ($G_lang == 'en') { + if ($mins > 0) + $ret = sprintf("%d minute%s%s", $mins, ($mins > 1 ? "s" : ""), ($secs > 0 ? " and " : "")); + + if ($secs > 0) + $ret .= sprintf("%d second%s", $secs, ($secs > 1 ? "s" : "")); + } + else { + if ($mins > 0) + $ret = sprintf("%d minut%s%s", $mins, ($mins > 1 ? "i" : "o"), ($secs > 0 ? " e " : "")); + + if ($secs > 0) + $ret .= sprintf("%d second%s", $secs, ($secs > 1 ? "i" : "o")); + } return ($ret); } @@ -2428,7 +2886,7 @@ class Warrant { return (FALSE); } if (sem_acquire($res)) { - log_lock("LOCK room"); + log_lock("LOCK warrant"); return ($res); } else @@ -2439,11 +2897,40 @@ class Warrant { { GLOBAL $sess; - log_lock("UNLOCK room"); + log_lock("UNLOCK warrant"); return (sem_release($res)); } +} +class Poll { + function lock_data() + { + GLOBAL $sess; + + if (($tok = @ftok(FTOK_PATH."/poll", "B")) == -1) { + return (FALSE); + } + // echo "FTOK ".$tok."
"; + if (($res = sem_get($tok)) == FALSE) { + return (FALSE); + } + if (sem_acquire($res)) { + log_lock("LOCK poll"); + return ($res); + } + else + return (FALSE); + } + function unlock_data($res) + { + GLOBAL $sess; + + log_lock("UNLOCK poll"); + + return (sem_release($res)); + } } + ?>