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
@@ -203,6 +216,8 @@ Dopo che è iniziata una partita per uscirne dovete chiedere agli altri gi
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 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); @@ -358,15 +510,14 @@ function escinput($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,6 +578,33 @@ 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) { @@ -444,12 +622,17 @@ class Vect { } } +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; @@ -472,7 +655,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 = ""; @@ -496,7 +685,7 @@ class Table { 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; @@ -529,7 +718,7 @@ class Table { $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; @@ -580,17 +769,17 @@ class Table { 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 = $brisk->user[$this->player[$i]]; $user_cur->table_pos = $i; } $this->player_n--; @@ -600,12 +789,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 +801,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'; @@ -697,15 +889,97 @@ class Delay_Manager class Client_prefs { var $listen; + var $supp_comp; + + function Client_prefs() + { + } - function Client_prefs($listen) + static function from_user($user) { - $this->listen = $listen; + $thiz = new Client_prefs(); + $thiz->user_load($user); + + return ($thiz); + } + + 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 Room +class Brisk { static $delta_t; @@ -717,40 +991,171 @@ class Room var $step; // current step of the comm array var $garbage_timeout; var $shm_sz; - + + var $ban_list; // ban list (authized allowed) + var $black_list; // black list (anti-dos, noone allowed) + var $delay_mgr; - function Room ($crystal_filename) { - $this->crystal_filename = $crystal_filename; - $this->user = array(); - $this->table = array(); - $this->match = array(); - + public static $sess_cur; + + function Brisk() + { + } + + // 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($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; + + fprintf(STDERR, "PRE IPCLASS_UPDATE (%d, %d)\n", count($ban_list), count($black_list)); + $thiz->ipclass_update('ban_list', $ban_list); + $thiz->ipclass_update('black_list', $black_list); + fprintf(STDERR, "POST IPCLASS_UPDATE %d %d\n", count($thiz->ban_list), count($thiz->black_list)); + 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); } - $this->garbage_timeout = 0; - $this->shm_sz = SHM_DIMS_MIN; + $thiz->garbage_timeout = 0; + $thiz->shm_sz = SHM_DIMS_MIN; + + $thiz->delay_mgr = new Delay_Manager(1.5); - $this->delay_mgr = new Delay_Manager(1.5); + static::$sess_cur = FALSE; + + 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($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); + + $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); + } + } + return (FALSE); } function garbage_manager($force) @@ -782,27 +1187,27 @@ class Room $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); + $bin5->garbage_manager(TRUE); - $bri_table = $bri->table[0]; + $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 */ @@ -813,16 +1218,16 @@ class Room $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]; + $bin5_user = $bin5->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; + $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); @@ -836,11 +1241,11 @@ class Room 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"); @@ -926,17 +1331,19 @@ class Room $ret = sprintf('gst.st = %d; ', $user_step); - $prefs = new Client_prefs(($user->flags & USER_FLAG_MAP_AUTH) >> 2); - $ret .= sprintf('var prefs_new = prefs_load(\'%s\'); console.log(prefs_new);', json_encode($prefs)); + $prefs = Client_prefs::from_user($user); + $ret .= sprintf('prefs_load(\'%s\', false, false);', json_encode($prefs)); - 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(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') @@ -958,8 +1365,7 @@ 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) $ret .= sprintf('tra.add(%d, "%s: %s"); ', $i, $this->user[$this->table[$i]->wag_own]->name, $this->table[$i]->wag_com); @@ -1047,15 +1453,11 @@ class Room // 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)); $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)); $ret .= $table->act_content($user_cur); } } @@ -1130,8 +1532,6 @@ class Room $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 .= $table->act_content($user_cur); @@ -1159,8 +1559,7 @@ class Room 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)); + $ret .= $table->act_content($user_cur); log_main("JOIN_WAKEUP end more"); @@ -1171,6 +1570,63 @@ 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 = sprintf('chatt_sub("%s", [2, "%s"],"%s");', + $dt, NICKSERV, sprintf($mlang_brisk['tos_old'][$G_lang], xcape($user_login))); + } + else if ($guar_login == "") { + $mesg = sprintf('chatt_sub("%s", [2, "%s"],"%s");', + $dt, NICKSERV, sprintf($mlang_brisk['gua_nfd'][$G_lang], xcape($user_login))); + } + else if ($guar_login == $user_login) { + $mesg = sprintf('chatt_sub("%s", [2, "%s"],"%s");', + $dt, NICKSERV, sprintf($mlang_brisk['gua_self'][$G_lang], xcape($user_login))); + } + else { + $mesg = sprintf('chatt_sub("%s", [2, "%s"],"%s");', + $dt, NICKSERV, sprintf($mlang_brisk['gua_info'][$G_lang], + xcape($user_login), xcape($guar_login))); + } + } while (0); + + if ($ret > 0) { + $mesg = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, 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); @@ -1207,54 +1663,52 @@ class Room function room_sitdown($user, $table_idx) { - log_main("room_sitdown ".($user == FALSE ? "USER: FALSE" : "USER: ".$user->name)); - - $train_app = ""; - - if ($table_idx > -1 && $table_idx < TABLES_N) { - $table = $this->table[$table_idx]; - - // wagon shutdown - if ($table->wag_own != -1 && $table->player_n == PLAYERS_N) { - for ($i = 0 ; $i < TABLES_N ; $i++) { - if ($table->wag_own == $table->player[$i]) { - $train_app = sprintf("tra.rem(%d); ", $table_idx); - $table->wag_reset(time()); - break; - } - } - } - } - - for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $ret = ""; - $user_cur = $this->user[$i]; - if ($user_cur->sess == '' || $user_cur->stat != 'room') - continue; + log_main("room_sitdown ".($user == FALSE ? "USER: FALSE" : "USER: ".$user->name)); - $ret = "gst.st = ".($user_cur->step+1)."; ".$train_app; - if ($table_idx > -1) - $ret .= $this->table_content($user_cur, $table_idx); - $ret .= $this->standup_content($user_cur); + $train_app = ""; - if ($user->idx_get() == $i) { - $ret .= 'subst = "sitdown"; tra.hide(); '; - // clean the action buttons in other tables - for ($e = 0 ; $e < TABLES_N ; $e++) { - // $ret .= table_act_content(FALSE, 0, $e, $user_cur->table, FALSE); - $ret .= $this->table[$e]->act_content($user_cur); - } + if ($table_idx > -1 && $table_idx < TABLES_N) { + $table = $this->table[$table_idx]; + + // wagon shutdown + if ($table->wag_own != -1 && $table->player_n == PLAYERS_N) { + for ($i = 0 ; $i < TABLES_N ; $i++) { + if ($table->wag_own == $table->player[$i]) { + $train_app = sprintf("tra.rem(%d); ", $table_idx); + $table->wag_reset(time()); + break; + } + } + } } - else if ($table_idx > -1) { - if ($table->player_n == PLAYERS_N) { - // $ret .= table_act_content(($user_cur->subst == 'standup'), PLAYERS_N, $table_idx, $user_cur->table, - /// ($table->auth_only == FALSE ? TRUE : $user_cur->flags & USER_FLAG_AUTH)); - $ret .= $table->act_content($user_cur); - } + + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + $ret = ""; + $user_cur = $this->user[$i]; + if ($user_cur->sess == '' || $user_cur->stat != 'room') + continue; + + $ret = "gst.st = ".($user_cur->step+1)."; ".$train_app; + if ($table_idx > -1) + $ret .= $this->table_content($user_cur, $table_idx); + $ret .= $this->standup_content($user_cur); + + if ($user->idx_get() == $i) { + $ret .= 'subst = "sitdown"; tra.hide(); '; + // clean the action buttons in other tables + for ($e = 0 ; $e < TABLES_N ; $e++) { + $ret .= $this->table[$e]->act_content($user_cur); + } + } + else if ($table_idx > -1) { + if ($table->player_n == PLAYERS_N) { + + $ret .= $table->act_content($user_cur); + } + } + $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) @@ -1386,16 +1840,16 @@ class Room } } 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]); - } + 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 = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $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 { @@ -1428,11 +1882,11 @@ 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 ($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' && $this->table[$user->table]->auth_type == TABLE_AUTH_TY_PUBL) ) ) { $user->flags &= ~(USER_FLAG_AUTH | USER_FLAG_TY_ALL); // Remove auth if name changed @@ -1448,7 +1902,7 @@ 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) { + 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." */ @@ -1464,7 +1918,11 @@ 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"); @@ -1597,9 +2055,9 @@ class Room 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; + } } } /* @@ -1622,19 +2080,19 @@ class Room // 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]; + $bin5_user = $bin5->user[$i]; - if ($target != "" && $bri_user->name != $target) + 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++) { @@ -1679,7 +2137,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 @@ -1753,7 +2211,7 @@ class Room 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; @@ -1788,12 +2246,12 @@ class Room 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; } } } @@ -1821,31 +2279,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]; @@ -1918,200 +2383,17 @@ class Room } } - // 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"); - rename($crystal_filename, $crystal_filename.".old"); - } - - 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 = ""; @@ -2130,18 +2412,28 @@ class Room $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++; } } @@ -2165,18 +2457,24 @@ class Room 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 .= ' ]'; @@ -2188,7 +2486,17 @@ class Room 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'])) { @@ -2212,34 +2520,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()); @@ -2249,9 +2567,8 @@ 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); @@ -2265,7 +2582,7 @@ class Room 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; @@ -2273,7 +2590,20 @@ class Room 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/"; @@ -2308,8 +2638,16 @@ class Room } 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() { @@ -2346,11 +2684,12 @@ 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 @@ -2372,11 +2711,12 @@ function log_mop($step, $log) 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 @@ -2397,11 +2737,12 @@ 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 @@ -2422,11 +2763,12 @@ 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 @@ -2447,11 +2789,12 @@ 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 @@ -2472,11 +2815,12 @@ 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 @@ -2497,11 +2841,12 @@ 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 @@ -2523,11 +2868,12 @@ 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 @@ -2548,11 +2894,12 @@ 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 @@ -2573,11 +2920,12 @@ 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 @@ -2598,11 +2946,12 @@ 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 @@ -2643,11 +2992,12 @@ 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 @@ -2675,7 +3025,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); } @@ -2718,6 +3068,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) { @@ -2849,4 +3212,17 @@ class Poll { } } +function carousel_top() +{ + $what = rand(1,2); + if ($what == 1) { + $rn = rand(1, 3); + return (sprintf('
', $rn));
+ }
+ else {
+ return (sprintf('
'));
+ }
+}
+
+
?>