X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=2efb2ffc94b1d02379249ec194bfa26600ad5f16;hb=ad9bfccebd7532f3283ef6cc0733a47973c9a44e;hp=5f87709ae91aae2953562e5489f80eb092840f59;hpb=311fa79d66b1b386ef18d478a1d3afbb675fae75;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 5f87709..2efb2ff 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -2,8 +2,8 @@ /* * brisk - brisk.phh * - * Copyright (C) 2006-2012 Matteo Nastasi - * mailto: nastasi@alternativeoutput.it + * Copyright (C) 2006-2013 Matteo Nastasi + * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it * @@ -28,7 +28,8 @@ define('FTOK_PATH', "/var/lib/brisk"); define('LEGAL_PATH', "/tmp/legal_brisk"); define('PROXY_PATH', "/var/lib/brisk_proxy"); define('TABLES_N', 36); -define('TABLES_AUTH_N', 4); +define('TABLES_AUTH_N', 8); +define('TABLES_CERT_N', 4); define('PLAYERS_N', 3); define('MAX_POINTS', 5); define('MAX_PLAYERS', (20 + (PLAYERS_N * TABLES_N))); @@ -58,8 +59,8 @@ define('EXPIRE_TIME_WAG', 10); define('WAKEUP_TIME', 12); // BAN_TIME da allineare anche in commons.js define('BAN_TIME', 3600); -define('GARBAGE_TIMEOUT', 10); -define('NICKSERV', "BriskServ"); +define('GARBAGE_TIMEOUT', 5); +define('NICKSERV', "BriskServ"); define('LOCK_SHARE_MAX', 10000); @@ -77,7 +78,9 @@ define('DBG_CRIT', 0x0400); define('DBG_LMOP', 0x0800); define('DBG_TRAC', 0x1000); define('DBG_SHME', 0x2000); -// NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols +define('DBG_ENGI', 0x4000); +define('DBG_CDS', 0x8000); +// NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols define('BRISK_DEBUG', 0x0800); define('BRISK_SINGLE_DEBUG',0); @@ -94,7 +97,7 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi', 'tit_all' => array( 'it' => 'tutti', 'en' => 'all' ), - 'tabtout_a'=> array( 'it' => '
Sei stato inattivo per ', + 'tabtout_a'=> array( 'it' => '
Sei stato inattivo per ', 'en' => '
You are being idle for ' ), 'tabtout_b'=> array( 'it' => ' minuti.

Quindi ritorni tra i Giocatori in piedi.', 'en' => ' minutes.

Then you return with the standing players.'), @@ -106,10 +109,10 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi', 'en' => 'EN
The signalling message of the table
will be deactivated for %d second%s.

'), 'alarpass' => array( 'it' => '
La password digitata non è corretta.

', 'en' => '
The entered password is not correct.

'), - 'alarret' => array( 'it' => '"Alarm \\"%s\\" inviato a %s."', - 'en' => '"Alarm \\"%s\\" sent to %s."'), - 'authmust' => array( 'it' => 'Per autenticare qualcuno devi a tua volta essere autenticato.', - 'en' => 'To authenticate someone you have to be authenticated.'), // on your turn + 'alarret' => array( 'it' => 'Alarm \\"%s\\" inviato a %s.', + 'en' => 'Alarm \\"%s\\" sent to %s.'), + 'authmust' => array( 'it' => 'Per autenticare qualcuno devi a tua volta essere autenticato e certificato.', + 'en' => 'To authenticate someone you have to be authenticated and certified.'), // on your turn 'mesgmust' => array( 'it' => 'Per inviare un messaggio devi essere autenticato.', 'en' => 'To send a message you have to be authenticated.'), 'nickmust' => array( 'it' => 'Il nickname deve contenere almeno una lettera dell\'alfabeto o una cifra.', @@ -132,20 +135,29 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi', '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') - - + 'en' => 'Connection to the database failed
All authentications are suspended temporarly, you login as normal user.
We are about the limitation'), + + 'tos_old' => array( 'it' => '%s ha sottoscritto dei Termini del Servizio antecedenti a quelli necessari per poter richiedere questa funzionalità.', + 'en' => 'EN %s ha sottoscritto dei Termini del Servizio antecedenti a quelli necessari per poter richiedere questa funzionalità.'), + 'gua_nfd' => array( 'it' => 'Non è stato trovato un garante per %s.', + 'en' => 'EN Non è stato trovato un garante per %s.'), + 'gua_self' => array( 'it' => '%s si è auto-garantito.', + 'en' => 'EN %s si è auto-garantito.'), + 'gua_info' => array( 'it' => 'Il garante di %s è %s.', + 'en' => 'EN Il garante di %s è %s.'), + 'gua_err' => array( 'it' => 'Error %d. Utilizzo: /guar <login>.', + 'en' => 'Error %d. Usage: /guar <login>.') ); $G_lng = langtolng($G_lang); $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 ); -$G_brisk_version = "4.5.3"; +$G_brisk_version = "4.14.5"; /* MLANG: ALL THE INFO STRINGS IN brisk.phh */ -$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuova visualizzazione dello stato della connessione dati, indirizzo IP sorgente memorizzato correttamente nei log, risolte alcune inconsistenze.', +$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo sistema di registrazione degli utenti, aggiunto reinvio dell\' email di verifica, ban con classi di IP, nuovi colori, nuovo sistema bi banner laterali per gli eventi', 'Se vuoi iscriverti alla Mailing List, cliccala!' ), - 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: usage of reader/writer locking instead of generic exclusive locking.', + 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: new users subscription system, refactored sidebanner system.', 'If you want to subscribe our Mailing List, click it!' ) ); $G_room_help = array( 'it' => ' @@ -170,8 +182,10 @@ Dopo che è iniziata una partita per uscirne dovete chiedere agli altri gi
Comandi della chat
/nick <nuovo_nickname> - cambio di nickname -
/tav <frase di invito> - invito per gli altri giocatori al tavolo dove si è seduti +
/tav <frase di invito> - invito per gli altri giocatori al tavolo dove si è seduti
/st <stato> - cambia l\'icona associata al tuo user; stato può valere: \\"normale\\", \\"fuori\\", \\"pausa\\", \\"cibo\\", \\"cane\\", \\"lavoro\\", \\"presente\\" oppure \\"sigaretta\\" +
/cont <id partita> - quando si è a un tavolo per garantiti, permette di proseguire una partita giocata in precedenza con gli stessi giocatori +
/guar <login> - mostra il garante dell\'utente con il login passato come argomento
/authreq - se si è autenticati permette di garantire per un utente fidato
/mesgtoadm - se si è autenticati permette di lasciare un messaggio all\'amministratore del sito
/listen <all or auth> - se si è autenticati permette leggere solo i messaggi degli altri autenticati (auth) o di tutti (all) @@ -184,7 +198,7 @@ Dopo che è iniziata una partita per uscirne dovete chiedere agli altri gi EN Descrizione
EN Questa è un\'implementazione della briscola in cinque, così come è spiegata su Wikipedia; in breve è la variante con l\'asta prima sulla carta e poi sui punti.

-EN Configurazione del browser.
+Configurazione del browser.
Occorre abilitare i cookies.

Uso del sito
@@ -201,8 +215,10 @@ Dopo che è iniziata una partita per uscirne dovete chiedere agli altri gi
Comandi della chat
/nick <nuovo_nickname> - cambio di nickname -
/tav <frase di invito> - invito per gli altri giocatori al tavolo dove si è seduti +
/tav <frase di invito> - invito per gli altri giocatori al tavolo dove si è seduti
/st <stato> - cambia l\'icona associata al tuo user; stato può valere: \\"normale\\", \\"fuori\\", \\"pausa\\", \\"cibo\\", \\"cane\\", \\"lavoro\\", \\"presente\\" oppure \\"sigaretta\\" +
/cont <id partita> - quando si è a un tavolo per garantiti, permette di proseguire una partita giocata in precedenza con gli stessi giocatori +
/guar <login> - mostra il garante dell\'utente con il login passato come argomento
/authreq - se si è autenticati permette di garantire per un utente fidato
/mesgtoadm - se si è autenticati permette di lasciare un messaggio all\'amministratore del sito
/listen <all or auth> - se si è autenticati permette leggere solo i messaggi degli altri autenticati (auth) o di tutti (all) @@ -210,12 +226,12 @@ Dopo che è iniziata una partita per uscirne dovete chiedere agli altri gi '); -// +// $G_room_passwdhowto = array( 'it' => '

Come registrarsi su Brisk

Attualmente ci sono due metodi per ottenere una password sul sito:

-
  • Facendosi garantire da un utente di Brisk che già possidede una password

    +
  • Facendosi garantire da un utente di Brisk che sia certificato.

  • Auto-garantendosi utilizzando uno dei seguenti sistemi di identificazione digitale:

  • Carta Regionale dei Servizi della Lombardia (la tessera sanitaria) @@ -229,13 +245,12 @@ Attualmente ci sono due metodi per ottenere una password sul sito:

  • il lettore di smart-card per collegare la carta al PC (acquistabile di solito presso le edicole)

    • -Per effettuare la registrazione collegarsi al sito:

    -
    -
    https://brisk.mine.nu -
    -

    +Per effettuare la registrazione collegarsi al sito: https://brisk.mine.nu +
    Se sei in possesso di una carta che permette l\'identificazione via internet che non è nell\'elenco qui sopra -fai una segnalazione. +fai una segnalazione.

    +Le regole per ottenere la certificazione sono in via di definizione, l\' unica accettata è la conoscenza +diretta dell\' utente da parte dell\' amministratore.
    • @@ -257,13 +272,13 @@ EN Attualmente ci sono due metodi per ottenere una password sul sito:

  • il lettore di smart-card per collegare la carta al PC (acquistabile di solito presso le edicole)
    -Per effettuare la registrazione collegarsi al sito:

    -
    -
    https://brisk.mine.nu -
    -

    +Per effettuare la registrazione collegarsi al sito: https://brisk.mine.nu +
    Se sei in possesso di una carta che permette l\'identificazione via internet che non è nell\'elenco qui sopra -fai una segnalazione. +fai una segnalazione.

    +Le regole per ottenere la certificazione sono in via di definizione, l\' unica accettata è la conoscenza +diretta dell\' utente da parte dell\' amministratore. + @@ -288,6 +303,147 @@ Copyright 2006-2012 Matteo Nasta
    version '.$G_brisk_version.'

    Copyright 2006-2012     Matteo Nastasi (aka mop)

    '); + +$G_PG_vow = array("a", "e", "i", "o", "u", "y"); +$G_PG_vow_n = 6; +$G_PG_cons = array( + "b", "bb", "bc", "bd", "bf", "bg", "bk", "bl", "bm", "bn", "bp", "br", "bs", "bt", "bv", "bw", "bz", + "c", "cb", "cc", "cd", "cf", "cg", "ck", "cl", "cm", "cn", "cp", "cq", "cr", "cs", "ct", "cv", "cw", "cx", "cz", + "d", "db", "dc", "dd", "df", "dg", "dk", "dl", "dm", "dn", "dp", "dr", "ds", "dt", "dv", "dw", "dx", "dz", + "f", "fb", "fc", "fd", "ff", "fg", "fk", "fl", "fm", "fn", "fp", "fr", "fs", "ft", "fv", "fw", "fx", "fz", + "g", "gb", "gc", "gd", "gf", "gg", "gk", "gl", "gm", "gn", "gp", "gr", "gs", "gt", "gv", "gw", "gx", "gz", + "j", "jb", "jc", "jd", "jf", "jg", "jk", "jl", "jm", "jn", "jp", "jq", "jr", "js", "jt", "jv", "jw", "jx", "jz", + "k", "kb", "kc", "kd", "kf", "kg", "kk", "kl", "km", "kn", "kp", "kr", "ks", "kt", "kv", "kw", "kx", "kz", + "l", "lb", "lc", "ld", "lf", "lg", "lk", "ll", "lm", "ln", "lp", "lr", "ls", "lt", "lv", "lw", "lx", "lz", + "m", "mb", "mc", "md", "mf", "mg", "mk", "ml", "mm", "mn", "mp", "mr", "ms", "mt", "mv", "mw", "mx", "mz", + "n", "nb", "nc", "nd", "nf", "ng", "nk", "nl", "nm", "nn", "np", "nr", "ns", "nt", "nv", "nw", "nx", "nz", + "p", "pb", "pc", "pd", "pf", "pg", "pk", "pl", "pm", "pn", "pp", "pr", "ps", "pt", "pv", "pw", "px", "pz", + "q", "qb", "qc", "qd", "qf", "qg", "qk", "ql", "qm", "qn", "qp", "qq", "qr", "qs", "qt", "qv", "qw", "qx", "qz", + "r", "rb", "rc", "rd", "rf", "rg", "rk", "rl", "rm", "rn", "rp", "rr", "rs", "rt", "rv", "rw", "rx", "rz", + "s", "sb", "sc", "sd", "sf", "sg", "sk", "sl", "sm", "sn", "sp", "sq", "sr", "ss", "st", "sv", "sw", "sx", "sz", + "t", "tb", "tc", "td", "tf", "tg", "tk", "tl", "tm", "tn", "tp", "tr", "ts", "tt", "tv", "tw", "tx", "tz", + "v", "vb", "vc", "vd", "vf", "vg", "vk", "vl", "vm", "vn", "vp", "vr", "vs", "vt", "vv", "vw", "vx", "vz", + "w", "wb", "wc", "wd", "wf", "wg", "wk", "wl", "wm", "wn", "wp", "wr", "ws", "wt", "wv", "ww", "wx", "wz", + "x", "xb", "xc", "xd", "xf", "xg", "xk", "xl", "xm", "xn", "xp", "xr", "xs", "xt", "xv", "xw", "xx", "xz", + "z", "zb", "zc", "zd", "zf", "zg", "zk", "zl", "zm", "zn", "zp", "zr", "zs", "zt", "zv", "zw", "zx", "zz", + ); +// $G_PG_cons_n = count($G_PG_cons); +// printf("N CONS: %d\n", $G_PG_cons_n); +$G_PG_cons_n = 345; + /* printf("%d %d\n", count($voc), count($cons)); */ + /* for ($i = 0 ; $i < 26 ; $i++) { */ + /* if (array_search(chr(ord('a') + $i), $voc) !== FALSE || $i == 7) */ + /* continue; */ + /* printf(' "%s", ', chr(ord('a') + $i)); */ + /* for ($e = 0 ; $e < 26 ; $e++) { */ + /* if (array_search(chr(ord('a') + $e), $voc) !== FALSE || $e == 7) */ + /* continue; */ + /* printf('"%s%s", ', chr(ord('a') + $i), chr(ord('a') + $e)); */ + /* } */ + /* printf("\n"); */ + /* } */ + +function nickserv_msg($dt, $msg) { + return sprintf('chatt_sub("%s",[0x040003,"%s"],"%s");', $dt, NICKSERV, $msg); +} + +function passwd_gen($seed = NULL) +{ + GLOBAL $G_PG_vow, $G_PG_vow_n, $G_PG_cons, $G_PG_cons_n; + + $pw = ""; + + if ($seed != NULL) + mt_srand($seed); + else + mt_srand(); + + for ($sil = 0 ; $sil < 7 ; $sil++) { + if (($sil % 2) == 0) { + // vowels + for ($n = 0 ; $n < mt_rand(1,2) ; $n++) { + if ($n == 0) { + $old = mt_rand(0, $G_PG_vow_n-1); + $pw .= $G_PG_vow[$old]; + } + else { + $new = mt_rand(0, $G_PG_vow_n-1); + if ($new == $old) + $new = ($new + mt_rand(0, $G_PG_vow_n-2)) % $G_PG_vow_n; + $pw .= $G_PG_vow[$new]; + } + } + } + else { + // consonants + $pw .= $G_PG_cons[mt_rand(0, $G_PG_cons_n-1)]; + } + } + + return $pw; +} + +function cmd_return($val, $desc) +{ + return array('val' => $val, 'desc' => $desc); +} + +function cmd_serialize($attrs) +{ + $ret = ""; + + $sep = ""; + foreach ($attrs as $key => $value) { + $ret .= $sep . $key . '=' . urlencode($value); + $sep = "&"; + } + return $ret; +} + +function cmd_deserialize($cmd) +{ + $ret = array(); + $a = explode('&', $cmd); + $i = 0; + while ($i < count($a)) { + $b = split('=', $a[$i]); + $ret[urldecode($b[0])] = urldecode($b[1]); + $i++; + } + + return $ret; +} + +// return values +// -1 v1 < v2 +// 0 equal +// 1 v1 > v2 +function versions_cmp($v1, $v2) +{ + // printf("V1: [%s]\nV2: [%s]\n", $v1, $v2); + if ($v1 == $v2) + return 0; + + $v1_ar = split('\.', $v1); + $v2_ar = split('\.', $v2); + + $v2_ct = count($v2_ar); + + for ($i = 0 ; $i < count($v1_ar) ; $i++) { + if (($v2_ct - 1) < $i) { + break; + } + // printf("here [%s] [%s]\n", $v1_ar[$i], $v2_ar[$i]); + if ($v1_ar[$i] != $v2_ar[$i]) { + if (strval($v1_ar[$i]) < strval($v2_ar[$i])) + return -1; + else + return 1; + } + } + return 0; +} + function addrtoipv4($addr) { $ipv4addr_arr = explode(':' , $addr); @@ -320,7 +476,7 @@ function file_lock($fname, $is_exclusive) if (($res = @fopen($fname, "r+")) == FALSE) { return (FALSE); } - + if (flock($res, ($is_exclusive ? LOCK_EX : LOCK_SH)) == FALSE) { fclose($res); return (FALSE); @@ -352,21 +508,20 @@ $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); + return htmlentities($s, ENT_COMPAT, "UTF-8"); } function esclfhtml($s) { - return str_replace("\n", "
    \n", htmlentities($s)); + return str_replace(" ", " ", str_replace("\n", "
    ", htmlspecialchars($s))); } - function langtolng($lang) { GLOBAL $G_lang; @@ -427,29 +582,61 @@ function xcapemesg($s) } +class IPClass { + var $addr; + var $mask; + + function IPClass($ipset) + { + //split + $elem = split("/", $ipset, 2); + $addr = $elem[0]; + $mask = (int)$elem[1]; + + //convert mask + + $this->mask = ((1<<($mask))-1) << (32 - $mask); + $this->addr = ip2long($addr) & $this->mask; + + fprintf(STDERR, "New ipclass: %x (%x)\n", $this->addr, $this->mask); + } + + function match($ip) + { + fprintf(STDERR, "IP: %x, ADDR: %x, MASK: %x -> (%d)\n", + $ip, $this->addr, $this->mask, ((ip2long($ip) & $this->mask) == $this->addr)); + return (($ip & $this->mask) == $this->addr); + } +} + class Vect { function Vect($a) { $this->el = $a; } - + function getbyid($idx) { return ($this->el[$idx]); } - + function setbyid($idx, $v) { $this->el[$idx] = $v; } } +define('TABLE_AUTH_TY_PUBL', 0); +define('TABLE_AUTH_TY_AUTH', 1); +define('TABLE_AUTH_TY_CERT', 2); + + class Table { var $idx; var $player; var $player_n; - var $auth_only; // se tavolo riservato o libero + var $auth_type; // required authorization to sit down var $wag_own; var $wag_com; @@ -460,11 +647,11 @@ class Table { var $wakeup_time; - function Table() + function Table() { } - - function create($idx) + + function create($idx) { if (($thiz = new Table()) == FALSE) return (FALSE); @@ -472,7 +659,13 @@ class Table { $thiz->idx = $idx; $thiz->player = array(); $thiz->player_n = 0; - $thiz->auth_only = FALSE; + + if ($idx < TABLES_CERT_N) + $thiz->auth_type = TABLE_AUTH_TY_CERT; + else if ($idx < TABLES_AUTH_N) + $thiz->auth_type = TABLE_AUTH_TY_AUTH; + else + $thiz->auth_type = TABLE_AUTH_TY_PUBL; $thiz->wag_own = -1; $thiz->wag_com = ""; @@ -480,7 +673,7 @@ class Table { $thiz->table_token = ""; $thiz->table_start = 0; - + $thiz->wakeup_time = 0; return ($thiz); @@ -495,8 +688,8 @@ class Table { $this->player_n = $from->player_n; log_main("PLAYER_N - parent::copy.".$this->player_n); - - $this->auth_only = $from->auth_only; + + $this->auth_type = $from->auth_type; $this->wag_own = $from->wag_own; $this->wag_com = $from->wag_com; @@ -517,19 +710,19 @@ class Table { return ($thiz); } - + function spawn($from) { if (($thiz = new Table()) == FALSE) return (FALSE); - + $thiz->idx = $from->idx; $thiz->player = array(); for ($i = 0 ; $i < $from->player_n ; $i++) $thiz->player[$i] = $i; $thiz->player_n = $from->player_n; - $thiz->auth_only = $from->auth_only; + $thiz->auth_type = $from->auth_type; $thiz->wag_own = $from->wag_own; $thiz->wag_com = $from->wag_com; @@ -576,22 +769,22 @@ class Table { { $this->player[$this->player_n] = $idx; $this->player_n++; - + return ($this->player_n - 1); } - - function user_rem($room, $user) + + function user_rem($brisk, $user) { $tabpos = $user->table_pos; - + /* verifico la consistenza dei dati */ - if ($room->user[$this->player[$tabpos]] == $user) { - + if ($brisk->user[$this->player[$tabpos]] == $user) { + /* 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->table_pos = $i; + $this->player[$i] = $this->player[$i+1]; + $user_cur = $brisk->user[$this->player[$i]]; + $user_cur->table_pos = $i; } $this->player_n--; } @@ -600,12 +793,7 @@ class Table { } } - - - // $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)); - - // function act_content($isstanding, $sitted, $table, $cur_table, $allowed) + // Table->act_content - return 'id' of type of output required for table button function act_content($user) { $ret = ""; @@ -617,15 +805,23 @@ class Table { if ($isstanding) { if ($sitted < PLAYERS_N) { - if ($this->auth_only) { - if ($user->flags & USER_FLAG_AUTH) - $act = "sitreser"; - else - $act = 'reserved'; - } - else { - $act = 'sit'; - } + switch ($this->auth_type) { + case TABLE_AUTH_TY_CERT: + if ($user->is_cert()) + $act = "sitcert"; + else + $act = 'resercert'; + break; + case TABLE_AUTH_TY_AUTH: + if ($user->is_auth()) + $act = "sitreser"; + else + $act = 'reserved'; + break; + default: + $act = 'sit'; + break; + } } else { $act = 'none'; @@ -637,21 +833,160 @@ class Table { else $act = 'none'; } - + if ($act != '') $ret = sprintf('j_tab_act_cont(%d, \'%s\');', $table, $act); - + return ($ret); } } // end class Table +class Delay_Manager +{ + var $delta; + var $lastckeck; + var $triglevel; + function Delay_Manager($triglevel) + { + $this->triglevel = $triglevel; + $this->delta = array(); + $this->lastcheck = 0; + } + + function delta_get($curtime) + { + // clean too old delta items + for ($i = 0 ; $i < count($this->delta) ; $i++) { + if ($this->delta[$i][0] < $curtime) { + array_splice($this->delta, $i, 1); + $i--; + } + } + + // add new delta items if delay exceeded $this->triglevel sec + if ($curtime > $this->lastcheck + $this->triglevel && $curtime < $this->lastcheck + 1200.0) { + $delta = $curtime - $this->lastcheck - $this->triglevel; + array_push($this->delta, array($curtime + $delta , $delta)); + // fprintf(STDERR, "DELTA: add new delta [%f] [%f] [%f]\n", $this->triglevel, $curtime + $delta, $delta); + } + + // extract the maximum valid delta + $delta_max = 0.0; + for ($i = 0 ; $i < count($this->delta) ; $i++) { + $delta_cur = $this->delta[$i][1]; + if ($delta_max < $delta_cur) + $delta_max = $delta_cur; + } + + // fprintf(STDERR, "DELTA: status %d, delta_max: %f\n", count($this->delta), $delta_max); + + return ($delta_max); + } + + function lastcheck_set($curtime) + { + $this->lastcheck = $curtime; + } +} + +class Client_prefs { + var $listen; + var $supp_comp; + + function Client_prefs() + { + } + + static function from_user($user) + { + $thiz = new Client_prefs(); + $thiz->user_load($user); + + return ($thiz); + } -class Room + static function from_json($json) + { + $thiz = new Client_prefs(); + if ($thiz->json_load($json) == FALSE) { + unset($thiz); + return (FALSE); + } + + return ($thiz); + } + + function user_load($user) + { + fprintf(STDERR, "QQ %s: %x\n", __FUNCTION__, $user->flags); + $this->listen = ($user->flags & USER_FLAG_MAP_AUTH) >> 2; + if ($user->rec != FALSE) { + $this->supp_comp = $user->rec->supp_comp_get(); + } + else { + $this->supp_comp = "000000000000"; + } + + fprintf(STDERR, "QQ %s: LISTEN: %d\n", __FUNCTION__, $this->listen); + } + + function json_load($json_s) + { + $ret = FALSE; + + do { + if (gettype($json_s) == "string") { + if (($json = json_decode($json_s)) == FALSE) + break; + } + else { + $json = $json_s; + } + if ($this->listen < 0 || $this->listen > 2) + break; + $this->listen = $json->listen; + + if (mb_strlen($json->supp_comp, "ASCII") != 12) + break; + + for ($i = 0, $idx = 0 ; $i < 12 ; $i++) { + if (($json->supp_comp[$i] >= '0' && $json->supp_comp[$i] <= '9') || + ($json->supp_comp[$i] >= 'a' && $json->supp_comp[$i] <= 'f')) + continue; + break; + } + if ($i < 12) + break; + $this->supp_comp = $json->supp_comp; + $ret = TRUE; + } while (FALSE); + + return ($ret); + } + + function store($user, $is_save) + { + // save into DB + fprintf(STDERR, "QQ %s::%s PRE: %x\n", __CLASS__, __FUNCTION__, + $user->flags & (~USER_FLAG_S_ALL & ~USER_FLAG_AUTH)); + $user->flags_set(($this->listen << 2), USER_FLAG_MAP_AUTH); + fprintf(STDERR, "QQ %s::%s %x\n", __CLASS__, __FUNCTION__, + $user->flags); + if ($user->is_supp_custom()) { + $user->rec->supp_comp_set($this->supp_comp); + } + if ($is_save) + $user->prefs_store(); + } +} + + +class Brisk { static $delta_t; - + var $crystal_filename; var $user; var $table; @@ -660,36 +995,173 @@ class Room var $step; // current step of the comm array var $garbage_timeout; var $shm_sz; - - function Room ($crystal_filename) { - $this->crystal_filename = $crystal_filename; - $this->user = array(); - $this->table = array(); - $this->match = array(); - + + var $ban_list; // ban list (authized allowed) + var $black_list; // black list (anti-dos, noone allowed) + + var $delay_mgr; + + var $cds; + + public static $sess_cur; + + function Brisk() + { + $this->cds = NULL; + } + + // constructor + static function create($crystal_filename, $ban_list, $black_list) { + if (($brisk_ser = @file_get_contents($crystal_filename)) != FALSE) { + if (($brisk = unserialize($brisk_ser)) != FALSE) { + fprintf(STDERR, "ROOM FROM FILE\n"); + rename($crystal_filename, $crystal_filename.".old"); + + $brisk->reload(TRUE, $ban_list, $black_list); + + return($brisk); + } + } + + fprintf(STDERR, "NEW ROOM\n"); + $thiz = new Brisk(); + + $thiz->crystal_filename = $crystal_filename; + $thiz->user = array(); + $thiz->table = array(); + $thiz->match = array(); + + $thiz->ban_list = NULL; + $thiz->black_list = NULL; + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $this->user[$i] = User::create($this, $i, "", ""); + $thiz->user[$i] = User::create($thiz, $i, "", ""); } - + for ($i = 0 ; $i < TABLES_N ; $i++) { - $this->table[$i] = Table::create($i); - /* OLD METHOD - if ($i < 12) { - $row = ( (((int)($i / 4)) % 2) == 0 ); - $col = ($i % 2 == 0); - $this->table[$i]->auth_only = (($row && $col) || (!$row && !$col)); - } - else { - $this->table[$i]->auth_only = FALSE; - } - */ - if ($i < TABLES_AUTH_N) - $this->table[$i]->auth_only = TRUE; - else - $this->table[$i]->auth_only = FALSE; + $thiz->table[$i] = Table::create($i); + } + $thiz->garbage_timeout = 0; + $thiz->shm_sz = SHM_DIMS_MIN; + + $thiz->delay_mgr = new Delay_Manager(1.5); + + static::$sess_cur = FALSE; + + $thiz->reload(TRUE, $ban_list, $black_list); + + return ($thiz); + } + + function ipclass_update($ip_out_s, $ip_in) + { + fprintf(STDERR, "N_IN: %d\n", count($ip_in)); + + $ip_out = &$this->$ip_out_s; + + // if already set clean the ban_list property + if ($ip_out) { + $ct = count($ip_out); + for ($i = 0 ; $i < $ct ; $i++) { + unset($ip_out[$i]); + } + unset($ip_out); + } + + $ip_out = array(); + for ($i = 0 ; $i < count($ip_in) ; $i++) { + $ip_out[$i] = new IPClass($ip_in[$i]); + } + } + + function reload($is_first, $ban_list, $black_list) + { + fprintf(STDERR, "RELOAD STUFF (%d)(%d)\n", count($ban_list), count($black_list)); + + $this->ipclass_update("ban_list", $ban_list); + $this->ipclass_update("black_list", $black_list); + + if (!$is_first) { + $this->banned_kickoff(); + $this->garbage_manager(TRUE); + } + } + + function banned_kickoff() + { + $is_ban = FALSE; + + for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { + $table_cur = $this->table[$table_idx]; + // if the table is complete and exists we check users IP + + if ($table_cur->player_n == PLAYERS_N) { + if (isset($this->match[$table_idx]) && + $table_cur->table_token == $bin5->table_token) { + log_main("PLAYERS == N TABLE ".$table_idx); + + $bin5 = $this->match[$table_idx]; + + $is_ban |= $bin5->banned_kickoff(); + } + } + } + + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + $user_cur = $this->user[$i]; + + if ($user_cur->sess == "") + continue; + + // check if the IP is blacklisted + if ($this->black_check($user_cur->ip)) { + $user_cur->lacc = 0; + $is_ban = TRUE; + continue; + } + + // if authorized not check if banlisted + if ($user_cur->is_auth()) { + continue; + } + + if ($this->ban_check($user_cur->ip)) { + $user_cur->lacc = 0; + $is_ban = TRUE; + } + } + + return $is_ban; + } + + function ban_check($ip_str) + { + $ip = ip2long($ip_str); + fprintf(STDERR, "Brisk::ban_check %d\n", count($this->ban_list)); + for ($i = 0 ; $i < count($this->ban_list) ; $i++) { + fprintf(STDERR, "ban_list[%d] = %x (%x)\n", $i, + $this->ban_list[$i]->addr, $this->ban_list[$i]->mask); + if ($this->ban_list[$i]->match($ip)) { + fprintf(STDERR, "\n\nMATCHA!\n\n"); + return(TRUE); + } + } + return (FALSE); + } + + function black_check($ip_str) + { + $ip = ip2long($ip_str); + fprintf(STDERR, "Brisk::black_check %d\n", count($this->black_list)); + for ($i = 0 ; $i < count($this->black_list) ; $i++) { + fprintf(STDERR, "black_list[%d] = %x (%x)\n", $i, + $this->black_list[$i]->addr, $this->black_list[$i]->mask); + if ($this->black_list[$i]->match($ip)) { + fprintf(STDERR, "\n\nMATCHA!\n\n"); + return(TRUE); + } } - $this->garbage_timeout = 0; - $this->shm_sz = SHM_DIMS_MIN; + return (FALSE); } function garbage_manager($force) @@ -701,91 +1173,93 @@ class Room log_rd2("garbage_manager START"); /* Garbage collector degli utenti in timeout */ - $curtime = time(); + $curtime = microtime(TRUE); + + $delta = $this->delay_mgr->delta_get($curtime); if (!$force && !($this->garbage_timeout < $curtime)) { + $this->delay_mgr->lastcheck_set($curtime); return ($ismod); } - + // Before all align times with table timeout for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { - $table_cur = $this->table[$table_idx]; - // if the table is complete and exists its shared mem we get the info about users lacc - - if ($table_cur->player_n == PLAYERS_N) { + $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); - - + + $no_recovery = FALSE; if (isset($this->match[$table_idx])) { - $bri = $this->match[$table_idx]; + $bin5 = $this->match[$table_idx]; - 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); + if ($table_cur->table_token != $bin5->table_token) { + log_main("ERROR: not matching table_token. Brisk: ".$table_cur->table_token." Table: ".$bin5->table_token); + log_main("ERROR: not matching table_start. Brisk: ".$table_cur->table_start." Table: ".$bin5->table_start); $no_recovery = TRUE; - $bri = FALSE; + $bin5 = FALSE; } - - if ($bri != FALSE) { + if ($bin5 != FALSE) { // // SPAWN: JOIN // log_main("garbage_manager: bri loaded successfully."); - $bri->garbage_manager(TRUE); - - $bri_table = $bri->table[0]; - + $bin5->garbage_manager(TRUE); + + $bin5_table = $bin5->table[0]; + // is the end of the table - - if ($bri->the_end == TRUE) { + + if ($bin5->the_end == TRUE) { /* * DESTROY OF FINISHED TABLE && MOVE PLAYER TO ROOM AGAIN */ log_main("garbage_manager: INSIDE THE END."); - + $plist = "$table_cur->table_token|$table_cur->idx|$table_cur->player_n"; for ($i = 0 ; $i < $table_cur->player_n ; $i++) { $plist .= '|'.$this->user[$table_cur->player[$i]]->sess; } - - for ($i = 0 ; $i < $bri_table->player_n ; $i++) { + + for ($i = 0 ; $i < $bin5_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->subst = $bri_user->subst; - $user_cur->step = $bri_user->step; - $user_cur->lacc = $bri_user->lacc; - $user_cur->laccwr = $bri_user->lacc; - $user_cur->bantime = $bri_user->bantime; + $bin5_user = $bin5->user[$i]; + + $user_cur->subst = $bin5_user->subst; + $user_cur->step = $bin5_user->step; + $user_cur->lacc = $bin5_user->lacc; + $user_cur->laccwr = $bin5_user->lacc; + $user_cur->bantime = $bin5_user->bantime; } - + log_legal($curtime, $user_cur->ip, $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; - + $this->match_del($table_idx); } else { log_main("gm:: save_data"); - - for ($i = 0 ; $i < $bri_table->player_n ; $i++) { - $this->user[$table_cur->player[$i]]->lacc = $bri->user[$i]->lacc; + + for ($i = 0 ; $i < $bin5_table->player_n ; $i++) { + $this->user[$table_cur->player[$i]]->lacc = $bin5->user[$i]->lacc; } } - } // if ($bri == FALSE + } // if ($bin5 == 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->subst = "shutdowner"; $user_cur->step_inc(); - + $ret = sprintf('stat = "%s"; subst = "%s";', $user_cur->stat, $user_cur->subst); $ret .= "gst.st = ".($user_cur->step+1)."; "; // MLANG
    I dati del tavolo n° ".$user_cur->table." sono inconsistenti, verranno resettati.

    Torni in piedi.

    @@ -794,39 +1268,39 @@ class Room $user_cur->comm[$user_cur->step % COMM_N] = $ret; $user_cur->step_inc(); } - + $plist = "$table_cur->table_token|$user_cur->table|$table_cur->player_n"; for ($i = 0 ; $i < $table_cur->player_n ; $i++) { $plist .= '|'.$this->user[$table_cur->player[$i]]->sess; } log_legal($curtime, $user_cur->ip, $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 = ""; } } } // if ($table_cur->player_n == PLAYERS_N) { } // for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { - + log_rd2("out new loop."); - + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $user_cur = $this->user[$i]; - - log_rd2("User: ".$user_cur->name." stat: ".$user_cur->stat." subst: ".$user_cur->subst); - - if ($user_cur->sess == "") + $user_cur = $this->user[$i]; + + log_rd2("User: ".$user_cur->name." stat: ".$user_cur->stat." subst: ".$user_cur->subst); + + if ($user_cur->sess == "") continue; - - if ($user_cur->lacc + EXPIRE_TIME_RD < $curtime) { + + if ($user_cur->lacc + EXPIRE_TIME_RD < ($curtime - $delta)) { // Auto logout dell'utente - log_rd2("AUTO LOGOUT.".($user_cur->lacc + EXPIRE_TIME_RD)." curtime ".$curtime); - + log_rd2("AUTO LOGOUT.".($user_cur->lacc + EXPIRE_TIME_RD)." curtime - delta ".($curtime - $delta)); + if ($user_cur->stat == 'table' || $user_cur->stat == 'room') { log_auth($user_cur->sess, "Autologout session."); - + $user_cur->reset(); - + log_rd2("AUTO LOGOUT."); if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table') $this->room_wakeup($user_cur); @@ -835,9 +1309,9 @@ class Room else log_rd2("LOGOUT FROM WHAT ???"); } - } + } - if ($user_cur->laccwr + EXPIRE_TIME_SMAMMA < $curtime) { // lo rimettiamo in piedi + if ($user_cur->laccwr + EXPIRE_TIME_SMAMMA < ($curtime - $delta)) { // lo rimettiamo in piedi if ($user_cur->stat == 'room' && $user_cur->subst == 'sitdown') { $this->room_wakeup($user_cur); $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; "; @@ -845,13 +1319,14 @@ class Room $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(); } - } + } } log_rd2("GARBAGE UPDATED!"); - + $this->garbage_timeout = $curtime + GARBAGE_TIMEOUT; $ismod = TRUE; + $this->delay_mgr->lastcheck_set($curtime); return ($ismod); } @@ -859,17 +1334,22 @@ class Room { GLOBAL $G_lang, $mlang_brisk; log_main("show_room: username: ".$user->name); - + $ret = sprintf('gst.st = %d; ', $user_step); - 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, \'\' ); '; + $prefs = Client_prefs::from_user($user); + $ret .= sprintf('prefs_load(\'%s\', false, false);', json_encode($prefs)); + + if(false) { + 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, \'\' ); '; + } } if ($user->subst == 'standup') @@ -878,7 +1358,7 @@ class Room $ret .= "tra.hide(); "; $ret .= sprintf('stat = "%s";', $user->stat); - + $ret .= root_welcome($user); if ($user->flags & USER_FLAG_DBFAILED) { $ret .= "gst.st = ".($user->step+1)."; "; @@ -891,12 +1371,11 @@ class Room 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 != -1) + 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 + else $ret .= sprintf('tra.rem(%d); ', $i); } $ret .= $this->standup_content($user); @@ -904,7 +1383,7 @@ class Room return ($ret); } - + function room_wakeup($user) { @@ -920,20 +1399,20 @@ 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]]; - log_main("PREIMPOST: INLOOP name: ".$user_cur->name); - - if ($user->idx_get() != $table->player[$i]) { - $user_cur->stat_set("room"); - $user_cur->subst = "sitdown"; - $user_cur->laccwr = $curtime; - } - else if ($user->sess != "") { - $user_cur->stat_set("room"); - $user_cur->subst = "standup"; - $user_cur->laccwr = $curtime; - $user_cur->table = -1; - } + $user_cur = $this->user[$table->player[$i]]; + log_main("PREIMPOST: INLOOP name: ".$user_cur->name); + + if ($user->idx_get() != $table->player[$i]) { + $user_cur->stat_set("room"); + $user_cur->subst = "sitdown"; + $user_cur->laccwr = $curtime; + } + else if ($user->sess != "") { + $user_cur->stat_set("room"); + $user_cur->subst = "standup"; + $user_cur->laccwr = $curtime; + $user_cur->table = -1; + } } } else { @@ -941,13 +1420,13 @@ class Room $user->subst = "standup"; $user->laccwr = $curtime; } - + $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); @@ -955,42 +1434,38 @@ class Room for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; if ($user_cur->sess == '' || $user_cur->stat != 'room') - continue; - + continue; + // 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->idx_get() == $i)) { - $ret .= 'gst.st_loc++; xstm.stop(); 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"); + $ret .= 'gst.st_loc++; xstm.stop(); 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"); } else if ($user_cur->stat == "room") { - log_main("DOCUMENT.index.php: from table"); - - $ret .= $this->table_content($user_cur, $table_idx); - $ret .= $this->standup_content($user_cur); - - // $ret .= table_act_content(FALSE, 0, $table_idx, $user->table, FALSE); - $ret .= $table->act_content($user); - - if ($user->idx_get() == $i) { - // set the new status - $ret .= 'subst = "standup"; tra.show(); '; - // clean the action buttons in other tables - for ($e = 0 ; $e < TABLES_N ; $e++) { - if ($this->table[$e]->player_n < PLAYERS_N) { - // $ret .= table_act_content(TRUE, 0, $e, $user->table, - // ($this->table[$e]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH)); + log_main("DOCUMENT.index.php: from table"); + + $ret .= $this->table_content($user_cur, $table_idx); + $ret .= $this->standup_content($user_cur); + + // $ret .= table_act_content(FALSE, 0, $table_idx, $user->table, FALSE); + $ret .= $table->act_content($user); + + if ($user->idx_get() == $i) { + // set the new status + $ret .= 'subst = "standup"; tra.show(); '; + // clean the action buttons in other tables + for ($e = 0 ; $e < TABLES_N ; $e++) { + if ($this->table[$e]->player_n < PLAYERS_N) { $ret .= $this->table[$e]->act_content($user); } - } - } - else { - // $ret .= table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table, - // ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH)); + } + } + else { $ret .= $table->act_content($user_cur); - } + } } log_wr("ROOM_WAKEUP: ".$ret); $user_cur->comm[$user_cur->step % COMM_N] = $ret; @@ -1002,7 +1477,7 @@ class Room { $table_idx = $user->table; $table = $this->table[$table_idx]; - + log_main("JOIN_WAKEUP: begin function table:".$table_idx." stat: ".$user->stat." subst: ".$user->subst); $curtime = time(); @@ -1011,32 +1486,32 @@ class Room $user_tab = array(); $user_tab_n = 0; 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]]; log_main("PREIMPOST INLOOP name: ".$user_cur->name); if ($user_cur->sess != "") { - if ($update_lacc == TRUE) { - $user_cur->laccwr = $curtime; - } - log_main("cur: ".$user_cur->name." subst: ".$user_cur->subst); - if ($user_cur->subst == "shutdowned") { - $user_cur->stat_set("room"); - $user_cur->subst = "sitdown"; - } - else if ($user_cur->subst == "shutdowner") { - $user_cur->stat_set("room"); - $user_cur->subst = "standup"; - $user_cur->table = -1; - $user_wup[$user_wup_n++] = $user_cur; - + if ($update_lacc == TRUE) { + $user_cur->laccwr = $curtime; + } + log_main("cur: ".$user_cur->name." subst: ".$user_cur->subst); + if ($user_cur->subst == "shutdowned") { + $user_cur->stat_set("room"); + $user_cur->subst = "sitdown"; + } + else if ($user_cur->subst == "shutdowner") { + $user_cur->stat_set("room"); + $user_cur->subst = "standup"; + $user_cur->table = -1; + $user_wup[$user_wup_n++] = $user_cur; + $remove_wagon = FALSE; if($table->wag_own == $table->player[$i]) { $remove_wagon = TRUE; $table->wag_reset($curtime); } - } - $user_tab[$user_tab_n++] = $table->player[$i]; + } + $user_tab[$user_tab_n++] = $table->player[$i]; } } @@ -1049,8 +1524,8 @@ class Room log_main("START LOOP"); $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("name: ".$user_cur->name."skip subst: ".$user_cur->subst); + continue; } log_main("___"); @@ -1058,45 +1533,42 @@ class Room $ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : ""); if ($user_cur->stat == "room") { - log_main("DOCUMENT.index.php from table"); + log_main("DOCUMENT.index.php from table"); - $ret .= $this->table_content($user_cur, $table_idx); - $ret .= $this->standup_content($user_cur); - - // $ret .= table_act_content(FALSE, 0, $table_idx, $user_cur->table, - // ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH)); + $ret .= $this->table_content($user_cur, $table_idx); + $ret .= $this->standup_content($user_cur); + $ret .= $table->act_content($user_cur); - for ($tab_idx = 0 ; $tab_idx < $user_tab_n ; $tab_idx++) - if ($user_tab[$tab_idx] == $i) + for ($tab_idx = 0 ; $tab_idx < $user_tab_n ; $tab_idx++) + 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) { - log_main("PRE show_room username: ".$user_cur->name." STEP: ".$user_cur->step); + // for users that wakeup the room will be reconstructed by index_rd.php + if ($tab_idx < $user_tab_n) { + log_main("PRE show_room username: ".$user_cur->name." STEP: ".$user_cur->step); // ARRAY_POP DISABLED -// if ($trans_delta == 0) -// while (array_pop($user_cur->comm) != NULL); - - $user_cur->trans_step = $user_cur->step + 1 + $trans_delta; - $user_cur->comm[$user_cur->step % COMM_N] = ""; - $user_cur->step_inc(); - $user_cur->comm[$user_cur->step % COMM_N] = $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); - - continue; - } - log_main("JOIN_WAKEUP wup_idx ".$wup_idx." wup_n ".$user_wup_n); - - log_main("JOIN_WAKEUP more"); - // $ret .= table_act_content(($user_cur->subst == 'standup'), $table->player_n, $table_idx, $user_cur->table, - // ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH)); +// if ($trans_delta == 0) +// while (array_pop($user_cur->comm) != NULL); + + $user_cur->trans_step = $user_cur->step + 1 + $trans_delta; + $user_cur->comm[$user_cur->step % COMM_N] = ""; + $user_cur->step_inc(); + $user_cur->comm[$user_cur->step % COMM_N] = $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); + + continue; + } + log_main("JOIN_WAKEUP wup_idx ".$wup_idx." wup_n ".$user_wup_n); + + log_main("JOIN_WAKEUP more"); + $ret .= $table->act_content($user_cur); - log_main("JOIN_WAKEUP end more"); + log_main("JOIN_WAKEUP end more"); } log_wr("ROOM_JOIN_WAKEUP: ".$ret); $user_cur->comm[$user_cur->step % COMM_N] = $ret; @@ -1104,30 +1576,83 @@ class Room } } + function guarantee_show($user, $user_login, $dt) + { + GLOBAL $G_lang, $mlang_brisk, $G_base; + + $user_code = -1; + $ret = 0; + + do { + if ($user_login == "") { + $ret = 1; + break; + } + if (($bdb = BriskDB::create()) == FALSE) { + $ret = 2; + break; + } + if (($user_item = $bdb->getitem_bylogin($user_login, $user_code)) == FALSE) { + $ret = 3; + break; + } + if (($guar_item = $bdb->getitem_bycode($user_item->guar_code_get())) != FALSE) { + $guar_login = $guar_item->login_get(); + } + else { + $guar_login = ""; + } + $user_tos_vers = $user_item->tos_vers_get(); + + if (versions_cmp($user_tos_vers, "1.2") < 0) { + $mesg = nickserv_msg($dt, sprintf($mlang_brisk['tos_old'][$G_lang], xcape($user_login))); + } + else if ($guar_login == "") { + $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_nfd'][$G_lang], xcape($user_login))); + } + else if ($guar_login == $user_login) { + $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_self'][$G_lang], xcape($user_login))); + } + else { + $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_info'][$G_lang], + xcape($user_login), xcape($guar_login))); + } + } while (0); + + if ($ret > 0) { + $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_err'][$G_lang], $ret)); + } + + $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ".$mesg; + $user->step_inc(); + + return TRUE; + } + function room_outstandup($user) { $this->room_sitdown($user, -1); } - + function table_update($user) { log_main("table_update: pre - USER: ".$user->name); $table_idx = $user->table; - if ($table_idx > -1) + if ($table_idx > -1) $table = $this->table[$table_idx]; - + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $ret = ""; $user_cur = $this->user[$i]; if ($user_cur->sess == '' || $user_cur->stat != 'room') continue; - + $ret = "gst.st = ".($user_cur->step+1)."; "; if ($table_idx > -1) - $ret .= $this->table_content($user_cur, $table_idx); - + $ret .= $this->table_content($user_cur, $table_idx); + if ($user->idx_get() == $i) { $ret .= $user->myname_innerHTML(); } @@ -1140,61 +1665,59 @@ class Room function room_sitdown($user, $table_idx) { - log_main("room_sitdown ".($user == FALSE ? "USER: FALSE" : "USER: ".$user->name)); + log_main("room_sitdown ".($user == FALSE ? "USER: FALSE" : "USER: ".$user->name)); - $train_app = ""; + $train_app = ""; - if ($table_idx > -1 && $table_idx < TABLES_N) { - $table = $this->table[$table_idx]; + if ($table_idx > -1 && $table_idx < TABLES_N) { + $table = $this->table[$table_idx]; - // wagon shutdown - if ($table->wag_own != -1 && $table->player_n == PLAYERS_N) { - for ($i = 0 ; $i < TABLES_N ; $i++) { - if ($table->wag_own == $table->player[$i]) { - $train_app = sprintf("tra.rem(%d); ", $table_idx); - $table->wag_reset(time()); - break; - } - } + // wagon shutdown + if ($table->wag_own != -1 && $table->player_n == PLAYERS_N) { + for ($i = 0 ; $i < TABLES_N ; $i++) { + if ($table->wag_own == $table->player[$i]) { + $train_app = sprintf("tra.rem(%d); ", $table_idx); + $table->wag_reset(time()); + break; + } + } + } } - } - for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $ret = ""; - $user_cur = $this->user[$i]; - if ($user_cur->sess == '' || $user_cur->stat != 'room') - continue; - - $ret = "gst.st = ".($user_cur->step+1)."; ".$train_app; - if ($table_idx > -1) - $ret .= $this->table_content($user_cur, $table_idx); - $ret .= $this->standup_content($user_cur); - - if ($user->idx_get() == $i) { - $ret .= 'subst = "sitdown"; tra.hide(); '; - // clean the action buttons in other tables - for ($e = 0 ; $e < TABLES_N ; $e++) { - // $ret .= table_act_content(FALSE, 0, $e, $user_cur->table, FALSE); - $ret .= $this->table[$e]->act_content($user_cur); - } - } - else if ($table_idx > -1) { - if ($table->player_n == PLAYERS_N) { - // $ret .= table_act_content(($user_cur->subst == 'standup'), PLAYERS_N, $table_idx, $user_cur->table, - /// ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH)); - $ret .= $table->act_content($user_cur); - } + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + $ret = ""; + $user_cur = $this->user[$i]; + if ($user_cur->sess == '' || $user_cur->stat != 'room') + continue; + + $ret = "gst.st = ".($user_cur->step+1)."; ".$train_app; + if ($table_idx > -1) + $ret .= $this->table_content($user_cur, $table_idx); + $ret .= $this->standup_content($user_cur); + + if ($user->idx_get() == $i) { + $ret .= 'subst = "sitdown"; tra.hide(); '; + // clean the action buttons in other tables + for ($e = 0 ; $e < TABLES_N ; $e++) { + $ret .= $this->table[$e]->act_content($user_cur); + } + } + else if ($table_idx > -1) { + if ($table->player_n == PLAYERS_N) { + + $ret .= $table->act_content($user_cur); + } + } + $user_cur->comm[$user_cur->step % COMM_N] = $ret; + $user_cur->step_inc(); } - $user_cur->comm[$user_cur->step % COMM_N] = $ret; - $user_cur->step_inc(); - } } function chatt_send($user, $mesg) { GLOBAL $G_base, $G_alarm_passwd, $mlang_brisk, $G_lang; $only_you = FALSE; - + // common settings $msg = mb_substr($mesg, 6, 128, "UTF-8"); $curtime = time(); @@ -1213,7 +1736,7 @@ class Room /* for old isolation management $is_ticker = FALSE; */ $update_room = FALSE; - if (strcmp($msg, "/tav") == 0 || + if (strcmp($msg, "/tav") == 0 || strncmp($msg, "/tav ", 5) == 0) { do { if ($user->stat != 'room' || $user->subst != 'sitdown') { @@ -1225,9 +1748,9 @@ class Room } $table = $this->table[$user->table]; - + if ($table->wag_own != -1) { - // MLANG
    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); @@ -1243,9 +1766,9 @@ class Room break; } - + $msg = substr($msg, 5); - + $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; @@ -1273,10 +1796,9 @@ class Room } /* MLANG: "Alarm %s inviato a %s." */ - $prestr = sprintf($mlang_brisk['alarret'][$G_lang], xcape(substr($msg, strlen($alarm_check))), + $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); + $to_user = nickserv_msg($dt, $prestr); $msg = sprintf("
    %s

    %s

    ", $dt.NICKSERV, xcape(substr($msg, strlen($alarm_check)))); @@ -1291,8 +1813,8 @@ class Room $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]); - + $to_user = nickserv_msg($dt, $mlang_brisk['listmust'][$G_lang]); + } else { $user->flags &= ~USER_FLAG_MAP_AUTH; @@ -1310,30 +1832,30 @@ class Room $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) { - 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"],"%s");', $dt, NICKSERV, $mlang_brisk['authmust'][$G_lang]); - } + else if (strcmp($msg, "/authreq") == 0) { + if ($user->is_cert()) { + $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 = nickserv_msg($dt, $mlang_brisk['authmust'][$G_lang]); + } } else if (strncmp($msg, "/mesgtoadm", 8) == 0) { - if ($user->flags & USER_FLAG_AUTH) { + if ($user->is_auth()) { $to_user = sprintf('mesgtoadmbox(500,300);'); } else { /* MLANG: "Per inviare un messaggio devi essere autenticato." */ - $to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_brisk['mesgmust'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['mesgmust'][$G_lang]); } } else if (strncmp($msg, "/nick ", 6) == 0) { @@ -1341,7 +1863,7 @@ class Room do { if (($name_new = validate_name(substr($msg, 6))) == FALSE) { - $to_user = sprintf('chatt_sub("%s", [2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['nickmust'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['nickmust'][$G_lang]); break; } @@ -1356,16 +1878,16 @@ class Room } if ($i < MAX_PLAYERS) { $prestr = sprintf($mlang_brisk['nickdupl'][$G_lang], xcape($name_new)); - $to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $prestr); + $to_user = nickserv_msg($dt, $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 ($user->is_auth()) { if (strcasecmp($user->name,$name_new) != 0) { if (( ($user->flags & USER_FLAG_MAP_AUTH) != USER_FLAG_ISOLAUTH) && - ($user->subst == 'standup' || - ($user->subst != 'standup' && $this->table[$user->table]->auth_only == FALSE) + ($user->subst == 'standup' || + ($user->subst != 'standup' && $this->table[$user->table]->auth_type == TABLE_AUTH_TY_PUBL) ) ) { $user->flags &= ~(USER_FLAG_AUTH | USER_FLAG_TY_ALL); // Remove auth if name changed @@ -1374,20 +1896,20 @@ class Room } } else { - $to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_brisk['authchan'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['authchan'][$G_lang]); break; } } } - $user->name = $name_new; // OK - nick changed + $user->name = $name_new; // OK - nick changed /* se nome gia' in uso, segnala cosa potrebbe capitare */ - if (($user->flags & USER_FLAG_AUTH) == 0) { + if ( ! $user->is_auth() ) { 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); + $to_user .= nickserv_msg($dt, $prestr); } } } @@ -1397,13 +1919,17 @@ class Room $update_room = TRUE; } while (0); } // nick chat command + else if (strncmp($msg, "/guar ", 6) == 0 || $msg == "/guar") { + $guar_user = substr($msg, 6); + $this->guarantee_show($user, $guar_user, $dt); + } else if (strncmp($msg, "/st ", 4) == 0) { log_main("chatt_send BEGIN"); do { $st_str = substr($msg, 4); - + if (strcasecmp($st_str, "normale") == 0) { $st = USER_FLAG_S_NORM; } @@ -1454,7 +1980,7 @@ class Room } else { /* MLANG: "Questo stato non esiste." */ - $to_user = sprintf('chatt_sub("%s", [2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['statunkn'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['statunkn'][$G_lang]); break; } @@ -1470,9 +1996,9 @@ class Room $is_normchat = TRUE; if (CHAT_ENABLED && $curtime < ($user->chat_ban + $user->chat_dlt)) { $only_you = TRUE; - $user->chat_dlt = $user->chat_dlt * 2; + $user->chat_dlt = $user->chat_dlt * 2; if ($user->chat_dlt > 120) - $user->chat_dlt = 120; + $user->chat_dlt = 120; } else if ($user->chat_lst == $msg) $only_you = TRUE; @@ -1487,18 +2013,18 @@ class Room } if ($only_you) { - $to_user = sprintf('chatt_sub("%s", [%d, "%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape("== chat ban ==")); + $to_user = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape("== chat ban ==")); } 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_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; } log_legal($curtime, $user->ip, $user, - ($user->stat == 'room' ? 'room' : 'table '.$user->table),$msg); - + ($user->stat == 'room' ? 'room' : 'table '.$user->table),$msg); + $user->chat_lst = "$msg"; $user->chattime[$user->chat_cur % CHAT_N] = $curtime; $user->chat_cur++; @@ -1526,13 +2052,13 @@ class Room continue; if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user->idx_get() == $i) continue; - + if ($is_normchat == TRUE) { // 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; - } + if ( ! $user->is_auth() ) { + continue; + } } } /* @@ -1544,30 +2070,30 @@ class Room } */ $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->comm[$user_cur->step % COMM_N] .= $to_room; $user_cur->step_inc(); } } - + if ($to_tabl) { // FIXME BRISK4: include for each kind of table 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++) { if (isset($this->match[$table_idx])) { - $bri = $this->match[$table_idx]; + $bin5 = $this->match[$table_idx]; - $bri_table = $bri->table[0]; - for ($i = 0 ; $i < $bri_table->player_n ; $i++) { + $bin5_table = $bin5->table[0]; + for ($i = 0 ; $i < $bin5_table->player_n ; $i++) { // stat must be "table" by definition - $bri_user = $bri->user[$i]; - - if ($target != "" && $bri_user->name != $target) + $bin5_user = $bin5->user[$i]; + + if ($target != "" && $bin5_user->name != $target) continue; log_main("writa: ".$user_mesg); - $bri_user->comm[$bri_user->step % COMM_N] = "gst.st = ".($bri_user->step+1)."; "; - $bri_user->comm[$bri_user->step % COMM_N] .= $to_tabl; - $bri_user->step_inc(); + $bin5_user->comm[$bin5_user->step % COMM_N] = "gst.st = ".($bin5_user->step+1)."; "; + $bin5_user->comm[$bin5_user->step % COMM_N] .= $to_tabl; + $bin5_user->step_inc(); } } // if (isset($this->match } // for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { @@ -1593,15 +2119,15 @@ class Room 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]; - return ($ret); - } + if (strcmp($sess, $this->user[$i]->sess) == 0) { + // find it + $idx = $i; + $ret = $this->user[$i]; + return ($ret); + } } log_main(sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF)); - // for ($i = 0 ; $i < MAX_PLAYERS ; $i++) + // for ($i = 0 ; $i < MAX_PLAYERS ; $i++) // log_main(sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess)); } else { @@ -1612,7 +2138,7 @@ class Room } /* - * function add_user(&$room, &$sess, &$idx, $name, $pass, $ip) + * function add_user(&$brisk, &$sess, &$idx, $name, $pass, $ip) * * RETURN VALUE: * if ($idx > -1 && ret == FALSE) => duplicated nick @@ -1644,7 +2170,7 @@ class Room } log_auth("XXX", sprintf("ARRIVA: [%s] pass:[%s]", $sess, ($pass == FALSE ? "FALSE" : $pass))); - if (validate_sess($sess) == FALSE) + if (validate_sess($sess) == FALSE) $sess = ""; /* if pass != FALSE verify the login with pass */ @@ -1656,7 +2182,7 @@ class Room 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(); } @@ -1676,17 +2202,17 @@ class Room for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { /* free user ? */ if (strcmp($sess, $this->user[$i]->sess) == 0) { - if ($idx == -1) - $idx = $i; + if ($idx == -1) + $idx = $i; } if ($idfree == -1 && strcmp($this->user[$i]->sess, "") == 0) { - $idfree = $i; + $idfree = $i; continue; // NOTE: CHECK IT !! } if (strcasecmp($this->user[$i]->name, $name_new) == 0) { if ($authenticate != FALSE) { $ghost = $i; - $ghost_auth = ($this->user[$i]->flags & USER_FLAG_AUTH); + $ghost_auth = $this->user[$i]->is_auth(); } else { $idx = $i; @@ -1709,24 +2235,24 @@ class Room $ghost_user->comm[$ghost_user->step % COMM_N] = ""; $ghost_user->step_inc(); if ($sess == "") { - $sess = uniqid(""); + $sess = uniqid(""); $ghost_user->sess = $sess; } else { $ghost_user->sess = $sess; } - + // If user at the table we need to update the table data too $table_idx = $ghost_user->table; if ($ghost_user->stat == "table" && $this->table[$table_idx]->player_n == PLAYERS_N) { require_once("${G_base}briskin5/Obj/briskin5.phh"); if (isset($this->match[$table_idx])) { - $bri = $this->match[$table_idx]; + $bin5 = $this->match[$table_idx]; - if ($bri->the_end != TRUE) { - $bri->user[$ghost_user->table_pos]->comm[$bri->user[$ghost_user->table_pos]->step % COMM_N] = ""; - $bri->user[$ghost_user->table_pos]->step_inc(); - $bri->user[$ghost_user->table_pos]->sess = $sess; + if ($bin5->the_end != TRUE) { + $bin5->user[$ghost_user->table_pos]->comm[$bin5->user[$ghost_user->table_pos]->step % COMM_N] = ""; + $bin5->user[$ghost_user->table_pos]->step_inc(); + $bin5->user[$ghost_user->table_pos]->sess = $sess; } } } @@ -1739,10 +2265,10 @@ class Room $curtime = time(); if ($sess == "") { $sess = uniqid(""); - $this->user[$idx]->sess = $sess; + $this->user[$idx]->sess = $sess; } else { - $this->user[$idx]->sess = $sess; + $this->user[$idx]->sess = $sess; } $this->user[$idx]->name = $name_new; // OK - add new user $this->user[$idx]->stat_set("room"); @@ -1754,31 +2280,38 @@ class Room $this->user[$idx]->bantime = 0; $this->user[$idx]->ip = $ip; + $this->user[$idx]->rec = $authenticate; $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 != FALSE) { - $this->user[$idx]->code = $authenticate->code_get(); - $this->user[$idx]->flags |= USER_FLAG_LISTAUTH; - - if (isset($cookie['CO_list'])) { - if (strcmp($cookie['CO_list'], "auth") == 0) { - $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH; - $this->user[$idx]->flags |= USER_FLAG_LISTAUTH; - } - if (strcmp($cookie['CO_list'], "isolation") == 0) { - $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH; - $this->user[$idx]->flags |= USER_FLAG_ISOLAUTH; + $this->user[$idx]->code = $authenticate->code_get(); + if (0 == 1) { + // all this part is included in the db server + $this->user[$idx]->flags |= USER_FLAG_LISTAUTH; + + if (isset($cookie['CO_list'])) { + fprintf(STDERR, "QQ: %s CO_list: [%s]\n", __FUNCTION__, $cookie['CO_list']); + if (strcmp($cookie['CO_list'], "auth") == 0) { + $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH; + $this->user[$idx]->flags |= USER_FLAG_LISTAUTH; + } + if (strcmp($cookie['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; + } + } } else { - $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH; + fprintf(STDERR, "QQ: CO_list not set flags: %x\n", __FUNCTION__, $this->user[$idx]->flags); } - } } - + fprintf(STDERR, "QQ %s: flag %x\n", __FUNCTION__, $this->user[$idx]->flags); if ($ghost > -1) { log_main("ghost: rename!"); $ghost_user = $this->user[$ghost]; @@ -1787,9 +2320,9 @@ class Room for ($sfx = 1 ; $sfx <= MAX_PLAYERS ; $sfx++) { $ghostname = 'ghost'.$sfx; for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - if (strcmp("", $this->user[$i]->sess) == 0) + if (strcmp("", $this->user[$i]->sess) == 0) continue; - + if (strcasecmp($this->user[$i]->name, $ghostname) == 0) { $ghostname = ''; break; @@ -1798,9 +2331,9 @@ class Room if ($ghostname != '') break; } - + $ghost_user->name = $ghostname; - + if ($ghost_user->stat == 'room' && $ghost_user->subst == 'standup') { $this->standup_update($ghost_user); } @@ -1824,264 +2357,96 @@ class Room 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]; + if ($this->cds->execute("tor_chk", $this, $real_idx, $sess, $ip) == FALSE) { + log_main("cds_execute failed"); + } + return ($ret); } return (FALSE); } - + function standup_update($user) { for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; if ($user_cur->sess == '') - continue; + continue; log_main("STANDUP START: ".$user_cur->stat); - + if ($user_cur->stat == 'room') { - $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".$this->standup_content($user_cur); - if ($user->idx_get() == $i) { + $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".$this->standup_content($user_cur); + if ($user->idx_get() == $i) { $user_cur->comm[$user_cur->step % COMM_N] .= $user->myname_innerHTML(); - } - log_main("FROM STANDUP: NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]); - - $user_cur->step_inc(); + } + log_main("FROM STANDUP: NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]); + + $user_cur->step_inc(); } } } - // Static functions - static function create($crystal_filename) - { - if (($room_ser = @file_get_contents($crystal_filename)) == FALSE || - ($room = unserialize($room_ser)) == FALSE) { - fprintf(STDERR, "NEW ROOM\n"); - $room = new Room($crystal_filename); - } - else { - fprintf(STDERR, "ROOM FROM FILE\n"); - } - - return $room; - } - - - function load_data() - { - GLOBAL $sess; - - do { - if (($tok = @ftok(FTOK_PATH."/main", "C")) == -1) { - log_main("ftok failed"); - break; - } - - if (($shm_sz = sharedmem_sz($tok)) == -1) { - log_main("shmop_open failed"); - } - - if ($shm_sz == -1) - $shm_sz = SHM_DIMS_MIN; - - if ($shm = shm_attach($tok, $shm_sz)) { - $room = @shm_get_var($shm, $tok); // CHECKED BELOW - - 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(); - - log_shme("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++) { - if (($room->user[$i] = User::load_data($i, FALSE)) == FALSE) { - log_crit("User::load_data failed"); - break; - } - } - if ($i < MAX_PLAYERS) { - break; - } - } - - // - // SHSPLIT: load users from the shared memory - // - return ($room); - } while (0); - - return (FALSE); - } - - - function save_data_orig($room) - { - GLOBAL $sess; - - $shm = FALSE; - - // var_dump($room); - - if (($tok = @ftok(FTOK_PATH."/main", "C")) == -1) - return (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) { - shm_detach($shm); - return (TRUE); - } - if (shm_remove($shm) === FALSE) { - log_only("REMOVE FALLITA"); - break; - } - shm_detach($shm); - $room->shm_sz += SHM_DIMS_DLT; - } - - if ($shm) - shm_detach($shm); - - return (FALSE); - } function dump_data() { - $room_ser = serialize($this); - $room_ser_len = mb_strlen($room_ser, "ASCII"); - if (file_put_contents($this->crystal_filename, $room_ser) == $room_ser_len) { + $brisk_ser = serialize($this); + $brisk_ser_len = mb_strlen($brisk_ser, "ASCII"); + if (file_put_contents($this->crystal_filename, $brisk_ser) == $brisk_ser_len) { return (TRUE); } - - return (FALSE); - } - - function save_data($room) - { - GLOBAL $sess; - - $ret = FALSE; - $shm = FALSE; - - if (($tok = @ftok(FTOK_PATH."/main", "C")) == -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) { - log_shme("Room::save_data"); - $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($is_exclusive) - { - if (($res = file_lock(FTOK_PATH."/main", $is_exclusive)) != FALSE) { - self::$delta_t = microtime(TRUE); - log_lock("LOCK room [".self::$delta_t."]"); - - return ($res); - } return (FALSE); } - - static function unlock_data($res) - { - GLOBAL $sess; - - log_lock("UNLOCK room [".(microtime(TRUE) - (self::$delta_t))."]"); - - file_unlock($res); - } - function standup_content($user) { $ret = ""; $content = ""; - + if ($user->stat != 'room') return; - + 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++; } - + // $content .= sprintf('', $ct); - + $content = ' j_stand_cont( [ '; + $user_cur_id = $user->idx_get(); 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[$i]->flags; - + + // sql record exists AND last donate > 2013-01-01 + if ($this->user[$i]->is_supp_custom()) { + $supp_comp_s = sprintf(', "%s"', $this->user[$i]->rec->supp_comp_get()); + } + else { + $supp_comp_s = ''; + } + if ($this->user[$i]->subst == "standup") { - if ($user->idx_get() == $i) { + if ($user_cur_id == $i) { $flags |= 1; } - - $content .= sprintf('%s[ %d, "%s" ]',($ct > 0 ? ', ' : ''), $flags, xcape($this->user[$i]->name)); + + $content .= sprintf('%s[ %d, "%s"%s ]',($ct > 0 ? ', ' : ''), $flags, + xcape($this->user[$i]->name), $supp_comp_s); $ct++; } } $content .= ' ]);'; - + return ($content); } - + function table_content($user, $table_idx) { $content = ""; @@ -2090,37 +2455,53 @@ class Room // // Si possono usare i dati nella classe table // - + $sess = $user->sess; $table = $this->table[$table_idx]; - + if ($user->stat != 'room') return; - + + $user_cur_id = $user->idx_get(); $content = "[ "; for ($i = 0 ; $i < $table->player_n ; $i++) { $user_cur = $this->user[$table->player[$i]]; - + $flags = $user_cur->flags; - - if ($user->idx_get() == $table->player[$i]) + + if ($user_cur_id == $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)); + if ($user_cur->is_supp_custom()) + $supp_comp_s = sprintf(', "%s"', $user_cur->rec->supp_comp_get()); + else + $supp_comp_s = ''; + + $content .= sprintf('%s[ %d, "%s"%s ]',($i == 0 ? '' : ', '), $flags, + xcape($user_cur->name), $supp_comp_s); } $content .= ' ]'; $ret .= sprintf('j_tab_cont(%d, %s);', $table_idx, $content); - + return ($ret); } function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie) { - printf("NEW_SOCKET (root): %d\n", intval($new_socket)); + GLOBAL $G_ban_list, $G_black_list; + + printf("NEW_SOCKET (root): %d PATH [%s]\n", intval($new_socket), $path); + $remote_addr = addrtoipv4($addr); + + fprintf(STDERR, "\n\n\n PRE_BLACK_CHECK \n\n\n"); + if ($this->black_check($remote_addr)) { + // TODO: waiting async 5 sec before close + fprintf(STDERR, "\n\n\n BLACK_CHECK \n\n\n"); + return (FALSE); + } $enc = get_encoding($header); if (isset($header['User-Agent'])) { @@ -2144,34 +2525,44 @@ class Room $content = ob_get_contents(); ob_end_clean(); - $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content); + // fprintf(STDERR, "\n\nCONTENT [%s]\n\n", $content); + $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content); return TRUE; break; case "index_wr.php": + // + // Enhance required: in the POST case, after the header you must get content + // from the socket, waiting if necessary + // + ob_start(); index_wr_main($this, $addr, $get, $post, $cookie); $content = ob_get_contents(); ob_end_clean(); - - $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content); + + $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content); return TRUE; break; - case "index_rd_ifra.php": + case "index_rd.php": + if (($transp = gpcs_var('transp', $get, $post, $cookie)) === FALSE) + $transp = "iframe"; + if ($transp == 'websocket') + $enc = 'plain'; + do { if (!isset($cookie['sess']) || (($user = $this->get_user($cookie['sess'], $idx)) == FALSE)) { - if (($transp = gpcs_var('transp', $get, $post, $cookie)) === FALSE) - $transp = "iframe"; - + $content = User::stream_fini($transp, $s_a_p->rndstr, TRUE); - $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content); + $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content); return TRUE; break; } + $this->sess_cur_set($user->sess); // close a previous opened index_read_ifra socket, if exists if (($prev = $user->rd_socket_get()) != NULL) { $s_a_p->socks_unset($user->rd_socket_get()); @@ -2181,11 +2572,10 @@ class Room } $content = ""; - $user->stream_init($s_a_p->rndstr, $enc, $header_out, $content, $get, $post, $cookie); - - $response = headers_render($header_out, -1).chunked_content($user->rd_zls_get(), $content); + $user->stream_init($s_a_p->rndstr, $enc, $header, $header_out, $content, $get, $post, $cookie); + $response = headers_render($header_out, -1).$user->chunked_content($content); $response_l = mb_strlen($response, "ASCII"); - + $wret = @fwrite($new_socket, $response, $response_l); if ($wret < $response_l) { printf("TROUBLES WITH FWRITE: %d\n", $wret); @@ -2195,17 +2585,30 @@ class Room $user->rd_cache_set(""); } fflush($new_socket); - - - $s_a_p->socks_set($new_socket, $user); + + + $s_a_p->socks_set($new_socket, $user, NULL); $user->rd_socket_set($new_socket); printf(" - qui ci siamo - "); return TRUE; } while (FALSE); - + return FALSE; break; - + case 'test.php': + if (!(BRISK_DEBUG & DBG_ENGI)) + return (FALSE); + fprintf(STDERR, "TEST.PHP running\n"); + if (isset($post['data'])) { + $content = $post['data']; + } + else { + $content = "NO DATA AVAILABLE"; + } + $header_out['Content-Type'] = 'text/plain'; + $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content); + return TRUE; + break; default: /* FAR TODO: move all into an array of registered sub-apps */ $subs = "briskin5/"; @@ -2233,15 +2636,23 @@ class Room function match_get($idx, $token) { if (isset($this->match[$idx])) { - if ( $token == NULL + if ( $token == NULL || $token == $this->match[$idx]->table_token) { return ($this->match[$idx]); } } return NULL; } + function sess_cur_set($sess) + { + static::$sess_cur = $sess; + } -} // end class Room + static function sess_cur_get() + { + return(static::$sess_cur); + } +} // end class Brisk function make_seed() { @@ -2257,12 +2668,12 @@ function btrace_line($ar) 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']) : ""), + $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); } @@ -2278,19 +2689,20 @@ function trace_ftok($id, $add) function log_mop($step, $log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LMOP) == 0) return; - + + $sess = Brisk::sess_cur_get(); 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 ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else @@ -2302,21 +2714,49 @@ function log_mop($step, $log) } +function log_cds($log) +{ + GLOBAL $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CDS) == 0) + return; + + $sess = Brisk::sess_cur_get(); + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CDS) == 0) + return; + + if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/cds.log", 'a')) != FALSE) { + fwrite($fp, sprintf("CDS: [%f] [%s] [%s]\n", gettimeofday(TRUE), $log, $btrace)); + fclose($fp); + } +} + + function log_only2($log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0) return; - + + $sess = Brisk::sess_cur_get(); 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 ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else @@ -2329,19 +2769,20 @@ function log_only2($log) function log_crit($log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CRIT) == 0) return; - + + $sess = Brisk::sess_cur_get(); 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 ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else @@ -2354,19 +2795,20 @@ function log_crit($log) function log_only($log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0) return; - + + $sess = Brisk::sess_cur_get(); 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 ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else @@ -2379,19 +2821,20 @@ function log_only($log) function log_main($log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0) return; - + + $sess = Brisk::sess_cur_get(); 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 ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else @@ -2404,23 +2847,24 @@ function log_main($log) function log_rd($log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0) return; - + + $sess = Brisk::sess_cur_get(); 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 ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else - $btrace = ""; + $btrace = ""; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); fclose($fp); @@ -2429,24 +2873,25 @@ function log_rd($log) function log_rd2($log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0) return; - + + $sess = Brisk::sess_cur_get(); 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 ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else $btrace = ""; - + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $log, $btrace)); fclose($fp); @@ -2455,20 +2900,21 @@ function log_rd2($log) function log_send($log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0) return; - + + $sess = Brisk::sess_cur_get(); 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 ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) + if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else $btrace = ""; @@ -2480,19 +2926,20 @@ function log_send($log) function log_lock($log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0) return; - + + $sess = Brisk::sess_cur_get(); 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 ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else @@ -2505,19 +2952,20 @@ function log_lock($log) function log_wr($log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0) return; - + + $sess = Brisk::sess_cur_get(); 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 ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else @@ -2530,19 +2978,20 @@ function log_wr($log) function log_load($log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0) return; - + + $sess = Brisk::sess_cur_get(); if (isset($sess) == FALSE) $ssess = "XXXX"; else $ssess = $sess; - + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0) return; - + if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else @@ -2559,10 +3008,10 @@ function log_auth($sess, $log) 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; - + if ((BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else @@ -2575,19 +3024,20 @@ function log_auth($sess, $log) function log_shme($log) { - GLOBAL $sess, $PHP_SELF; - + GLOBAL $PHP_SELF; + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SHME) == 0) return; - + + $sess = Brisk::sess_cur_get(); if (isset($sess) == FALSE) $ssess = "XXXX"; else $ssess = $sess; - + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SHME) == 0) return; - + if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) $btrace = btrace_line(debug_backtrace()); else @@ -2607,7 +3057,7 @@ function log_legal($curtime, $addr, $user, $where, $mesg) if (($fp = @fopen(LEGAL_PATH."/legal.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->is_auth() ? 'A' : 'N'), $user->name, $addr, $where , $mesg)); fclose($fp); } @@ -2650,6 +3100,19 @@ function show_notify_ex($text, $tout, $butt, $w, $h, $is_opaque, $block_time) 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 show_notify_document($text, $tout, $butt_arr, $confirm_func, $confirm_func_args, $w, $h, $is_opaque, $block_time) +{ + log_main("SHOW_NOTIFY OPAQUE: ".$text); + + $butts = ""; + for ($i = 0 ; $i < count($butt_arr) ; $i++) { + $butts .= sprintf("%s'%s'", ($i == 0 ? "" : ","), $butt_arr[$i]); + } + + return sprintf('g_nd = new notify_document(gst, "%s", %d, [ %s ], %s, %s, %d, %d, %s, %d);|', + escpush($text), $tout, $butts, ($confirm_func == NULL ? "null" : $confirm_func), (($confirm_func == NULL|| $confirm_func_args == NULL) ? "[]" : $confirm_func_args), $w, $h, ($is_opaque ? "true" : "false"), $block_time); +} + function root_welcome($user) { @@ -2658,24 +3121,24 @@ function root_welcome($user) $curtime = time(); $dt = date("H:i ", $curtime); - + 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])); + $ret .= nickserv_msg($dt, str_replace('"', '\"', $root_wellarr[$G_lang][$i])); return ($ret); } -function validate_sess($sess) +function validate_sess($sess) { - if (strlen($sess) == SESS_LEN) + if (strlen($sess) == SESS_LEN) return (TRUE); else return (FALSE); } -function validate_name($name) +function validate_name($name) { $name_new = str_replace(' ', '_', mb_substr(trim($name),0,12, "UTF-8")); @@ -2702,16 +3165,16 @@ function secstoword($secs) $mins = floor($secs / 60); $secs = $secs % 60; if ($G_lang == 'en') { - if ($mins > 0) + 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) + 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")); } @@ -2726,10 +3189,10 @@ function sharedmem_sz($tok) } $shm_sz = shmop_size($shm_id); shmop_close($shm_id); - + // log_main("shm_sz: ".$shm_sz." SHM_DIMS: ".SHM_DIMS); return ($shm_sz); -} +} class Warrant { static $delta_t; @@ -2739,17 +3202,17 @@ class Warrant { if (($res = file_lock(FTOK_PATH."/warrant", $is_exclusive)) != FALSE) { self::$delta_t = microtime(TRUE); log_lock("LOCK warrant [".self::$delta_t."]"); - + return ($res); } return (FALSE); } - + static function unlock_data($res) { - GLOBAL $sess; - + GLOBAL $sess; + log_lock("UNLOCK warrant [".(microtime(TRUE) - (self::$delta_t))."]"); file_unlock($res); @@ -2764,21 +3227,34 @@ class Poll { if (($res = file_lock(FTOK_PATH."/poll", $is_exclusive)) != FALSE) { self::$delta_t = microtime(TRUE); log_lock("LOCK poll [".self::$delta_t."]"); - + return ($res); } return (FALSE); } - + static function unlock_data($res) { - GLOBAL $sess; - + GLOBAL $sess; + log_lock("UNLOCK poll [".(microtime(TRUE) - (self::$delta_t))."]"); - + file_unlock($res); } } +function carousel_top() +{ + $what = rand(1,2); + if ($what == 1) { + $rn = rand(1, 3); + return (sprintf('il negozio virtuale di Brisk', $rn)); + } + else { + return (sprintf('il nuovo blog di Brisk')); + } +} + + ?>