X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=a103046afff1ad8337317e9f1ba64de5e9814b11;hb=5c514b65ef1f702724b213b5967d3a32d8525f0e;hp=0e3c67aa0ec8ddd6aeea599bc3a1fe4149728e3d;hpb=645d558d0d1411fc2c1f33c95b2783e1b0ae3e06;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 0e3c67a..a103046 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -2,7 +2,7 @@
/*
* brisk - brisk.phh
*
- * Copyright (C) 2006-2012 Matteo Nastasi
+ * Copyright (C) 2006-2013 Matteo Nastasi
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
@@ -133,20 +133,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.8.1";
+$G_brisk_version = "4.13.2";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': prova il nuovo azioni->preferenze, aggiunto stato utente ONLYFIRST.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo sistema per calcolare le classifiche con bugfix, corretto bug nel comando cont',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
- 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: server-side infrastructure to manage user preferences added and S customization added.',
+ 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: new placements calculation system with bugfix, cont command fixed.',
'If you want to subscribe our Mailing List, click it!' ) );
$G_room_help = array( 'it' => '
@@ -173,6 +182,8 @@ Dopo che è iniziata una partita per uscirne dovete chiedere agli altri gi
/nick <nuovo_nickname> - cambio di nickname
/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)
@@ -185,7 +196,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
@@ -204,6 +215,8 @@ Dopo che è iniziata una partita per uscirne dovete chiedere agli altri gi
/nick <nuovo_nickname> - cambio di nickname
/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)
@@ -289,6 +302,36 @@ Copyright 2006-2012 Matteo Nasta
version '.$G_brisk_version.'
Copyright 2006-2012 Matteo Nastasi (aka mop)
');
+// 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);
@@ -364,10 +407,9 @@ function eschtml($s)
function esclfhtml($s)
{
- return str_replace("\n", "
\n", htmlentities($s));
+ return str_replace(" ", " ", str_replace("\n", "
", htmlspecialchars($s)));
}
-
function langtolng($lang)
{
GLOBAL $G_lang;
@@ -581,17 +623,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--;
@@ -728,7 +770,7 @@ class Client_prefs {
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;
+ $this->supp_comp = $user->rec->supp_comp_get();
}
else {
$this->supp_comp = "000000000000";
@@ -780,15 +822,15 @@ class Client_prefs {
fprintf(STDERR, "QQ %s::%s %x\n", __CLASS__, __FUNCTION__,
$user->flags);
if ($user->is_supp_custom()) {
- $user->rec->supp_comp = $this->supp_comp;
+ $user->rec->supp_comp_set($this->supp_comp);
}
if ($is_save)
- $user->store_set();
+ $user->prefs_store();
}
}
-class Room
+class Brisk
{
static $delta_t;
@@ -803,7 +845,9 @@ class Room
var $delay_mgr;
- function Room ($crystal_filename) {
+ public static $sess_cur;
+
+ function Brisk($crystal_filename) {
$this->crystal_filename = $crystal_filename;
$this->user = array();
$this->table = array();
@@ -834,6 +878,8 @@ class Room
$this->shm_sz = SHM_DIMS_MIN;
$this->delay_mgr = new Delay_Manager(1.5);
+
+ static::$sess_cur = FALSE;
}
function garbage_manager($force)
@@ -865,27 +911,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
*/
@@ -896,16 +942,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);
@@ -919,11 +965,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");
@@ -1256,6 +1302,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);
@@ -1548,7 +1651,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");
@@ -1706,19 +1813,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++) {
@@ -1763,7 +1870,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
@@ -1872,12 +1979,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;
}
}
}
@@ -2013,17 +2120,17 @@ class Room
// Static functions
static function create($crystal_filename)
{
- if (($room_ser = @file_get_contents($crystal_filename)) == FALSE ||
- ($room = unserialize($room_ser)) == FALSE) {
+ if (($brisk_ser = @file_get_contents($crystal_filename)) == FALSE ||
+ ($brisk = unserialize($brisk_ser)) == FALSE) {
fprintf(STDERR, "NEW ROOM\n");
- $room = new Room($crystal_filename);
+ $brisk = new Brisk($crystal_filename);
}
else {
fprintf(STDERR, "ROOM FROM FILE\n");
rename($crystal_filename, $crystal_filename.".old");
}
- return $room;
+ return $brisk;
}
@@ -2045,31 +2152,31 @@ class Room
$shm_sz = SHM_DIMS_MIN;
if ($shm = shm_attach($tok, $shm_sz)) {
- $room = @shm_get_var($shm, $tok); // CHECKED BELOW
+ $brisk = @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));
+ log_only("bri == ".($brisk == FALSE ? "FALSE" : "TRUE")." bri === ".($brisk === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($brisk) ? "TRUE" : "FALSE"));
+ if (isset($brisk))
+ log_only("bri count ".count($brisk));
- if ($room == FALSE) {
+ if ($brisk == FALSE) {
log_only("INIT MAIN DATA");
shm_detach($shm);
- $room = Room::create();
+ $brisk = Brisk::create();
- log_shme("Room::create");
+ log_shme("Brisk::create");
- if (Room::save_data($room) == FALSE)
+ if (Brisk::save_data($brisk) == FALSE)
return FALSE;
- return $room;
+ return $brisk;
}
- $room->shm_sz = $shm_sz;
+ $brisk->shm_sz = $shm_sz;
shm_detach($shm);
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- if (($room->user[$i] = User::load_data($i, FALSE)) == FALSE) {
+ if (($brisk->user[$i] = User::load_data($i, FALSE)) == FALSE) {
log_crit("User::load_data failed");
break;
}
@@ -2082,30 +2189,30 @@ class Room
//
// SHSPLIT: load users from the shared memory
//
- return ($room);
+ return ($brisk);
} while (0);
return (FALSE);
}
- function save_data_orig($room)
+ function save_data_orig($brisk)
{
GLOBAL $sess;
$shm = FALSE;
- // var_dump($room);
+ // var_dump($brisk);
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)
+ while ($brisk->shm_sz < SHM_DIMS_MAX) {
+ if (($shm = shm_attach($tok, $brisk->shm_sz)) == FALSE)
break;
- // log_only("PUT_VAR DI ".strlen(serialize($room)));
- if (@shm_put_var($shm, $tok, $room) != FALSE) {
+ // log_only("PUT_VAR DI ".strlen(serialize($brisk)));
+ if (@shm_put_var($shm, $tok, $brisk) != FALSE) {
shm_detach($shm);
return (TRUE);
}
@@ -2114,7 +2221,7 @@ class Room
break;
}
shm_detach($shm);
- $room->shm_sz += SHM_DIMS_DLT;
+ $brisk->shm_sz += SHM_DIMS_DLT;
}
if ($shm)
@@ -2124,16 +2231,16 @@ class Room
}
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)
+ function save_data($brisk)
{
GLOBAL $sess;
@@ -2143,21 +2250,21 @@ class Room
if (($tok = @ftok(FTOK_PATH."/main", "C")) == -1)
return (FALSE);
- // SHSPLIT: before save the $room you must save users,
+ // SHSPLIT: before save the $brisk 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;
+ $user_park[$i] = $brisk->user[$i];
+ $brisk->user[$i] = FALSE;
}
- while ($room->shm_sz < SHM_DIMS_MAX) {
- if (($shm = shm_attach($tok, $room->shm_sz)) == FALSE)
+ while ($brisk->shm_sz < SHM_DIMS_MAX) {
+ if (($shm = shm_attach($tok, $brisk->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");
+ // log_only("PUT_VAR DI ".strlen(serialize($brisk)));
+ if (@shm_put_var($shm, $tok, $brisk) != FALSE) {
+ log_shme("Brisk::save_data");
$ret = TRUE;
break;
}
@@ -2166,7 +2273,7 @@ class Room
break;
}
shm_detach($shm);
- $room->shm_sz += SHM_DIMS_DLT;
+ $brisk->shm_sz += SHM_DIMS_DLT;
}
if ($shm)
@@ -2175,7 +2282,7 @@ class Room
// 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];
+ $brisk->user[$i] = $user_park[$i];
}
log_load("FINISH: ".($ret == TRUE ? "TRUE" : "FALSE"));
@@ -2231,7 +2338,7 @@ class Room
// 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);
+ $supp_comp_s = sprintf(', "%s"', $this->user[$i]->rec->supp_comp_get());
}
else {
$supp_comp_s = '';
@@ -2279,7 +2386,7 @@ class Room
log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx));
if ($user_cur->is_supp_custom())
- $supp_comp_s = sprintf(', "%s"', $user_cur->rec->supp_comp);
+ $supp_comp_s = sprintf(', "%s"', $user_cur->rec->supp_comp_get());
else
$supp_comp_s = '';
@@ -2333,7 +2440,6 @@ class Room
// from the socket, waiting if necessary
//
- fprintf(STDERR, "\n\nDENTRO QUI\n\n");
ob_start();
index_wr_main($this, $addr, $get, $post, $cookie);
$content = ob_get_contents();
@@ -2343,12 +2449,15 @@ class Room
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);
@@ -2357,6 +2466,7 @@ class Room
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());
@@ -2367,8 +2477,7 @@ class Room
$content = "";
$user->stream_init($s_a_p->rndstr, $enc, $header, $header_out, $content, $get, $post, $cookie);
-
- $response = headers_render($header_out, -1).chunked_content($user->rd_zls_get(), $content);
+ $response = headers_render($header_out, -1).$user->chunked_content($content);
$response_l = mb_strlen($response, "ASCII");
$wret = @fwrite($new_socket, $response, $response_l);
@@ -2438,8 +2547,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()
{
@@ -2476,11 +2593,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
@@ -2502,11 +2620,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
@@ -2527,11 +2646,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
@@ -2552,11 +2672,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
@@ -2577,11 +2698,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
@@ -2602,11 +2724,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
@@ -2627,11 +2750,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
@@ -2653,11 +2777,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
@@ -2678,11 +2803,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
@@ -2703,11 +2829,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
@@ -2728,11 +2855,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
@@ -2773,11 +2901,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
@@ -2848,6 +2977,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)
{
@@ -2979,4 +3121,17 @@ class Poll {
}
}
+function carousel_top()
+{
+ $what = rand(1,2);
+ if ($what == 1) {
+ $rn = rand(1, 3);
+ return (sprintf('', $rn));
+ }
+ else {
+ return (sprintf(''));
+ }
+}
+
+
?>