X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=136851635f7915488735c43164171e32c29e1b97;hb=059f6fcca909267802697e22ac7c8b701b9ed14e;hp=733b5faa5ca9801c0e64d88655d2af1a662995b2;hpb=225d405fc65a983470f3d690ea7ea0ca6a3d7779;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 733b5fa..1368516 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
@@ -58,7 +58,7 @@ 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('GARBAGE_TIMEOUT', 5);
define('NICKSERV', "BriskServ");
define('LOCK_SHARE_MAX', 10000);
@@ -77,6 +77,7 @@ define('DBG_CRIT', 0x0400);
define('DBG_LMOP', 0x0800);
define('DBG_TRAC', 0x1000);
define('DBG_SHME', 0x2000);
+define('DBG_ENGI', 0x4000);
// NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols
define('BRISK_DEBUG', 0x0800);
@@ -132,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.1.0";
+$G_brisk_version = "4.12.3";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': adottato sac-a-push come motore per l\'invio dei dati in tempo reale, nuovo trasporto httpfile per explorer.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': razionalizzato il menu, aggiunto il bottone LIKE di facebook per la nuova pagina del sito, e fix volanti.',
'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: refactored vertical menu, facebook LIKE button added and dirty fixes.',
'If you want to subscribe our Mailing List, click it!' ) );
$G_room_help = array( 'it' => '
@@ -172,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)
@@ -184,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
@@ -203,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)
@@ -288,6 +302,48 @@ 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);
+ if (isset($ipv4addr_arr[3])) {
+ $ipv4addr = $ipv4addr_arr[3];
+ }
+ else {
+ $ipv4addr = $addr;
+ }
+ return $ipv4addr;
+}
+
function mop_flush()
{
for ($i = 0; $i < ob_get_level(); $i++)
@@ -325,42 +381,6 @@ function file_unlock($res)
}
}
-function webservers_exceeded()
-{
- return(file_exists(PROXY_PATH."/webservers_exceded.flag"));
-}
-
-function webservers_check()
-{
- GLOBAL $G_webserver_max;
-
- /* FIXME: check all procs expirations */
- return (10);
-
- $ct = 0;
-
- $dh = opendir('/proc');
- while (($file = readdir($dh)) !== false) {
- if (preg_match('/[0-9]+/', $file)) {
- $cmdline = explode("\0", file_get_contents('/proc/'.$file.'/cmdline'));
- // echo "xxx".$cmdline[0].$n;
- if (strstr('/usr/sbin/apache2', $cmdline[0]) != FALSE) {
- // echo "yyy".$cmdline[0].$n;
- $ct++;
- }
- }
- }
- closedir($dh);
-
- if ($ct >= $G_webserver_max) {
- touch(PROXY_PATH."/webservers_exceded.flag");
- }
- else {
- unlink(PROXY_PATH."/webservers_exceded.flag");
- }
- return ($ct);
-}
-
$escpush_from = array("\\", "\"");
$escpush_to = array("\\\\", "\\\"");
function escpush($s)
@@ -387,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;
@@ -604,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--;
@@ -670,48 +689,198 @@ class Table {
} // 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;
+ }
-class Room {
- static $delta_t;
+ 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);
+ }
- var $user;
- var $table;
- var $match;
- var $comm; // commands for many people
- var $step; // current step of the comm array
- var $garbage_timeout;
- var $shm_sz;
+ // 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;
+ }
- function Room () {
- $this->user = array();
- $this->table = array();
- $this->match = array();
+ // fprintf(STDERR, "DELTA: status %d, delta_max: %f\n", count($this->delta), $delta_max);
- for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $this->user[$i] = User::create($this, $i, "", "");
+ return ($delta_max);
}
- 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;
+ 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);
+ }
+
+ 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;
+ var $match;
+ var $comm; // commands for many people
+ var $step; // current step of the comm array
+ var $garbage_timeout;
+ var $shm_sz;
+
+ var $delay_mgr;
+
+ public static $sess_cur;
+
+ function Brisk($crystal_filename) {
+ $this->crystal_filename = $crystal_filename;
+ $this->user = array();
+ $this->table = array();
+ $this->match = array();
+
+ for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
+ $this->user[$i] = User::create($this, $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;
+ }
+ $this->garbage_timeout = 0;
+ $this->shm_sz = SHM_DIMS_MIN;
+
+ $this->delay_mgr = new Delay_Manager(1.5);
+
+ static::$sess_cur = FALSE;
}
- $this->garbage_timeout = 0;
- $this->shm_sz = SHM_DIMS_MIN;
- }
function garbage_manager($force)
{
@@ -722,14 +891,15 @@ 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);
}
- webservers_check();
-
// Before all align times with table timeout
for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
$table_cur = $this->table[$table_idx];
@@ -741,28 +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
*/
@@ -773,19 +942,19 @@ 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, 'xxx', $user_cur, "STAT:DESTROY_GAME", $plist);
+ log_legal($curtime, $user_cur->ip, $user_cur, "STAT:DESTROY_GAME", $plist);
$this->room_join_wakeup($user_cur, FALSE, 0);
$table_cur->table_token = "";
@@ -796,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");
@@ -822,7 +991,7 @@ class Room {
for ($i = 0 ; $i < $table_cur->player_n ; $i++) {
$plist .= '|'.$this->user[$table_cur->player[$i]]->sess;
}
- log_legal($curtime, 'xxx', $user_cur, "STAT:DESTROY_GAME(RECOVERY)", $plist);
+ log_legal($curtime, $user_cur->ip, $user_cur, "STAT:DESTROY_GAME(RECOVERY)", $plist);
$this->room_join_wakeup($user_cur, TRUE, -2);
$table_cur->table_token = "";
@@ -841,9 +1010,9 @@ class Room {
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.");
@@ -860,7 +1029,7 @@ class Room {
}
}
- 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)."; ";
@@ -875,6 +1044,7 @@ class Room {
$this->garbage_timeout = $curtime + GARBAGE_TIMEOUT;
$ismod = TRUE;
+ $this->delay_mgr->lastcheck_set($curtime);
return ($ismod);
}
@@ -885,14 +1055,19 @@ class Room {
$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')
@@ -902,7 +1077,7 @@ class Room {
$ret .= sprintf('stat = "%s";', $user->stat);
- $ret .= root_wellcome($user);
+ $ret .= root_welcome($user);
if ($user->flags & USER_FLAG_DBFAILED) {
$ret .= "gst.st = ".($user->step+1)."; ";
$ret .= show_notify($mlang_brisk['db_failed'][$G_lang], 0, $mlang_brisk['btn_close'][$G_lang], 400, 140);
@@ -1127,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);
@@ -1163,54 +1395,53 @@ 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->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);
+ }
+ }
+ $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)
@@ -1420,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");
@@ -1463,6 +1698,18 @@ class Room {
else if (strcasecmp($st_str, "pulizie") == 0) {
$st = USER_FLAG_S_MOP;
}
+ else if (strcasecmp($st_str, "babbo") == 0) {
+ $st = USER_FLAG_S_BABBO;
+ }
+ else if (strcasecmp($st_str, "renna") == 0) {
+ $st = USER_FLAG_S_RENNA;
+ }
+ else if (strcasecmp($st_str, "pupazzo") == 0) {
+ $st = USER_FLAG_S_PUPAZ;
+ }
+ else if (strcasecmp($st_str, "vischio") == 0) {
+ $st = USER_FLAG_S_VISCH;
+ }
else {
/* MLANG: "Questo stato non esiste." */
$to_user = sprintf('chatt_sub("%s", [2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['statunkn'][$G_lang]);
@@ -1507,7 +1754,7 @@ class Room {
$to_room = $to_user;
}
- log_legal($curtime, 'xxx', $user,
+ log_legal($curtime, $user->ip, $user,
($user->stat == 'room' ? 'room' : 'table '.$user->table),$msg);
$user->chat_lst = "$msg";
@@ -1566,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++) {
@@ -1623,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
@@ -1732,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;
}
}
}
@@ -1765,31 +2012,39 @@ class Room {
$this->user[$idx]->bantime = 0;
$this->user[$idx]->ip = $ip;
+ $this->user[$idx]->rec = $authenticate;
+ fprintf(STDERR, "MOP: [%s]\n", $authenticate->supp_comp);
$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];
@@ -1863,11 +2118,19 @@ class Room {
}
// Static functions
- static function create()
+ static function create($crystal_filename)
{
- $room = new Room();
-
- return $room;
+ if (($brisk_ser = @file_get_contents($crystal_filename)) == FALSE ||
+ ($brisk = unserialize($brisk_ser)) == FALSE) {
+ fprintf(STDERR, "NEW ROOM\n");
+ $brisk = new Brisk($crystal_filename);
+ }
+ else {
+ fprintf(STDERR, "ROOM FROM FILE\n");
+ rename($crystal_filename, $crystal_filename.".old");
+ }
+
+ return $brisk;
}
@@ -1889,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;
}
@@ -1926,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);
}
@@ -1958,7 +2221,7 @@ class Room {
break;
}
shm_detach($shm);
- $room->shm_sz += SHM_DIMS_DLT;
+ $brisk->shm_sz += SHM_DIMS_DLT;
}
if ($shm)
@@ -1966,9 +2229,18 @@ class Room {
return (FALSE);
}
+ function dump_data()
+ {
+ $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;
@@ -1978,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;
}
@@ -2001,7 +2273,7 @@ class Room {
break;
}
shm_detach($shm);
- $room->shm_sz += SHM_DIMS_DLT;
+ $brisk->shm_sz += SHM_DIMS_DLT;
}
if ($shm)
@@ -2010,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"));
@@ -2057,18 +2329,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++;
}
}
@@ -2092,18 +2374,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 .= ' ]';
@@ -2115,11 +2403,18 @@ 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_black_list;
+
+ printf("NEW_SOCKET (root): %d PATH [%s]\n", intval($new_socket), $path);
$enc = get_encoding($header);
- if (isset($header['User-Agent']) && strstr($header['User-Agent'], "MSIE")) {
- $transp_type = "htmlfile";
+ if (isset($header['User-Agent'])) {
+ if (strstr($header['User-Agent'], "MSIE")) {
+ $transp_type = "htmlfile";
+ }
+ else {
+ $transp_type = "xhr";
+ }
}
else {
$transp_type = "iframe";
@@ -2134,31 +2429,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)) {
- $content = User::stream_fini($s_a_p->rndstr, TRUE);
- $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+ $content = User::stream_fini($transp, $s_a_p->rndstr, TRUE);
+
+ $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());
@@ -2168,9 +2476,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);
@@ -2184,7 +2491,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;
@@ -2192,7 +2499,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/";
@@ -2227,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()
{
@@ -2265,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
@@ -2291,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
@@ -2316,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
@@ -2341,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
@@ -2366,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
@@ -2391,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
@@ -2416,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
@@ -2442,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
@@ -2467,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
@@ -2492,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
@@ -2517,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
@@ -2562,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
@@ -2587,8 +2927,8 @@ function log_shme($log)
-// function log_legal($curtime, $sess, $name, $where, $mesg)
-function log_legal($curtime, $addr, $user, $where, $mesg)
+// function log_legal($curtime, $sess, $name, $where, $mesg)
+function log_legal($curtime, $addr, $user, $where, $mesg)
{
if (($fp = @fopen(LEGAL_PATH."/legal.log", 'a')) != FALSE) {
@@ -2637,8 +2977,21 @@ 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_wellcome($user)
+function root_welcome($user)
{
GLOBAL $root_wellarr, $G_lang;
$ret = "";