X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=fa53c6291a1a8ea790f64c60754ce7d593225343;hb=e4bf569ad33ddc0459769eb1fa1e0113bb83899d;hp=5f2e3c7e430b97265d8e72156a184047ab1ccf7f;hpb=c375a0d471a5d01f0410f42a992d351eb8ff1516;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 5f2e3c7..fa53c62 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -2,7 +2,7 @@ /* * brisk - brisk.phh * - * Copyright (C) 2006-2009 Matteo Nastasi + * Copyright (C) 2006-2011 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -35,7 +35,11 @@ define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N))); 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(SHM_DIMS_U_MIN, 4096); +define(SHM_DIMS_U_MAX, 65536); +define(SHM_DIMS_U_DLT, 4096); + define(COMM_N, 18); define(COMM_GEN_N, 50); @@ -53,6 +57,7 @@ define(BAN_TIME, 3600); define(GARBAGE_TIMEOUT, 10); define(NICKSERV, "BriskServ"); + define(DBG_ONL2, 0x0001); define(DBG_ONLY, 0x0002); define(DBG_MAIN, 0x0004); @@ -64,6 +69,7 @@ define(DBG_WRIT, 0x0080); define(DBG_LOAD, 0x0100); define(DBG_AUTH, 0x0200); define(DBG_CRIT, 0x0400); +define(DBG_LMOP, 0x0800); // NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols define(BRISK_DEBUG, 0xffffffbf); @@ -104,31 +110,37 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi', 'en' => 'The nickname have to contain at least one letter or one number.'), 'nickdupl' => array( 'it' => 'Nickname %s già in uso.', 'en' => 'The nickname %s is already in use.'), - 'authchan' => array( 'it' => 'Non puoi cambiare nick a un tavolo per soli autenticati.', - 'en' => 'You can\'t change your nickname into a table for only authenticated.'), + 'authchan' => array( 'it' => 'Non puoi cambiare nick a un tavolo per soli autenticati o se sei in modalità isolata.', + 'en' => 'You can\'t change your nickname into a table for only authenticated or if you are in isolation mode.'), 'nickjust' => array( 'it' => 'Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN.', 'en' => 'The nickname \'%s\' is already registered, if its proprietary will authenticate you will named again officially ghostN.'), // FIXME: him ??? 'statunkn' => array( 'it' => 'Questo stato non esiste.', 'en' => 'This state don\'t exists.'), 'tabincon' => array( 'it' => '
I dati del tavolo n° %d sono inconsistenti, verranno resettati.

Torni in piedi.

', 'en' => 'EN
I dati del tavolo n° %d sono inconsistenti, verranno resettati.

Torni in piedi.

'), + 'listmust' => array( 'it' => 'Per andare in isolamento non bisogna essere seduti a tavoli non riservati.', + 'en' => 'To go to isolation you must don\'t stay on not reserved tables'), + 'tit_onauth'=>array( 'it' => '(solo aut.)', 'en' => '(only aut.)'), + 'tit_onisol'=>array( 'it' => '(isolam.to)', + 'en' => '(isolation)'), + 'db_failed' =>array('it' => '
Il collegamento al database è fallito.
Temporaneamente tutte le autenticazioni verranno sospese, accederai a Brisk come un utente normale.

Ci scusiamo per il disagio.', + 'en' => 'Connection to the database failed
All authentications are suspended temporarly, you login as normal user.
We are about the limitation') ); -$G_false = FALSE; $G_lng = langtolng($G_lang); $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 ); -$G_brisk_version = "2.3.0 - trusty"; +$G_brisk_version = "3.5.1"; /* MLANG: ALL THE INFO STRINGS IN brisk.phh */ -$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': aggiunte le classifiche (menu Start->classifiche).', - 'Se vuoi iscriverti alla Mailing List, cliccala!' ), - 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: placings added (menu Start->placings)', - 'If you want to subscribe our Mailing List, click it!' ) ); +$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': terza versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.', + 'Se vuoi iscriverti alla Mailing List, cliccala!' ), + 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: third test version for the new volatile data management, ticker management refactored.', + 'If you want to subscribe our Mailing List, click it!' ) ); $G_room_help = array( 'it' => '
@@ -202,6 +214,7 @@ Attualmente ci sono due metodi per ottenere una password sul sito:

  • Carta Regionale dei Servizi della Lombardia (la tessera sanitaria)
  • Carta Regionale dei Servizi del Friuli Venezia Giulia (la tessera sanitaria) +
  • Smart card di InfoCamere

    • Per auto-garantisi occorre possedere:

    @@ -269,6 +282,26 @@ Copyright 2006-2009 Matteo Nasta
    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) { @@ -284,19 +317,20 @@ function csplitter($in, $sep) $out = array(); $out[$id] = ""; for ($i = 0 ; $i < strlen($in) ; $i++) { + $ini = substr($in, $i, 1); if ($st == 0) { - if ($in{$i} == '\\') + if ($ini == '\\') $st = 1; - else if ($in{$i} == $sep) { + else if ($ini == $sep) { $id++; $out[$id] = ""; } else { - $out[$id] .= $in{$i}; + $out[$id] .= $ini; } } else if ($st == 1) { - $out[$id] .= $in{$i}; + $out[$id] .= $ini; $st = 0; } } @@ -304,7 +338,6 @@ function csplitter($in, $sep) return ($out); } - function xcape($s) { $from = array ( '\\', '@', '|' ); @@ -350,19 +383,17 @@ class Table { { } - function &create($idx) + function create($idx) { - GLOBAL $G_false; - - if (($thiz =& new Table()) == FALSE) - return ($G_false); + if (($thiz = new Table()) == FALSE) + return (FALSE); $thiz->idx = $idx; $thiz->player = array(); $thiz->player_n = 0; $thiz->auth_only = FALSE; - $thiz->wag_own = NULL; + $thiz->wag_own = -1; $thiz->wag_com = ""; $thiz->wag_tout = 0; @@ -374,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++) @@ -398,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); + if (($thiz = new Table()) == 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); + if (($thiz = new Table()) == FALSE) + return (FALSE); $thiz->idx = $from->idx; $thiz->player = array(); @@ -437,11 +462,11 @@ class Table { return ($thiz); } - function wag_set(&$user, $mesg) + function wag_set($user_idx, $mesg) { log_main("WAG_SET"); - $this->wag_own = &$user; + $this->wag_own = $user_idx; $this->wag_com = $mesg; $this->wag_tout = 0; } @@ -451,17 +476,17 @@ class Table { log_main("WAG_RESET"); unset($this->wag_own); - $this->wag_own = NULL; + $this->wag_own = -1; $this->wag_com = ""; $this->wag_tout = $timeout; } - function getPlayer($idx) + function player_get($idx) { return ($this->player[$idx]); } - function setPlayer($idx, $player) + function player_set($idx, $player) { $this->player[$idx] = $player; } @@ -474,7 +499,7 @@ class Table { return ($this->player_n - 1); } - function user_rem(&$room, &$user) + function user_rem($room, $user) { $tabpos = $user->table_pos; @@ -484,7 +509,7 @@ class Table { /* aggiorna l'array dei giocatori al tavolo. */ for ($i = $tabpos ; $i < $this->player_n-1 ; $i++) { $this->player[$i] = $this->player[$i+1]; - $user_cur = &$room->user[$this->player[$i]]; + $user_cur = $room->user[$this->player[$i]]; $user_cur->table_pos = $i; } $this->player_n--; @@ -500,7 +525,7 @@ class Table { // ($this->table[$i]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH)); // function act_content($isstanding, $sitted, $table, $cur_table, $allowed) - function act_content(&$user) + function act_content($user) { $ret = ""; $isstanding = ($user->subst == 'standup'); @@ -542,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 @@ -553,10 +583,25 @@ 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 when you are in game + var $idx_orig; // index in the users array when you aren't in game + var $code; // authentication code var $name; // name of the user var $sess; // session of the user var $ip; // ip of the user @@ -575,8 +620,8 @@ class User { // FIXME: the table_orig field must be removed after table field verify of index management (in spawned table // it is allways ZERO - var $table_orig; // id of the current table (if in table state) - var $table; // id of the current table (if in table state) + var $table; // id of the current table when you are in game + var $table_orig; // id of the current table when you aren't in game var $table_pos; // idx on the table var $table_token;// token that identify a game on a table var $flags; // Bitfield with: AUTHENTICATE: 0x02 @@ -587,51 +632,55 @@ 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; - - if (($thiz =& new User()) == FALSE) - return ($G_false); - - $thiz->name = $name; - $thiz->sess = $sess; - $thiz->ip = $ip; - $thiz->lacc = time(); - $thiz->laccwr = time(); - $thiz->bantime = 0; - $thiz->stat = $stat; - $thiz->subst = $subst; - $thiz->step = 1; - $thiz->trans_step = -1; - $thiz->comm = array(); - $thiz->asta_card = -2; - $thiz->asta_pnt = -1; - $thiz->handpt = -1; + function create($idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") { + if (($thiz = new User()) == FALSE) + return (FALSE); + + $thiz->idx = $idx; + $thiz->idx_orig = $idx; + $thiz->code = -1; + $thiz->name = $name; + $thiz->sess = $sess; + $thiz->ip = $ip; + $thiz->lacc = time(); + $thiz->laccwr = time(); + $thiz->bantime = 0; + $thiz->stat = $stat; + $thiz->subst = $subst; + $thiz->step = 1; + $thiz->trans_step = -1; + $thiz->comm = array(); + $thiz->asta_card = -2; + $thiz->asta_pnt = -1; + $thiz->handpt = -1; $thiz->exitislock = TRUE; - $thiz->flags = 0x00; + $thiz->flags = 0x00; - $thiz->chattime = array_fill(0, CHAT_N, 0); - $thiz->chat_cur = 0; - $thiz->chat_lst = ""; - $thiz->chat_ban = 0; - $thiz->chat_dlt = 0; + $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_orig = $table; $thiz->table = $table; - $thiz->table_pos = -1; - $thiz->table_token = ""; - + $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->idx_orig = $from->idx; + $this->code = $from->code; $this->name = $from->name; $this->sess = $from->sess; $this->ip = $from->ip; @@ -646,53 +695,54 @@ class User { $i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N)); for ($i = $i_start ; $i < $from->step ; $i++) { - $ii = $i % COMM_N; - $this->comm[$ii] = $from->comm[$ii]; + $ii = $i % COMM_N; + if (isset($from->comm[$ii])) { + $this->comm[$ii] = $from->comm[$ii]; + } } $this->asta_card = $from->asta_card; $this->asta_pnt = $from->asta_pnt; $this->handpt = $from->handpt; $this->exitislock = $from->exitislock; - $this->flags = $from->flags; + $this->flags = $from->flags; - $this->chattime = array(); + $this->chattime = array(); for ($i = 0 ; $i < CHAT_N ; $i++) $this->chattime[$i] = $from->chattime[$i]; - $this->chat_cur = $from->chat_cur; - $this->chat_lst = $from->chat_lst; - $this->chat_ban = $from->chat_ban; - $this->chat_dlt = $from->chat_dlt; + $this->chat_cur = $from->chat_cur; + $this->chat_lst = $from->chat_lst; + $this->chat_ban = $from->chat_ban; + $this->chat_dlt = $from->chat_dlt; $this->table_orig = $from->table_orig; $this->table = $from->table; $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); + if (($thiz = new User()) == 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); + if (($thiz = new User()) == FALSE) + return (FALSE); + $thiz->idx = $from->idx; + $thiz->idx_orig = $from->idx; + $thiz->code = $from->code; $thiz->name = $from->name; $thiz->sess = $from->sess; $thiz->ip = $from->ip; @@ -732,9 +782,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."]"); @@ -751,39 +810,69 @@ class User { */ } - function step_set($step) { - $this->step = $step; - - do { - if (validate_sess($this->sess) == FALSE) - break; - if (file_exists(PROXY_PATH) == FALSE) - mkdir(PROXY_PATH); - if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE) - break; - fwrite($fp, pack("l",$this->step), 4); - fclose($fp); - + function step_set($step) + { + $this->step = $step & 0x7fffffff; + return (TRUE); - } while (0); - - return (FALSE); } function step_inc($delta = 1) { - $this->step += $delta; - - if (validate_sess($this->sess)) { - if (file_exists(PROXY_PATH) == FALSE) - mkdir(PROXY_PATH); - $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w'); - fwrite($fp, pack("l",$this->step), 4); - fclose($fp); + $this->step += $delta; + /* modularization because unpack() not manage unsigned 32bit int correctly */ + $this->step &= 0x7fffffff; + + return TRUE; + } - return (TRUE); - } - - return (FALSE); + function save_step() + { + do { + if (validate_sess($this->sess) == FALSE) + break; + if (file_exists(PROXY_PATH) == FALSE) + mkdir(PROXY_PATH); + if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE) + break; + fwrite($fp, pack("LL",$this->step, $this->idx)); + fclose($fp); + + log_main("step_set [".$this->sess. "] [".$this->step."]"); + + return (TRUE); + } while (0); + + return (FALSE); + } + + static function load_step($sess) + { + $fp = FALSE; + do { + if (validate_sess($sess) == FALSE) + break; + + if (file_exists(PROXY_PATH) == FALSE) + mkdir(PROXY_PATH); + if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE) + break; + if (($s = fread($fp, 8)) == FALSE) + break; + if (mb_strlen($s, "ASCII") != 8) + break; + $arr = unpack('Ls/Li', $s); + fclose($fp); + + // log_rd2("A0: ".$arr[0]." A1: ".$arr[1]); + return ($arr); + } while (0); + + if ($fp != FALSE) + fclose($fp); + + log_rd2("STEP_GET [".$sess."]: return false "); + + return (FALSE); } function reset() { @@ -803,42 +892,115 @@ class User { $this->chat_dlt = 0; $this->the_end = FALSE; } -} // end class User - - - - - - -function step_get($sess) { - $fp = FALSE; - do { - if (validate_sess($sess) == FALSE) - break; - - if (file_exists(PROXY_PATH) == FALSE) - mkdir(PROXY_PATH); - if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE) - break; - if (($s = fread($fp, 4)) == FALSE) - break; - if (strlen($s) != 4) - break; - $arr = unpack('l', $s); - fclose($fp); + static function load_data($id, $sess) + { + log_main("load_data: id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] "); + + $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); + + if ($sess != FALSE && $user->sess != $sess) { + $doexit = TRUE; + break; + } + log_only("user == ".($user == FALSE ? "FALSE" : "TRUE")." user === ".($user === FALSE ? "FALSE" : "TRUE")." user isset ".(isset($user) ? "TRUE" : "FALSE")); + + 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)); + } + } + else { + if ($sess != FALSE) { + /* + * NOTE: this part is for check only, theoretically + * user->step anch proxy_step are set allways at the same value + */ + $old_step = $user->step; + $arr = User::load_step($sess); + $user->step = $arr['s']; + if ($old_step != $user->step) { + log_crit("steps are diffetents User->step ".$user->step." Old_step: ".$old_step); + } + } + } + $user->shm_sz = $shm_sz; + + shm_detach($shm); + } + + // + // SHSPLIT: load users from the shared memory + // + return ($user); + } while (0); + + if ($doexit) + exit(); + + return (FALSE); + } + - // log_rd2("A0: ".$arr[0]." A1: ".$arr[1]); - return ($arr[1]); - } while (0); + static function save_data($user, $id) + { + GLOBAL $sess; + + $shm = FALSE; + + 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); + if ($user->sess != "") + $user->save_step(); + log_main("User[".$id."] saved."); + 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); + } - if ($fp != FALSE) - fclose($fp); - log_rd2("STEP_GET: return false "); +} // end class User - return (FALSE); -} function step_unproxy($sess) { log_rd2("UNPROXY: ".PROXY_PATH."/".$sess.".step"); @@ -853,7 +1015,7 @@ class Room { var $table; var $comm; // commands for many people var $step; // current step of the comm array - var $garbage_timeout; + // externalized var $garbage_timeout; var $shm_sz; function Room () { @@ -861,11 +1023,11 @@ 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++) { - $this->table[$i] =& Table::create($i); + $this->table[$i] = Table::create($i); /* OLD METHOD if ($i < 12) { $row = ( (((int)($i / 4)) % 2) == 0 ); @@ -881,12 +1043,14 @@ class Room { else $this->table[$i]->auth_only = FALSE; } - $this->garbage_timeout = 0; + // externalized $this->garbage_timeout = 0; + Room::garbage_time_expire_set(0); + $this->shm_sz = SHM_DIMS_MIN; } function garbage_manager($force) { - GLOBAL $G_lang, $mlang_brisk; + GLOBAL $G_lang, $mlang_brisk, $G_base; $ismod = FALSE; @@ -894,24 +1058,26 @@ class Room { /* Garbage collector degli utenti in timeout */ $curtime = time(); - if ($force || $this->garbage_timeout < $curtime) { + + // externalized if ($force || $this->garbage_timeout < $curtime) { + if ($force || Room::garbage_time_is_expired($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++) { - $table_cur =& $this->table[$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) { + if (($sem = Bin5::lock_data($table_idx)) != FALSE) { log_main("bin5 lock data success"); $no_recovery = FALSE; - if (($bri = &Briskin5::load_data($table_idx)) != FALSE) { + if (($bri = Bin5::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); log_main("ERROR: not matching table_start. Room: ".$table_cur->table_start." Table: ".$bri->table_start); @@ -927,7 +1093,7 @@ class Room { log_main("garbage_manager: bri loaded successfully."); $bri->garbage_manager(TRUE); - $bri_table = &$bri->table[0]; + $bri_table = $bri->table[0]; // is the end of the table if ($bri->the_end == TRUE) { @@ -943,8 +1109,8 @@ class Room { for ($i = 0 ; $i < $bri_table->player_n ; $i++) { // stat must be "table" by definition - $user_cur =& $this->user[$table_cur->player[$i]]; - $bri_user =& $bri->user[$i]; + $user_cur = $this->user[$table_cur->player[$i]]; + $bri_user = $bri->user[$i]; $user_cur->subst = $bri_user->subst; $user_cur->step = $bri_user->step; @@ -955,10 +1121,10 @@ class Room { log_legal($curtime, $user_cur, "STAT:DESTROY_GAME", $plist); - $this->room_join_wakeup(&$user_cur, FALSE, 0); + $this->room_join_wakeup($user_cur, FALSE, 0); $table_cur->table_token = ""; $table_cur->wakeup_time = $curtime + WAKEUP_TIME; - Briskin5::destroy_data($table_idx); + Bin5::destroy_data($table_idx); } else { log_main("gm:: save_data"); @@ -967,14 +1133,14 @@ class Room { $this->user[$table_cur->player[$i]]->lacc = $bri->user[$i]->lacc; } - Briskin5::save_data(&$bri); + Bin5::save_data($bri); } - } // else if (($bri = &Briskin5::load_data($table_idx)) != FALSE) { + } // else if (($bri = Bin5::load_data($table_idx)) != FALSE) { else if ($no_recovery == FALSE) { 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 = $this->user[$table_cur->player[$i]]; $user_cur->subst = "shutdowner"; $user_cur->step_inc(); @@ -993,11 +1159,11 @@ class Room { } log_legal($curtime, $user_cur, "STAT:DESTROY_GAME(RECOVERY)", $plist); - $this->room_join_wakeup(&$user_cur, TRUE, -2); + $this->room_join_wakeup($user_cur, TRUE, -2); $table_cur->table_token = ""; } - Briskin5::unlock_data($sem); + Bin5::unlock_data($sem); } // bri::lock_data } // if ($table_cur->player_n == PLAYERS_N) { } // for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { @@ -1005,7 +1171,7 @@ class Room { log_rd2("out new loop."); for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; log_rd2("User: ".$user_cur->name." stat: ".$user_cur->stat." subst: ".$user_cur->subst); @@ -1023,9 +1189,9 @@ class Room { log_rd2("AUTO LOGOUT."); if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table') - $this->room_wakeup(&$user_cur); + $this->room_wakeup($user_cur); else if ($user_cur->subst == 'standup') - $this->room_outstandup(&$user_cur); + $this->room_outstandup($user_cur); else log_rd2("LOGOUT FROM WHAT ???"); } @@ -1033,7 +1199,7 @@ class Room { if ($user_cur->laccwr + EXPIRE_TIME_SMAMMA < $curtime) { // lo rimettiamo in piedi if ($user_cur->stat == 'room' && $user_cur->subst == 'sitdown') { - $this->room_wakeup(&$user_cur); + $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($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); @@ -1043,21 +1209,25 @@ class Room { } log_rd2("GARBAGE UPDATED!"); - $this->garbage_timeout = time() + GARBAGE_TIMEOUT; + // externalized $this->garbage_timeout = time() + GARBAGE_TIMEOUT; + Room::garbage_time_expire_set($curtime + GARBAGE_TIMEOUT); $ismod = TRUE; } return ($ismod); } - function show_room($user_step, &$user) + 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) { + 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 { @@ -1072,17 +1242,23 @@ 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)); $ret .= $this->table[$i]->act_content($user); - 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); + if ($this->table[$i]->wag_own != -1) + $ret .= sprintf('tra.add(%d, "%s: %s"); ', $i, $this->user[$this->table[$i]->wag_own]->name, $this->table[$i]->wag_com); else $ret .= sprintf('tra.rem(%d); ', $i); } @@ -1092,10 +1268,10 @@ class Room { } - function room_wakeup(&$user) + function room_wakeup($user) { $table_idx = $user->table; - $table = &$this->table[$table_idx]; + $table = $this->table[$table_idx]; log_main("WAKEUP: begin function table:".$table_idx." stat: ".$user->stat." subst: ".$user->subst); @@ -1106,10 +1282,10 @@ class Room { log_main("WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n); for ($i = 0 ; $i < $table->player_n ; $i++) { - $user_cur = &$this->user[$table->player[$i]]; + $user_cur = $this->user[$table->player[$i]]; log_main("PREIMPOST: INLOOP name: ".$user_cur->name); - if ($user_cur != $user) { + if ($user->idx_get() != $table->player[$i]) { $user_cur->stat_set("room"); $user_cur->subst = "sitdown"; $user_cur->laccwr = $curtime; @@ -1128,26 +1304,25 @@ class Room { $user->laccwr = $curtime; } - $remove_wagon = false; - if($table->wag_own == $user) { - $remove_wagon = true; + $remove_wagon = FALSE; + if($table->wag_own == $user->idx_get()) { $table->wag_reset($curtime); - + $remove_wagon = TRUE; } /* aggiorna l'array dei giocatori al tavolo. */ - $table->user_rem(&$this, &$user); + $table->user_rem($this, $user); for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; 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)) { + if ($from_table && ($user_cur->table == $table_idx || $user->idx_get() == $i)) { $ret .= 'gst.st_loc++; the_end=true; window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");|'; // $ret .= 'gst.st_loc++; document.location.assign("index.php");|'; log_main("DOCUMENT.index.php: from table"); @@ -1161,7 +1336,7 @@ class Room { // $ret .= table_act_content(FALSE, 0, $table_idx, $user->table, FALSE); $ret .= $table->act_content($user); - if ($user_cur == $user) { + if ($user->idx_get() == $i) { // set the new status $ret .= 'subst = "standup"; tra.show(); '; // clean the action buttons in other tables @@ -1185,10 +1360,10 @@ class Room { } } - function room_join_wakeup(&$user, $update_lacc = FALSE, $trans_delta) + function room_join_wakeup($user, $update_lacc = FALSE, $trans_delta) { $table_idx = $user->table; - $table = &$this->table[$table_idx]; + $table = $this->table[$table_idx]; log_main("JOIN_WAKEUP: begin function table:".$table_idx." stat: ".$user->stat." subst: ".$user->subst); @@ -1200,7 +1375,7 @@ class Room { log_main("JOIN WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n); for ($i = 0 ; $i < $table->player_n ; $i++) { - $user_cur = &$this->user[$table->player[$i]]; + $user_cur = $this->user[$table->player[$i]]; log_main("PREIMPOST INLOOP name: ".$user_cur->name); if ($user_cur->sess != "") { if ($update_lacc == TRUE) { @@ -1215,33 +1390,33 @@ class Room { $user_cur->stat_set("room"); $user_cur->subst = "standup"; $user_cur->table = -1; - $user_wup[$user_wup_n++] = &$user_cur; + $user_wup[$user_wup_n++] = $user_cur; - $remove_wagon = false; - if($table->wag_own == $user_cur) { - $remove_wagon = true; + $remove_wagon = FALSE; + if($table->wag_own == $table->player[$i]) { + $remove_wagon = TRUE; $table->wag_reset($curtime); } } - $user_tab[$user_tab_n++] = &$user_cur; + $user_tab[$user_tab_n++] = $table->player[$i]; } } for ($wup_idx = 0 ; $wup_idx < $user_wup_n ; $wup_idx++) - $table->user_rem(&$this, &$user_wup[$wup_idx]); + $table->user_rem($this, $user_wup[$wup_idx]); /* aggiorna l'array dei giocatori al tavolo. */ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { log_main("START LOOP"); - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; if ($user_cur->sess == '' || $user_cur->stat != 'room') { log_main("name: ".$user_cur->name."skip subst: ".$user_cur->subst); continue; } 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") { @@ -1256,8 +1431,8 @@ class Room { for ($tab_idx = 0 ; $tab_idx < $user_tab_n ; $tab_idx++) - if ($user_cur == $user_tab[$tab_idx]) - break; + if ($user_tab[$tab_idx] == $i) + break; // for users that wakeup the room will be reconstructed by index_rd.php if ($tab_idx < $user_tab_n) { @@ -1270,7 +1445,7 @@ class Room { $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] = $this->show_room(($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); @@ -1291,23 +1466,23 @@ class Room { } } - function room_outstandup(&$user) + function room_outstandup($user) { - $this->room_sitdown(&$user, -1); + $this->room_sitdown($user, -1); } - function table_update(&$user) + function table_update($user) { log_main("table_update: pre - USER: ".$user->name); $table_idx = $user->table; if ($table_idx > -1) - $table = &$this->table[$table_idx]; + $table = $this->table[$table_idx]; for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $ret = ""; - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; if ($user_cur->sess == '' || $user_cur->stat != 'room') continue; @@ -1315,7 +1490,7 @@ class Room { if ($table_idx > -1) $ret .= $this->table_content($user_cur, $table_idx); - if ($user_cur == $user) { + 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); @@ -1327,31 +1502,30 @@ class Room { log_main("table_update: post"); } - function room_sitdown(&$user, $table_idx) + 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]; + $table = $this->table[$table_idx]; // wagon shutdown - if ($table->wag_own != NULL && $table->player_n == PLAYERS_N) { + if ($table->wag_own != -1 && $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; - } + 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]; + $user_cur = $this->user[$i]; if ($user_cur->sess == '' || $user_cur->stat != 'room') continue; @@ -1360,7 +1534,7 @@ class Room { $ret .= $this->table_content($user_cur, $table_idx); $ret .= $this->standup_content($user_cur); - if ($user_cur == $user) { + if ($user->idx_get() == $i) { $ret .= 'subst = "sitdown"; tra.hide(); '; // clean the action buttons in other tables for ($e = 0 ; $e < TABLES_N ; $e++) { @@ -1380,15 +1554,16 @@ class Room { } } - function chatt_send(&$user, $mesg) + function chatt_send($user, $mesg) { - GLOBAL $G_alarm_passwd, $mlang_brisk, $G_lang; + 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 @@ -1399,6 +1574,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 || @@ -1412,9 +1588,9 @@ class Room { break; } - $table = &$this->table[$user->table]; + $table = $this->table[$user->table]; - if ($table->wag_own != NULL) { + if ($table->wag_own != -1) { // MLANG
    Il messaggio di segnalazione del tavolo è già attivato.

    $msg = $mlang_brisk['tickjust'][$G_lang]; $to_user = show_notify($msg, 0, "chiudi", 400, 100); @@ -1434,10 +1610,10 @@ class Room { $msg = substr($msg, 5); - $table->wag_set($user, $msg); + $table->wag_set($user->idx_get(), $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 @@ -1475,13 +1651,35 @@ class Room { 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, \''.$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 (strcmp($msg, "/authreq") == 0) { @@ -1513,7 +1711,7 @@ class Room { $msg = "COMMAND ".$msg; for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; if ($user_cur->sess == '') continue; @@ -1529,8 +1727,12 @@ class Room { /* 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); } @@ -1544,12 +1746,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)) { - $prestr = sprintf($mlang_brisk['nickjust'][$G_lang], xcape($name_new)); - $to_user .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $prestr); - } + 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"); @@ -1588,6 +1792,18 @@ 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"],"%s");', $dt, NICKSERV, $mlang_brisk['statunkn'][$G_lang]); @@ -1657,21 +1873,28 @@ class Room { if ($to_room != FALSE) { for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $user_cur = &$this->user[$i]; + $user_cur = $this->user[$i]; if ($target != "" && $user_cur->name != $target) continue; - // if ($user_cur->sess == '' || $user_cur->stat != 'room') - if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user_cur == $user) + if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user->idx_get() == $i) 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(); @@ -1680,20 +1903,20 @@ 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]; + $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) { + if (($sem = Bin5::lock_data($table_idx)) != FALSE) { log_main("bin5 lock data success"); $no_recovery = FALSE; - if (($bri = &Briskin5::load_data($table_idx)) != FALSE) { + if (($bri = Bin5::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; @@ -1701,10 +1924,10 @@ class Room { } if ($bri != FALSE) { - $bri_table = &$bri->table[0]; + $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]; + $bri_user = $bri->user[$i]; if ($target != "" && $bri_user->name != $target) continue; @@ -1713,9 +1936,9 @@ class Room { $bri_user->comm[$bri_user->step % COMM_N] .= $to_tabl; $bri_user->step_inc(); } - Briskin5::save_data(&$bri); + Bin5::save_data($bri); } - Briskin5::unlock_data($sem); + Bin5::unlock_data($sem); } // bri::lock_data } // if ($table_cur->player_n == PLAYERS_N) { } // for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { @@ -1723,11 +1946,11 @@ class Room { if ($update_room) { if ($user->stat == 'room' && $user->subst == 'standup') { - $this->standup_update(&$user); + $this->standup_update($user); } else if ($user->stat == 'room' && $user->subst == 'sitdown') { log_main("chatt_send pre table update"); - $this->table_update(&$user); + $this->table_update($user); log_main("chatt_send post table update"); } } // if ($update_room ... @@ -1735,16 +1958,16 @@ 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++) { if (strcmp($sess, $this->user[$i]->sess) == 0) { // find it $idx = $i; - $ret = &$this->user[$i]; + $ret = $this->user[$i]; return ($ret); } } @@ -1756,13 +1979,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 @@ -1770,27 +1991,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))); @@ -1799,19 +2020,29 @@ 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) { + $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 ? */ @@ -1819,19 +2050,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) @@ -1839,10 +2070,12 @@ 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]; + $ghost_user = $this->user[$ghost]; $curtime = time(); $ghost_user->step_inc(); if ($sess == "") { @@ -1857,16 +2090,16 @@ 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"); - if (($brisem = Briskin5::lock_data($table_idx)) != FALSE) { - if (($bri = &Briskin5::load_data($table_idx)) != FALSE) { + require_once("${G_base}briskin5/Obj/briskin5.phh"); + if (($brisem = Bin5::lock_data($table_idx)) != FALSE) { + if (($bri = Bin5::load_data($table_idx)) != FALSE) { if ($bri->the_end != TRUE) { $bri->user[$ghost_user->table_pos]->step_inc(); $bri->user[$ghost_user->table_pos]->sess = $sess; - Briskin5::save_data(&$bri); + Bin5::save_data($bri); } } - Briskin5::unlock_data($brisem); + Bin5::unlock_data($brisem); } } @@ -1893,19 +2126,34 @@ 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; + } } } if ($ghost > -1) { log_main("ghost: rename!"); - $ghost_user =& $this->user[$ghost]; + $ghost_user = $this->user[$ghost]; if ($ghost_auth == FALSE) { for ($sfx = 1 ; $sfx <= MAX_PLAYERS ; $sfx++) { @@ -1926,11 +2174,11 @@ class Room { $ghost_user->name = $ghostname; if ($ghost_user->stat == 'room' && $ghost_user->subst == 'standup') { - $this->standup_update(&$ghost_user); + $this->standup_update($ghost_user); } else { log_main("chatt_send pre table update"); - $this->table_update(&$ghost_user); + $this->table_update($ghost_user); log_main("chatt_send post table update"); } } // if ($ghost_auth == FALSE @@ -1942,20 +2190,22 @@ 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]; + $user_cur = $this->user[$i]; if ($user_cur->sess == '') continue; @@ -1963,7 +2213,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_cur == $user) { + if ($user->idx_get() == $i) { $itin = ($user->flags & USER_FLAG_AUTH ? "" : ""); $itou = ($user->flags & USER_FLAG_AUTH ? "" : ""); @@ -1978,18 +2228,19 @@ 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; + do { if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) { log_main("ftok failed"); @@ -2005,37 +2256,46 @@ 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); + + $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, FALSE); + } } - $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; @@ -2069,28 +2329,77 @@ class Room { return (FALSE); } - function lock_data() + + function save_data($room) { - GLOBAL $sess; + GLOBAL $sess; - // echo "LOCK: ".FTOK_PATH."/main"; - // exit; - if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) { - return (FALSE); - } - // echo "FTOK ".$tok."
    "; - if (($res = sem_get($tok)) == FALSE) { - return (FALSE); - } - if (sem_acquire($res)) { - log_lock("LOCK room"); - return ($res); - } - else - return (FALSE); + $ret = FALSE; + $shm = FALSE; + + 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]; + } + log_load("FINISH: ".($ret == TRUE ? "TRUE" : "FALSE")); + + return ($ret); + } + + static function lock_data() + { + GLOBAL $sess; + + // echo "LOCK: ".FTOK_PATH."/main"; + // exit; + if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) { + return (FALSE); + } + // echo "FTOK ".$tok."
    "; + if (($res = sem_get($tok)) == FALSE) { + return (FALSE); + } + if (sem_acquire($res)) { + log_lock("LOCK room"); + return ($res); + } + else + return (FALSE); } - function unlock_data($res) + static function unlock_data($res) { GLOBAL $sess; @@ -2108,8 +2417,8 @@ class Room { 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 == "") + for ($i = 0 , $ct = 0 ; $ct < 4 && $i < MAX_PLAYERS ; $i++) { + if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "") continue; $ct++; } @@ -2118,20 +2427,19 @@ class Room { $content = ' j_stand_cont( [ '; - for ($e = 0 , $ct = 0 ; $e < MAX_PLAYERS ; $e++) { - if ($this->user[$e]->sess == "" || $this->user[$e]->stat != "room" || $this->user[$e]->name == "") + for ($i = 0 , $ct = 0 ; $i < MAX_PLAYERS ; $i++) { + if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "") continue; - $flags = $this->user[$e]->flags; + $flags = $this->user[$i]->flags; - if ($this->user[$e]->subst == "standup") { - if ($this->user[$e] == $user) - { - $flags |= 1; + if ($this->user[$i]->subst == "standup") { + if ($user->idx_get() == $i) { + $flags |= 1; } - - $content .= sprintf('%s[ %d, "%s" ]',($ct > 0 ? ', ' : ''), $flags, xcape($this->user[$e]->name)); - $ct++; + + $content .= sprintf('%s[ %d, "%s" ]',($ct > 0 ? ', ' : ''), $flags, xcape($this->user[$i]->name)); + $ct++; } } $content .= ' ]);'; @@ -2149,23 +2457,23 @@ class Room { // $sess = $user->sess; - $table = &$this->table[$table_idx]; + $table = $this->table[$table_idx]; if ($user->stat != 'room') return; $content = "[ "; for ($i = 0 ; $i < $table->player_n ; $i++) { - $user_cur = &$this->user[$table->player[$i]]; - - $flags = $user_cur->flags; - - if ($user_cur == $user) - $flags |= 1; - - log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx)); - - $content .= sprintf('%s[ %d, "%s" ]',($i == 0 ? '' : ', '), $flags, xcape($user_cur->name)); + $user_cur = $this->user[$table->player[$i]]; + + $flags = $user_cur->flags; + + if ($user->idx_get() == $table->player[$i]) + $flags |= 1; + + log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx)); + + $content .= sprintf('%s[ %d, "%s" ]',($i == 0 ? '' : ', '), $flags, xcape($user_cur->name)); } $content .= ' ]'; @@ -2175,6 +2483,49 @@ class Room { return ($ret); } + static function garbage_time_is_expired($tm) + { + $ret = TRUE; + $fp = FALSE; + do { + if (file_exists(PROXY_PATH) == FALSE) + mkdir(PROXY_PATH); + if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE) + break; + if (($s = fread($fp, 4)) == FALSE) + break; + if (mb_strlen($s, "ASCII") != 4) + break; + $arr = unpack('Le', $s); + if ($arr['e'] > $tm) + $ret = FALSE; + } while (0); + + if ($fp != FALSE) + fclose($fp); + + log_rd2("END: return ".($ret ? "TRUE" : "FALSE")); + + return ($ret); + } + + static function garbage_time_expire_set($tm) + { + do { + if (file_exists(PROXY_PATH) == FALSE) + mkdir(PROXY_PATH); + if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE) + break; + fwrite($fp, pack("L",$tm)); + fclose($fp); + + return (TRUE); + } while (0); + + return (FALSE); + } + + } // end class Room function make_seed() @@ -2183,223 +2534,287 @@ function make_seed() return (float) $sec + ((float) $usec * 100000); } +function btrace_line($ar) +{ + GLOBAL $G_btrace_pref_sub; -function log_only2($log) { - GLOBAL $sess; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("ONL2: [%s] [%s]\n", $ssess, $log)); - fclose($fp); - } + $ret = ""; + for ($i = 0 ; $i < count($ar) ; $i++) { + $with_class = isset($ar[$i]['class']); + $with_file = isset($ar[$i]['file']); + $ret .= sprintf("%s%s%s (%s:%d)", ($i == 0 ? "" : ", "), + ($with_class ? $ar[$i]['class'].$ar[$i]['type'] : ""), + $ar[$i]['function'], ($with_file ? str_replace($G_btrace_pref_sub, "", $ar[$i]['file']) : ""), + ($with_file ? $ar[$i]['line'] : "")); + } + + return ($ret); } -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_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; + + $btrace = btrace_line(debug_backtrace()); + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("LMOP: [%f] [%05d] [%s] [%s]\n", gettimeofday(TRUE), $step, $log, $btrace)); + fclose($fp); + } } -function log_only($log) { - GLOBAL $sess; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0) - return; - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("ONLY: [%s] [%s]\n", $ssess, $log)); - fclose($fp); - } +function log_only2($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0) + return; + + $btrace = btrace_line(debug_backtrace()); + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("ONL2: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_main($log) { - GLOBAL $sess; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("MAIN: [%s] [%s]\n", $ssess, $log)); - fclose($fp); - } +function log_crit($log) +{ + GLOBAL $sess, $PHP_SELF; + + 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; + + $btrace = btrace_line(debug_backtrace()); + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("CRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_rd($log) { - GLOBAL $sess; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("READ: [%s] [%s]\n", $ssess, $log)); - fclose($fp); - } +function log_only($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0) + return; + + $btrace = btrace_line(debug_backtrace()); + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("ONLY: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_rd2($log) { - GLOBAL $sess; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("REA2: [%s] [%s]\n", $ssess, $log)); - fclose($fp); - } +function log_main($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0) + return; + + $btrace = btrace_line(debug_backtrace()); + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("MAIN: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_send($log) { - GLOBAL $sess; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("SEND: [%s] [%s]\n", $ssess, $log)); - fclose($fp); - } +function log_rd($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0) + return; + + $btrace = btrace_line(debug_backtrace()); + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_lock($log) { - GLOBAL $sess; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("LOCK: [%s] [%s]\n", $ssess, $log)); - fclose($fp); - } +function log_rd2($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0) + return; + + $btrace = btrace_line(debug_backtrace()); + + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_wr($log) { - GLOBAL $sess; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; - - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("WRIT: [%s] [%s]\n", $ssess, $log)); - fclose($fp); - } +function log_send($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0) + return; + + $btrace = btrace_line(debug_backtrace()); + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("SEND: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_load($log) { - GLOBAL $sess; - - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0) - return; - - if (isset($sess) == FALSE) - $ssess = "XXXX"; - else - $ssess = $sess; +function log_lock($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0) + return; + + $btrace = btrace_line(debug_backtrace()); + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("LOCK: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } +} - if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0) - return; - - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("LOAD: [%s] [%s]\n", $ssess, $log)); - fclose($fp); - } +function log_wr($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0) + return; + + $btrace = btrace_line(debug_backtrace()); + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("WRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } } -function log_auth($sess, $log) { - if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_AUTH) == 0) - return; +function log_load($log) +{ + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0) + return; + + $btrace = btrace_line(debug_backtrace()); + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("LOAD: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); + fclose($fp); + } +} - if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0) - return; +function log_auth($sess, $log) +{ + GLOBAL $PHP_SELF; - if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("AUTH: [%s] [%d] [%s]\n", $sess, time(), $log)); - fclose($fp); - } + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_AUTH) == 0) + return; + + if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0) + return; + + $btrace = btrace_line(debug_backtrace()); + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("LOAD: [%s] [%d] [%s] [%s]\n", $sess, time(), $log, $btrace)); + fclose($fp); + } } // function log_legal($curtime, $sess, $name, $where, $mesg) -function log_legal($curtime, &$user, $where, $mesg) +function log_legal($curtime, $user, $where, $mesg) { GLOBAL $_SERVER; @@ -2412,21 +2827,6 @@ function log_legal($curtime, &$user, $where, $mesg) } } -function log_points($curtime, &$user, $where, $mesg) -{ - GLOBAL $_SERVER; - - if (($fp = @fopen(LEGAL_PATH."/points.log", 'a')) != FALSE) { - /* Unix time | session | nickname | IP | where was | mesg */ - fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|%s|\n", $curtime, $user->sess, - ($user->flags & USER_FLAG_AUTH ? 'A' : 'N'), - $user->name, $_SERVER['REMOTE_ADDR'], $where , $mesg)); - fclose($fp); - } -} - - - function lock_banlist() { @@ -2480,10 +2880,10 @@ 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 show_notify_opaque($text, $tout, $butt, $w, $h) +function show_notify_ex($text, $tout, $butt, $w, $h, $is_opaque, $block_time) { log_main("SHOW_NOTIFY OPAQUE: ".$text); - return sprintf('var noti = new notify_ex(gst,"%s",%d,"%s",%d,%d, true);', $text, $tout, $butt, $w, $h); + 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); } @@ -2533,6 +2933,8 @@ function secstoword($secs) { GLOBAL $G_lang; + $ret = ""; + $mins = floor($secs / 60); $secs = $secs % 60; if ($G_lang == 'en') {