X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=5249ff589d3398797a077e4ba5ef3862cf2a68d7;hb=312a6acc00ec7f331ab461894c319776eec95cae;hp=6cb7f29bdf589c67949b936b284974522a154f33;hpb=d3d308459ec71347d7a8dbbd8aa0d3800ced76ad;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 6cb7f29..5249ff5 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -2,7 +2,7 @@ /* * brisk - brisk.phh * - * Copyright (C) 2006-2009 Matteo Nastasi + * Copyright (C) 2006-2011 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -35,7 +35,11 @@ define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N))); define(SHM_DIMS_MIN, (50000 + 10000 * TABLES_N + 15000 * MAX_PLAYERS)); define(SHM_DIMS_MAX, SHM_DIMS_MIN + 1048576); define(SHM_DIMS_DLT, 65536); - + +define(SHM_DIMS_U_MIN, 4096); +define(SHM_DIMS_U_MAX, 65536); +define(SHM_DIMS_U_DLT, 4096); + define(COMM_N, 18); define(COMM_GEN_N, 50); @@ -65,6 +69,7 @@ define(DBG_WRIT, 0x0080); define(DBG_LOAD, 0x0100); define(DBG_AUTH, 0x0200); define(DBG_CRIT, 0x0400); +define(DBG_LMOP, 0x0800); // NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols define(BRISK_DEBUG, 0xffffffbf); @@ -119,22 +124,23 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi', 'tit_onauth'=>array( 'it' => '(solo aut.)', 'en' => '(only aut.)'), 'tit_onisol'=>array( 'it' => '(isolam.to)', - 'en' => '(isolation)') + 'en' => '(isolation)'), + 'db_failed' =>array('it' => '
Il collegamento al database è fallito.
Temporaneamente tutte le autenticazioni verranno sospese, accederai a Brisk come un utente normale.

Ci scusiamo per il disagio.', + 'en' => 'Connection to the database failed
All authentications are suspended temporarly, you login as normal user.
We are about the limitation') ); -$G_false = FALSE; $G_lng = langtolng($G_lang); $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 ); -$G_brisk_version = "2.4.1 - trusty"; +$G_brisk_version = "3.2.0"; /* MLANG: ALL THE INFO STRINGS IN brisk.phh */ -$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': completato mod. isolamento, aggiunto stato coniglio aggiunte preferenze in partita.', - 'Se vuoi iscriverti alla Mailing List, cliccala!' ), - 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: completed isolation mode, bunny status added, preferences added during play.', - 'If you want to subscribe our Mailing List, click it!' ) ); +$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': informazioni al tavolo sul chiamante, nuovo stato di supporter del sito.', + 'Se vuoi iscriverti alla Mailing List, cliccala!' ), + 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: caller information on the table, new supporter status.', + 'If you want to subscribe our Mailing List, click it!' ) ); $G_room_help = array( 'it' => '
@@ -208,6 +214,7 @@ Attualmente ci sono due metodi per ottenere una password sul sito:

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

    • Per auto-garantisi occorre possedere:

    @@ -275,6 +282,26 @@ Copyright 2006-2009 Matteo Nasta
    version '.$G_brisk_version.'

    Copyright 2006-2009     Matteo Nastasi (aka mop)

    '); +$escinp_from = array( "\"" ); +$escinp_to = array( """ ); + +function escinput($s) +{ + GLOBAL $escinp_from, $escinp_to; + + return str_replace($escinp_from, $escinp_to, $s); +} + +function eschtml($s) +{ + return htmlentities($s); +} + +function esclfhtml($s) +{ + return str_replace("\n", "
    \n", htmlentities($s)); +} + function langtolng($lang) { @@ -290,19 +317,20 @@ function csplitter($in, $sep) $out = array(); $out[$id] = ""; for ($i = 0 ; $i < strlen($in) ; $i++) { + $ini = substr($in, $i, 1); if ($st == 0) { - if ($in{$i} == '\\') + if ($ini == '\\') $st = 1; - else if ($in{$i} == $sep) { + else if ($ini == $sep) { $id++; $out[$id] = ""; } else { - $out[$id] .= $in{$i}; + $out[$id] .= $ini; } } else if ($st == 1) { - $out[$id] .= $in{$i}; + $out[$id] .= $ini; $st = 0; } } @@ -310,7 +338,6 @@ function csplitter($in, $sep) return ($out); } - function xcape($s) { $from = array ( '\\', '@', '|' ); @@ -356,12 +383,10 @@ class Table { { } - function &create($idx) + function create($idx) { - GLOBAL $G_false; - if (($thiz =& new Table()) == FALSE) - return ($G_false); + return (FALSE); $thiz->idx = $idx; $thiz->player = array(); @@ -380,10 +405,8 @@ class Table { return ($thiz); } - function copy(&$from) + function copy($from) { - GLOBAL $G_false; - $this->idx = $from->idx; $this->player = array(); for ($i = 0 ; $i < $from->player_n ; $i++) @@ -404,24 +427,20 @@ class Table { $this->wakeup_time = $from->wakeup_time; } - function &myclone(&$from) + function myclone($from) { - GLOBAL $G_false; - if (($thiz =& new Table()) == FALSE) - return ($G_false); + return (FALSE); $this->copy($from); return ($thiz); } - function &spawn(&$from) + function spawn($from) { - GLOBAL $G_false; - if (($thiz =& new Table()) == FALSE) - return ($G_false); + return (FALSE); $thiz->idx = $from->idx; $thiz->player = array(); @@ -443,11 +462,11 @@ class Table { return ($thiz); } - function wag_set(&$user, $mesg) + function wag_set($user, $mesg) { log_main("WAG_SET"); - $this->wag_own = &$user; + $this->wag_own = $user; $this->wag_com = $mesg; $this->wag_tout = 0; } @@ -550,10 +569,11 @@ class Table { define(USER_FLAG_AUTH, 0x02); define(USER_FLAG_MAP_AUTH, 0x0c); - define(USER_FLAG_LISTAUTH, 0x04); define(USER_FLAG_ISOLAUTH, 0x08); +define(USER_FLAG_DBFAILED, 0x10); + // user status define(USER_FLAG_S_NORM, 0x000); // done define(USER_FLAG_S_PAU, 0x100); // done @@ -564,10 +584,23 @@ define(USER_FLAG_S_WRK, 0x500); // done define(USER_FLAG_S_SMK, 0x600); // done define(USER_FLAG_S_EYE, 0x700); // done define(USER_FLAG_S_RABB, 0x800); // done +define(USER_FLAG_S_SOCC, 0x900); // done +define(USER_FLAG_S_BABY, 0xa00); // done +define(USER_FLAG_S_MOP, 0xb00); // done define(USER_FLAG_S_ALL, 0xf00); // done +/* type of user normal, supporter etc ... */ +define(USER_FLAG_TY_ALL, 0xff0000); // done +define(USER_FLAG_TY_NORM, 0x010000); // done +define(USER_FLAG_TY_SUPER, 0x020000); // done +// ... other usefull status ... +define(USER_FLAG_TY_SUSPEND, 0x400000); // done +define(USER_FLAG_TY_DISABLE, 0x800000); // done + class User { + var $idx; // index in the users array + var $code; // authentication code var $name; // name of the user var $sess; // session of the user var $ip; // ip of the user @@ -598,15 +631,19 @@ class User { var $chat_cur; // Current chat line number var $chat_ban; // Time for ban chat var $chat_dlt; // Delta t for ban + var $shm_sz; + function User() { } - function &create($name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") { - GLOBAL $G_false; + function create($idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") { + // error_log("User::create BEGIN", 0); if (($thiz =& new User()) == FALSE) - return ($G_false); + return (FALSE); + $thiz->idx = $idx; + $thiz->code = -1; $thiz->name = $name; $thiz->sess = $sess; $thiz->ip = $ip; @@ -635,14 +672,14 @@ class User { $thiz->table = $table; $thiz->table_pos = -1; $thiz->table_token = ""; - + $thiz->shm_sz = SHM_DIMS_U_MIN; return ($thiz); } - function copy(&$from) + function copy($from) { - GLOBAL $G_false; - + $this->idx = $from->idx; + $this->code = $from->code; $this->name = $from->name; $this->sess = $from->sess; $this->ip = $from->ip; @@ -680,30 +717,28 @@ class User { $this->table_pos = $from->table_pos; $this->table_token = $from->table_token; $this->the_end = $from->the_end; - + $this->shm_sz = $from->shm_sz; return (TRUE); } - function &myclone(&$from) + function myclone($from) { - GLOBAL $G_false; - if (($thiz =& new User()) == FALSE) - return ($G_false); + return (FALSE); $thiz->copy($from); return ($thiz); } - function &spawn(&$from, $table, $table_pos) + function spawn($from, $table, $table_pos) { - GLOBAL $G_false; - if (($thiz =& new User()) == FALSE) - return ($G_false); + return (FALSE); + $thiz->idx = $from->idx; + $thiz->code = $from->code; $thiz->name = $from->name; $thiz->sess = $from->sess; $thiz->ip = $from->ip; @@ -743,9 +778,18 @@ class User { $thiz->table = 0; $thiz->table_pos = $table_pos; $thiz->table_token = $from->table_token; + $thiz->shm_sz = $from->shm_sz; return ($thiz); } + + function idx_get() { + return ($this->idx); + } + + function code_get() { + return ($this->code); + } function stat_set($stat) { log_main("sess: [".$this->sess. "] NEW STAT: [".$stat."]"); @@ -772,7 +816,7 @@ class User { mkdir(PROXY_PATH); if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE) break; - fwrite($fp, pack("l",$this->step), 4); + fwrite($fp, pack("LL",$this->step, $this->idx)); fclose($fp); return (TRUE); @@ -788,7 +832,7 @@ class User { if (file_exists(PROXY_PATH) == FALSE) mkdir(PROXY_PATH); $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w'); - fwrite($fp, pack("l",$this->step), 4); + fwrite($fp, pack("LL", $this->step, $this->idx)); fclose($fp); return (TRUE); @@ -814,12 +858,105 @@ class User { $this->chat_dlt = 0; $this->the_end = FALSE; } -} // end class User + // SHSPLIT save and load function for the User class. + function load_data($id) + { + GLOBAL $sess; + + // error_log("User::load_data BEGIN", 0); + + $doexit = FALSE; + do { + if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) { + log_main("ftok failed"); + $doexit = TRUE; + break; + } + + if (($shm_sz = sharedmem_sz($tok)) == -1) { + log_main("shmop_open failed"); + } + + if ($shm_sz == -1) + $shm_sz = SHM_DIMS_U_MIN; + + if ($shm = shm_attach($tok, $shm_sz)) { + $user = @shm_get_var($shm, $tok); + + log_only("bri == ".($user == FALSE ? "FALSE" : "TRUE")." bri === ".($user === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($user) ? "TRUE" : "FALSE")); + if (isset($user)) + log_only("bri count ".count($user)); + + if ($user == FALSE) { + log_only("INIT MAIN DATA"); + + // SHSPLIT FIXME: init_data for User class ?? + $user =& User::create($id, "", ""); + if (@shm_put_var($shm, $tok, $user) == FALSE) { + log_only("PUT_VAR FALLITA ".strlen(serialize($user))); + log_only(serialize($user)); + } + } + + $user->shm_sz = $shm_sz; + + shm_detach($shm); + } + + // + // SHSPLIT: load users from the shared memory + // + return ($user); + } while (0); + + if ($doexit) + exit(); + + return (FALSE); + } + + + function save_data(&$user, $id) + { + GLOBAL $sess; + + $shm = FALSE; + + // var_dump($user); + // error_log("User::save_data BEGIN", 0); + + if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) { + return (FALSE); + } + while ($user->shm_sz < SHM_DIMS_U_MAX) { + if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE) + break; + + // log_only("PUT_VAR DI ".strlen(serialize($user))); + if (shm_put_var($shm, $tok, $user) != FALSE) { + shm_detach($shm); + return (TRUE); + } + if (shm_remove($shm) === FALSE) { + log_only("REMOVE FALLITA"); + break; + } + shm_detach($shm); + $user->shm_sz += SHM_DIMS_U_DLT; + } + + if ($shm) + shm_detach($shm); + + return (FALSE); + } + +} // end class User function step_get($sess) { @@ -832,15 +969,15 @@ function step_get($sess) { mkdir(PROXY_PATH); if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE) break; - if (($s = fread($fp, 4)) == FALSE) + if (($s = fread($fp, 8)) == FALSE) break; - if (strlen($s) != 4) + if (strlen($s) != 8) break; - $arr = unpack('l', $s); + $arr = unpack('Ls/Li', $s); fclose($fp); // log_rd2("A0: ".$arr[0]." A1: ".$arr[1]); - return ($arr[1]); + return ($arr); } while (0); if ($fp != FALSE) @@ -872,7 +1009,7 @@ class Room { $this->table = array(); for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - $this->user[$i] =& User::create("", ""); + $this->user[$i] =& User::create($i, "", ""); } for ($i = 0 ; $i < TABLES_N ; $i++) { @@ -893,11 +1030,12 @@ class Room { $this->table[$i]->auth_only = FALSE; } $this->garbage_timeout = 0; + $this->shm_sz = SHM_DIMS_MIN; } function garbage_manager($force) { - GLOBAL $G_lang, $mlang_brisk; + GLOBAL $G_lang, $mlang_brisk, $G_base; $ismod = FALSE; @@ -908,7 +1046,7 @@ class Room { if ($force || $this->garbage_timeout < $curtime) { // FIXME BRISK4: include for each kind of table - require_once("briskin5/Obj/briskin5.phh"); + require_once("${G_base}briskin5/Obj/briskin5.phh"); // Before all align times with table timeout for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { @@ -1086,6 +1224,11 @@ class Room { $ret .= sprintf('stat = "%s";', $user->stat); $ret .= root_wellcome($user); + if ($user->flags & USER_FLAG_DBFAILED) { + $ret .= "gst.st = ".($user->step+1)."; "; + $ret .= show_notify($mlang_brisk['db_failed'][$G_lang], 0, $mlang_brisk['btn_close'][$G_lang], 400, 140); + } + $ret .= sprintf('subst = "%s";', $user->subst); $itin = ($user->flags & USER_FLAG_AUTH ? "" : ""); $itou = ($user->flags & USER_FLAG_AUTH ? "" : ""); @@ -1256,7 +1399,7 @@ class Room { } log_main("___"); - log_main("VALORI name: ".$user_cur->name." tab: ".$user_cur->table." taix: ".$table_idx." ucur: ".$user_cur." us: ".$user); + log_main("VALORI name: ".$user_cur->name." tab: ".$user_cur->table." taix: ".$table_idx); $ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : ""); if ($user_cur->stat == "room") { @@ -1397,13 +1540,14 @@ class Room { function chatt_send(&$user, $mesg) { - GLOBAL $G_alarm_passwd, $mlang_brisk, $G_lang; + GLOBAL $G_base, $G_alarm_passwd, $mlang_brisk, $G_lang; $only_you = FALSE; // common settings $msg = substr($mesg, 6, 128); $curtime = time(); $dt = date("H:i ", $curtime); + $target = ""; // // Compute actions @@ -1567,12 +1711,12 @@ class Room { /* MLANG: "Non puoi cambiare nick a un tavolo per soli autenticati.", "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */ if ($user->flags & USER_FLAG_AUTH) { if (strcasecmp($user->name,$name_new) != 0) { - if (($user->flags & USER_FLAG_MAP_AUTH != USER_FLAG_ISOLAUTH) && + if (( ($user->flags & USER_FLAG_MAP_AUTH) != USER_FLAG_ISOLAUTH) && ($user->subst == 'standup' || ($user->subst != 'standup' && $this->table[$user->table]->auth_only == FALSE) ) ) { - $user->flags &= ~USER_FLAG_AUTH; // Remove auth if name changed + $user->flags &= ~(USER_FLAG_AUTH | USER_FLAG_TY_ALL); // Remove auth if name changed for ($i = 0 ; $i < TABLES_N ; $i++) { $to_user .= $this->table[$i]->act_content($user); } @@ -1586,12 +1730,14 @@ class Room { $user->name = $name_new; // OK - nick changed /* se nome gia' in uso, segnala cosa potrebbe capitare */ if (($user->flags & USER_FLAG_AUTH) == 0) { - $userdb = new LoginDB(); - /* MLANG: "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */ - if ($userdb->login_exists($name_new)) { - $prestr = sprintf($mlang_brisk['nickjust'][$G_lang], xcape($name_new)); - $to_user .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $prestr); - } + if (($bdb = BriskDB::create()) != FALSE) { + $bdb->users_load(); + /* MLANG: "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */ + if ($bdb->login_exists($name_new)) { + $prestr = sprintf($mlang_brisk['nickjust'][$G_lang], xcape($name_new)); + $to_user .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $prestr); + } + } } log_main("chatt_send start set"); @@ -1633,6 +1779,15 @@ class Room { else if (strcasecmp($st_str, "coniglio") == 0) { $st = USER_FLAG_S_RABB; } + else if (strcasecmp($st_str, "calcio") == 0) { + $st = USER_FLAG_S_SOCC; + } + else if (strcasecmp($st_str, "pupo") == 0) { + $st = USER_FLAG_S_BABY; + } + else if (strcasecmp($st_str, "pulizie") == 0) { + $st = USER_FLAG_S_MOP; + } else { /* MLANG: "Questo stato non esiste." */ $to_user = sprintf('chatt_sub("%s", [2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['statunkn'][$G_lang]); @@ -1733,7 +1888,7 @@ class Room { if ($to_tabl) { // FIXME BRISK4: include for each kind of table - require_once("briskin5/Obj/briskin5.phh"); + require_once("${G_base}briskin5/Obj/briskin5.phh"); // Before all align times with table timeout for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) { $table_cur =& $this->table[$table_idx]; @@ -1788,9 +1943,9 @@ class Room { return; } // function chatt_send( ... - function &get_user($sess, &$idx) + function get_user($sess, &$idx) { - GLOBAL $PHP_SELF, $G_false; + GLOBAL $PHP_SELF; if (validate_sess($sess)) { for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { @@ -1809,13 +1964,11 @@ class Room { log_main(sprintf("get_user: Wrong strlen [%s]",$sess)); } - return ($G_false); + return (FALSE); } - - /* - * function &add_user(&$room, &$sess, &$idx, $name, $pass, $ip) + * function add_user(&$room, &$sess, &$idx, $name, $pass, $ip) * * RETURN VALUE: * if ($idx > -1 && ret == FALSE) => duplicated nick @@ -1823,27 +1976,27 @@ class Room { * if ($idx == -3 && ret == FALSE) => wrong password * if ($idx == -1 && ret == FALSE) => no space left * if ($idx == 0 && ret == user) => SUCCESS - * if ($idx == -$idx && ret == user) => SUCCESS (but the login exists in the auth db + * if ($idx == -$idx && ret == user) => SUCCESS (but the login exists in the auth db) */ - - - function &add_user(&$sess, &$idx, $name, $pass, $ip) + function add_user(&$sess, &$idx, $name, $pass, $ip) { - GLOBAL $G_false, $CO_list; + GLOBAL $G_base, $CO_list; $idx = 0; $authenticate = FALSE; + $user_type = 0; $login_exists = FALSE; $ghost = -1; $ghost_auth = FALSE; $idx = -1; $idfree = -1; - + $code = FALSE; + if (($name_new = validate_name($name)) == FALSE) { $idx = -2; - return ($G_false); + return (FALSE); } log_auth("XXX", sprintf("ARRIVA: [%s] pass:[%s]", $sess, ($pass == FALSE ? "FALSE" : $pass))); @@ -1852,19 +2005,30 @@ class Room { /* if pass != FALSE verify the login with pass */ log_auth("XXX", "auth1"); - $userdb = new LoginDB(); - if ($pass != FALSE) { - log_auth("XXX", "auth2"); - $authenticate = $userdb->login_verify($name_new, $pass); - log_auth("XXX", "authenticate: ".($authenticate == TRUE ? "TRUE" : "FALSE")); - - if ($authenticate == FALSE) { - $idx = -3; - return ($G_false); - } + + if (($bdb = BriskDB::create()) != FALSE) { + $bdb->users_load(); + if ($pass != FALSE) { // TODO: here add a method to $bdb to check if the db is available. + log_auth("XXX", "auth2"); + $authenticate = $bdb->login_verify($name_new, $pass, $code); + log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE")); + + if ($authenticate != FALSE) { + // error_log(print_r(&$authenticate, TRUE),0); + $user_type = $authenticate->type_get(); + } + else { + $idx = -3; + return (FALSE); + } + } + else { + $login_exists = $bdb->login_exists($name_new); + } } else { - $login_exists = $userdb->login_exists($name_new); + // if db is down, send a warning and verify only current users + // no actions at this moment } for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { /* free user ? */ @@ -1872,19 +2036,19 @@ class Room { if ($idx == -1) $idx = $i; } - if ($idfree == -1 && strcmp("", $this->user[$i]->sess) == 0) { + if ($idfree == -1 && strcmp($this->user[$i]->sess, "") == 0) { $idfree = $i; continue; // NOTE: CHECK IT !! } if (strcasecmp($this->user[$i]->name, $name_new) == 0) { - if ($authenticate == FALSE) { - $idx = $i; - break; - } - else { - $ghost = $i; - $ghost_auth = ($this->user[$i]->flags & USER_FLAG_AUTH); - } + if ($authenticate != FALSE) { + $ghost = $i; + $ghost_auth = ($this->user[$i]->flags & USER_FLAG_AUTH); + } + else { + $idx = $i; + break; + } } } if ($idx == -1) @@ -1892,7 +2056,9 @@ class Room { log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name_new)); - if ($ghost > -1 && $ghost_auth && $authenticate) { + /* there is another user logged with your account and you and him have authenticated => che new user + get the session of the old user */ + if ($ghost > -1 && $ghost_auth && ($authenticate != FALSE)) { /* swap session */ $ghost_user =& $this->user[$ghost]; @@ -1910,7 +2076,7 @@ class Room { $table_idx = $ghost_user->table; if ($ghost_user->stat == "table" && $this->table[$table_idx]->player_n == PLAYERS_N) { // FIXME BRISK4: include for each kind of table - require_once("briskin5/Obj/briskin5.phh"); + require_once("${G_base}briskin5/Obj/briskin5.phh"); if (($brisem = Briskin5::lock_data($table_idx)) != FALSE) { if (($bri = &Briskin5::load_data($table_idx)) != FALSE) { if ($bri->the_end != TRUE) { @@ -1946,9 +2112,14 @@ class Room { $this->user[$idx]->bantime = 0; $this->user[$idx]->ip = $ip; - $this->user[$idx]->flags = ($authenticate ? USER_FLAG_AUTH : 0x00); + $this->user[$idx]->flags = $user_type; + $this->user[$idx]->flags |= ($authenticate != FALSE ? USER_FLAG_AUTH : 0x00); + $this->user[$idx]->flags |= ( ($pass != FALSE && $bdb == FALSE) ? USER_FLAG_DBFAILED : 0x00); + log_auth("XXX", sprintf("FLAGS: [%x]", $this->user[$idx]->flags)); + - if ($authenticate) { + if ($authenticate != FALSE) { + $this->user[$idx]->code = $authenticate->code_get(); $this->user[$idx]->flags |= USER_FLAG_LISTAUTH; if (isset($CO_list)) { @@ -2005,17 +2176,19 @@ class Room { } } // if ($ghost > -1) { - log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name_new)); $real_idx = $idx; if ($login_exists) $idx = -($idx + 1); - return ($this->user[$real_idx]); + log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s] count [%d] name [%s] code [%s]", $idx, $sess, $name_new, count($this->user),$this->user[$real_idx]->name, $this->user[$real_idx]->code)); + + $ret = $this->user[$real_idx]; + return ($ret); } - return ($G_false); + return (FALSE); } - function standup_update(&$user) + function standup_update($user) { for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = &$this->user[$i]; @@ -2041,18 +2214,21 @@ class Room { } // Static functions - function &init_data() + static function create() { - $room =& new Room(); + $room = new Room(); return $room; } - - function &load_data() + + function load_data() { - GLOBAL $G_false, $sess; + GLOBAL $sess; $doexit = FALSE; + + // error_log("Room::load_data BEGIN", 0); + do { if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) { log_main("ftok failed"); @@ -2068,37 +2244,48 @@ class Room { $shm_sz = SHM_DIMS_MIN; if ($shm = shm_attach($tok, $shm_sz)) { - $room = @shm_get_var($shm, $tok); - - log_only("bri == ".($room == FALSE ? "FALSE" : "TRUE")." bri === ".($room === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($room) ? "TRUE" : "FALSE")); - if (isset($room)) - log_only("bri count ".count($room)); - - if ($room == FALSE) { - log_only("INIT MAIN DATA"); - - $room =& Room::init_data(); - if (@shm_put_var($shm, $tok, $room) == FALSE) { - log_only("PUT_VAR FALLITA ".strlen(serialize($room))); - log_only(serialize($room)); - } - } - $room->shm_sz = $shm_sz; - - shm_detach($shm); + $room = @shm_get_var($shm, $tok); + + log_only("bri == ".($room == FALSE ? "FALSE" : "TRUE")." bri === ".($room === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($room) ? "TRUE" : "FALSE")); + if (isset($room)) + log_only("bri count ".count($room)); + + if ($room == FALSE) { + log_only("INIT MAIN DATA"); + shm_detach($shm); + + // error_log("DE CHE", 0); + + $room = Room::create(); + + if (Room::save_data($room) == FALSE) + return FALSE; + + return $room; + } + $room->shm_sz = $shm_sz; + + shm_detach($shm); + + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + $room->user[$i] = User::load_data($i); + } } - $ret = &$room; - return ($ret); + + // + // SHSPLIT: load users from the shared memory + // + return ($room); } while (0); if ($doexit) exit(); - return ($G_false); + return (FALSE); } - function save_data(&$room) + function save_data_orig(&$room) { GLOBAL $sess; @@ -2132,6 +2319,57 @@ class Room { return (FALSE); } + + function save_data(&$room) + { + GLOBAL $sess; + + $ret = FALSE; + $shm = FALSE; + + // var_dump($room); + // error_log("Room::save_data BEGIN", 0); + + if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) + return (FALSE); + + // SHSPLIT: before save the $room you must save users, + // detach from main struct and (then) reattach + $user_park = array(); + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + $user_park[$i] = $room->user[$i]; + $room->user[$i] = FALSE; + } + + while ($room->shm_sz < SHM_DIMS_MAX) { + if (($shm = shm_attach($tok, $room->shm_sz)) == FALSE) + break; + + // log_only("PUT_VAR DI ".strlen(serialize($room))); + if (shm_put_var($shm, $tok, $room) != FALSE) { + $ret = TRUE; + break; + } + if (shm_remove($shm) === FALSE) { + log_only("REMOVE FALLITA"); + break; + } + shm_detach($shm); + $room->shm_sz += SHM_DIMS_DLT; + } + + if ($shm) + shm_detach($shm); + + // SHSPLIT: reattach users to the room class + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + User::save_data($user_park[$i], $i); + $room->user[$i] = $user_park[$i]; + } + + return ($ret); + } + function lock_data() { GLOBAL $sess; @@ -2247,8 +2485,29 @@ function make_seed() } +function log_mop($step, $log) { + GLOBAL $sess, $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LMOP) == 0) + return; + + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0) + return; + + if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { + fwrite($fp, sprintf("LMOP: [%f] [%05d] [%s] [%s]\n", gettimeofday(TRUE), $step, $PHP_SELF, $log)); + fclose($fp); + } +} + + function log_only2($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0) return; @@ -2262,13 +2521,13 @@ function log_only2($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("ONL2: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("ONL2: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_crit($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CRIT) == 0) return; @@ -2282,13 +2541,13 @@ function log_crit($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("CRIT: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("CRIT: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_only($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0) return; @@ -2302,13 +2561,13 @@ function log_only($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("ONLY: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("ONLY: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_main($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0) return; @@ -2322,13 +2581,13 @@ function log_main($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("MAIN: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("MAIN: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_rd($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0) return; @@ -2342,13 +2601,13 @@ function log_rd($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("READ: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_rd2($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0) return; @@ -2362,13 +2621,13 @@ function log_rd2($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("REA2: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_send($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0) return; @@ -2382,13 +2641,13 @@ function log_send($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("SEND: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("SEND: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_lock($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0) return; @@ -2402,13 +2661,13 @@ function log_lock($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("LOCK: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("LOCK: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_wr($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0) return; @@ -2422,13 +2681,13 @@ function log_wr($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("WRIT: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("WRIT: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_load($log) { - GLOBAL $sess; + GLOBAL $sess, $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0) return; @@ -2442,12 +2701,13 @@ function log_load($log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("LOAD: [%s] [%s]\n", $ssess, $log)); + fwrite($fp, sprintf("LOAD: [%s] [%s] [%s]\n", $ssess, $PHP_SELF, $log)); fclose($fp); } } function log_auth($sess, $log) { + GLOBAL $PHP_SELF; if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_AUTH) == 0) return; @@ -2455,7 +2715,7 @@ function log_auth($sess, $log) { return; if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) { - fwrite($fp, sprintf("AUTH: [%s] [%d] [%s]\n", $sess, time(), $log)); + fwrite($fp, sprintf("AUTH: [%s] [%d] [%s] [%s]\n", $sess, time(), $PHP_SELF, $log)); fclose($fp); } } @@ -2475,21 +2735,6 @@ function log_legal($curtime, &$user, $where, $mesg) } } -function log_points($curtime, &$user, $where, $mesg) -{ - GLOBAL $_SERVER; - - if (($fp = @fopen(LEGAL_PATH."/points.log", 'a')) != FALSE) { - /* Unix time | session | nickname | IP | where was | mesg */ - fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|%s|\n", $curtime, $user->sess, - ($user->flags & USER_FLAG_AUTH ? 'A' : 'N'), - $user->name, $_SERVER['REMOTE_ADDR'], $where , $mesg)); - fclose($fp); - } -} - - - function lock_banlist() {