X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=54d39f45d26907974fda4bc3e609170895f711c6;hb=d568d9e85abd61f9e881de8ec06c166d69cd543b;hp=731dbdd520a6eb7e52d6383ed69c5bf5db681580;hpb=dfd5187d543b2f2233a794d08d6df04f50305103;p=brisk.git diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 731dbdd..54d39f4 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -2,7 +2,7 @@ /* * brisk - brisk.phh * - * Copyright (C) 2006-2013 Matteo Nastasi + * Copyright (C) 2006-2014 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -64,21 +64,23 @@ define('NICKSERV', "BriskServ"); define('LOCK_SHARE_MAX', 10000); -define('DBG_ONL2', 0x0001); -define('DBG_ONLY', 0x0002); -define('DBG_MAIN', 0x0004); -define('DBG_READ', 0x0008); -define('DBG_REA2', 0x0010); -define('DBG_SEND', 0x0020); -define('DBG_LOCK', 0x0040); -define('DBG_WRIT', 0x0080); -define('DBG_LOAD', 0x0100); -define('DBG_AUTH', 0x0200); -define('DBG_CRIT', 0x0400); -define('DBG_LMOP', 0x0800); -define('DBG_TRAC', 0x1000); -define('DBG_SHME', 0x2000); -define('DBG_ENGI', 0x4000); +define('DBG_ONL2', 0x000001); +define('DBG_ONLY', 0x000002); +define('DBG_MAIN', 0x000004); +define('DBG_READ', 0x000008); +define('DBG_REA2', 0x000010); +define('DBG_SEND', 0x000020); +define('DBG_LOCK', 0x000040); +define('DBG_WRIT', 0x000080); +define('DBG_LOAD', 0x000100); +define('DBG_AUTH', 0x000200); +define('DBG_CRIT', 0x000400); +define('DBG_LMOP', 0x000800); +define('DBG_TRAC', 0x001000); +define('DBG_SHME', 0x002000); +define('DBG_ENGI', 0x004000); +define('DBG_CDS', 0x008000); +define('DBG_STEP', 0x010000); // NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols define('BRISK_DEBUG', 0x0800); @@ -108,8 +110,8 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi', 'en' => 'EN
The signalling message of the table
will be deactivated for %d second%s.

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

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

'), - 'alarret' => array( 'it' => '"Alarm \\"%s\\" inviato a %s."', - 'en' => '"Alarm \\"%s\\" sent to %s."'), + 'alarret' => array( 'it' => 'Alarm \\"%s\\" inviato a %s.', + 'en' => 'Alarm \\"%s\\" sent to %s.'), 'authmust' => array( 'it' => 'Per autenticare qualcuno devi a tua volta essere autenticato e certificato.', 'en' => 'To authenticate someone you have to be authenticated and certified.'), // on your turn 'mesgmust' => array( 'it' => 'Per inviare un messaggio devi essere autenticato.', @@ -151,12 +153,12 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi', $G_lng = langtolng($G_lang); $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 ); -$G_brisk_version = "4.14.3"; +$G_brisk_version = "4.16.0"; /* MLANG: ALL THE INFO STRINGS IN brisk.phh */ -$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo sistema di registrazione degli utenti, aggiunto reinvio dell\' email di verifica, ban con classi di IP', +$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': rifattorizzazione del motore di Brisk e messaggio di uscita.', 'Se vuoi iscriverti alla Mailing List, cliccala!' ), - 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: new users subscription system.', + 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: engine refactoring and logout message.', 'If you want to subscribe our Mailing List, click it!' ) ); $G_room_help = array( 'it' => ' @@ -230,7 +232,7 @@ $G_room_passwdhowto = array( 'it' => '

Come registrarsi su Brisk

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

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

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

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

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

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

    • -Per effettuare la registrazione collegarsi al sito:

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

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

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

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

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

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

    +Le regole per ottenere la certificazione sono in via di definizione, l\' unica accettata è la conoscenza +diretta dell\' utente da parte dell\' amministratore. + @@ -343,6 +344,10 @@ $G_PG_cons_n = 345; /* printf("\n"); */ /* } */ +function nickserv_msg($dt, $msg) { + return sprintf('chatt_sub("%s",[0x040003,"%s"],"%s");', $dt, NICKSERV, $msg); +} + function passwd_gen($seed = NULL) { GLOBAL $G_PG_vow, $G_PG_vow_n, $G_PG_cons, $G_PG_cons_n; @@ -978,6 +983,71 @@ class Client_prefs { } } +define('GHOST_SESS_TOUT', 1800); +define('GHOST_SESS_REAS_LOUT', 1); // logout +define('GHOST_SESS_REAS_ANOT', 2); // another user get session +define('GHOST_SESS_REAS_TOUT', 3); // room timeout +define('GHOST_SESS_REAS_TTOT', 4); // table timeout + +class GhostSessEl +{ + var $time; + var $sess; + var $reas; + + function GhostSessEl($time, $sess, $reas) + { + $this->time = $time + GHOST_SESS_TOUT; + $this->sess = $sess; + $this->reas = $reas; + } +} + +class GhostSess +{ + var $gs; + + function GhostSess() + { + $this->gs = array(); + } + + // push or update for this session + function push($time, $sess, $reas) + { + foreach($this->gs as $el) { + if ($el->sess == "$sess") { + $el->reas = $reas; + $el->time = $time + GHOST_SESS_TOUT; + return TRUE; + } + } + + $this->gs[] = new GhostSessEl($time, $sess, $reas); + return TRUE; + } + + function pop($sess) + { + foreach($this->gs as $key => $el) { + if ($el->sess == "$sess") { + $ret = $this->gs[$key]; + unset($this->gs[$key]); + return ($ret); + } + } + return FALSE; + } + + function garbage_manager($curtime) + { + foreach($this->gs as $key => $el) { + if ($el->time < $curtime) { + unset($this->gs[$key]); + } + } + } +} class Brisk { @@ -994,13 +1064,16 @@ class Brisk var $ban_list; // ban list (authized allowed) var $black_list; // black list (anti-dos, noone allowed) - + var $ghost_sess; var $delay_mgr; + var $cds; + public static $sess_cur; function Brisk() { + $this->cds = NULL; } // constructor @@ -1010,7 +1083,7 @@ class Brisk fprintf(STDERR, "ROOM FROM FILE\n"); rename($crystal_filename, $crystal_filename.".old"); - $brisk->reload($ban_list, $black_list); + $brisk->reload(TRUE, $ban_list, $black_list); return($brisk); } @@ -1026,11 +1099,7 @@ class Brisk $thiz->ban_list = NULL; $thiz->black_list = NULL; - - fprintf(STDERR, "PRE IPCLASS_UPDATE (%d, %d)\n", count($ban_list), count($black_list)); - $thiz->ipclass_update('ban_list', $ban_list); - $thiz->ipclass_update('black_list', $black_list); - fprintf(STDERR, "POST IPCLASS_UPDATE %d %d\n", count($thiz->ban_list), count($thiz->black_list)); + $thiz->ghost_sess = new GhostSess(); for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $thiz->user[$i] = User::create($thiz, $i, "", ""); @@ -1046,6 +1115,8 @@ class Brisk static::$sess_cur = FALSE; + $thiz->reload(TRUE, $ban_list, $black_list); + return ($thiz); } @@ -1070,15 +1141,22 @@ class Brisk } } - function reload($ban_list, $black_list) + function reload($is_first, $ban_list, $black_list) { fprintf(STDERR, "RELOAD STUFF (%d)(%d)\n", count($ban_list), count($black_list)); + if (defined('CURL_DE_SAC_VERS')) { + if (brisk_cds_reload($this) == FALSE) { + exit(12); + } + } $this->ipclass_update("ban_list", $ban_list); $this->ipclass_update("black_list", $black_list); - $this->banned_kickoff(); - $this->garbage_manager(TRUE); + if (!$is_first) { + $this->banned_kickoff(); + $this->garbage_manager(TRUE); + } } function banned_kickoff() @@ -1104,7 +1182,7 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; - if ($user_cur->sess == "") + if ($user_cur->is_active() == FALSE) continue; // check if the IP is blacklisted @@ -1158,6 +1236,17 @@ class Brisk return (FALSE); } + function users_cleanup() + { + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + $user_cur = $this->user[$i]; + + if ($user_cur->the_end) { + $user_cur->reset(); // users_cleanup, OK + } + } + } + function garbage_manager($force) { GLOBAL $G_lang, $mlang_brisk, $G_base; @@ -1224,10 +1313,15 @@ class Brisk $bin5_user = $bin5->user[$i]; $user_cur->subst = $bin5_user->subst; + $user_cur->rd_step = $bin5_user->rd_step; $user_cur->step = $bin5_user->step; $user_cur->lacc = $bin5_user->lacc; $user_cur->laccwr = $bin5_user->lacc; $user_cur->bantime = $bin5_user->bantime; + $user_cur->the_end = $bin5_user->the_end; + if ($user_cur->the_end) { + $this->ghost_sess->push($curtime, $user_cur->sess, GHOST_SESS_REAS_TTOT); + } } log_legal($curtime, $user_cur->ip, $user_cur, "STAT:DESTROY_GAME", $plist); @@ -1280,22 +1374,23 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; - + log_rd2("User: ".$user_cur->name." stat: ".$user_cur->stat." subst: ".$user_cur->subst); - - if ($user_cur->sess == "") + + if ($user_cur->is_active() == FALSE) continue; - + if ($user_cur->lacc + EXPIRE_TIME_RD < ($curtime - $delta)) { // Auto logout dell'utente log_rd2("AUTO LOGOUT.".($user_cur->lacc + EXPIRE_TIME_RD)." curtime - delta ".($curtime - $delta)); + $this->ghost_sess->push($curtime, $user_cur->sess, GHOST_SESS_REAS_TOUT); + $user_cur->the_end = TRUE; + + log_rd2("AUTO LOGOUT."); if ($user_cur->stat == 'table' || $user_cur->stat == 'room') { log_auth($user_cur->sess, "Autologout session."); - $user_cur->reset(); - - log_rd2("AUTO LOGOUT."); if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table') $this->room_wakeup($user_cur); else if ($user_cur->subst == 'standup') @@ -1320,6 +1415,8 @@ class Brisk $this->garbage_timeout = $curtime + GARBAGE_TIMEOUT; $ismod = TRUE; + $this->ghost_sess->garbage_manager($curtime); + $this->delay_mgr->lastcheck_set($curtime); return ($ismod); } @@ -1390,35 +1487,35 @@ class Brisk $from_table = ($user->stat == "table"); if ($from_table) { - log_main("WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n); + log_main("WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n); - for ($i = 0 ; $i < $table->player_n ; $i++) { - $user_cur = $this->user[$table->player[$i]]; - log_main("PREIMPOST: INLOOP name: ".$user_cur->name); + for ($i = 0 ; $i < $table->player_n ; $i++) { + $user_cur = $this->user[$table->player[$i]]; + log_main("PREIMPOST: INLOOP name: ".$user_cur->name); - if ($user->idx_get() != $table->player[$i]) { - $user_cur->stat_set("room"); - $user_cur->subst = "sitdown"; - $user_cur->laccwr = $curtime; - } - else if ($user->sess != "") { - $user_cur->stat_set("room"); - $user_cur->subst = "standup"; - $user_cur->laccwr = $curtime; - $user_cur->table = -1; + if ($user->idx_get() != $table->player[$i]) { + $user_cur->stat_set("room"); + $user_cur->subst = "sitdown"; + $user_cur->laccwr = $curtime; + } + else if ($user->is_active()) { + $user_cur->stat_set("room"); + $user_cur->subst = "standup"; + $user_cur->laccwr = $curtime; + $user_cur->table = -1; + } } - } } else { - $user->stat_set("room"); - $user->subst = "standup"; - $user->laccwr = $curtime; + $user->stat_set("room"); + $user->subst = "standup"; + $user->laccwr = $curtime; } $remove_wagon = FALSE; if($table->wag_own == $user->idx_get()) { - $table->wag_reset($curtime); - $remove_wagon = TRUE; + $table->wag_reset($curtime); + $remove_wagon = TRUE; } @@ -1427,7 +1524,7 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; - if ($user_cur->sess == '' || $user_cur->stat != 'room') + if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or the stat isn't 'room' continue; // log_main("VALORI: name: ".$user_cur->name."from_table: ".$from_table." tab: ".$user_cur->table." taix: ".$table_idx." ucur: ".$user_cur." us: ".$user); @@ -1443,7 +1540,7 @@ class Brisk $ret .= $this->table_content($user_cur, $table_idx); $ret .= $this->standup_content($user_cur); - + // $ret .= table_act_content(FALSE, 0, $table_idx, $user->table, FALSE); $ret .= $table->act_content($user); @@ -1482,31 +1579,32 @@ class Brisk log_main("JOIN WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n); for ($i = 0 ; $i < $table->player_n ; $i++) { - $user_cur = $this->user[$table->player[$i]]; - log_main("PREIMPOST INLOOP name: ".$user_cur->name); - if ($user_cur->sess != "") { + $user_cur = $this->user[$table->player[$i]]; + log_main("PREIMPOST INLOOP name: ".$user_cur->name); + if ($user_cur->is_empty()) { + continue; + } if ($update_lacc == TRUE) { - $user_cur->laccwr = $curtime; + $user_cur->laccwr = $curtime; } log_main("cur: ".$user_cur->name." subst: ".$user_cur->subst); if ($user_cur->subst == "shutdowned") { - $user_cur->stat_set("room"); - $user_cur->subst = "sitdown"; + $user_cur->stat_set("room"); + $user_cur->subst = "sitdown"; } else if ($user_cur->subst == "shutdowner") { - $user_cur->stat_set("room"); - $user_cur->subst = "standup"; - $user_cur->table = -1; - $user_wup[$user_wup_n++] = $user_cur; - - $remove_wagon = FALSE; - if($table->wag_own == $table->player[$i]) { - $remove_wagon = TRUE; - $table->wag_reset($curtime); - } + $user_cur->stat_set("room"); + $user_cur->subst = "standup"; + $user_cur->table = -1; + $user_wup[$user_wup_n++] = $user_cur; + + $remove_wagon = FALSE; + if($table->wag_own == $table->player[$i]) { + $remove_wagon = TRUE; + $table->wag_reset($curtime); + } } $user_tab[$user_tab_n++] = $table->player[$i]; - } } for ($wup_idx = 0 ; $wup_idx < $user_wup_n ; $wup_idx++) @@ -1517,7 +1615,7 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { log_main("START LOOP"); $user_cur = $this->user[$i]; - if ($user_cur->sess == '' || $user_cur->stat != 'room') { + if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') { // is not active user or the stat isn't 'room' log_main("name: ".$user_cur->name."skip subst: ".$user_cur->subst); continue; } @@ -1531,7 +1629,7 @@ class Brisk $ret .= $this->table_content($user_cur, $table_idx); $ret .= $this->standup_content($user_cur); - + $ret .= $table->act_content($user_cur); @@ -1599,26 +1697,22 @@ class Brisk $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))); + $mesg = nickserv_msg($dt, 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))); + $mesg = nickserv_msg($dt, 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))); + $mesg = nickserv_msg($dt, 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))); + $mesg = nickserv_msg($dt, 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)); + $mesg = nickserv_msg($dt, sprintf($mlang_brisk['gua_err'][$G_lang], $ret)); } $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ".$mesg; @@ -1644,8 +1738,8 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $ret = ""; $user_cur = $this->user[$i]; - if ($user_cur->sess == '' || $user_cur->stat != 'room') - continue; + if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or the stat isn't 'room' + continue; $ret = "gst.st = ".($user_cur->step+1)."; "; if ($table_idx > -1) @@ -1685,7 +1779,7 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $ret = ""; $user_cur = $this->user[$i]; - if ($user_cur->sess == '' || $user_cur->stat != 'room') + if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or the stat isn't 'room' continue; $ret = "gst.st = ".($user_cur->step+1)."; ".$train_app; @@ -1773,6 +1867,37 @@ class Brisk /* for old isolation management $is_ticker = TRUE; */ } while (0); } // /tav chat command + // just for development use currently + else if (FALSE && strncmp($msg, "/out ", 5) == 0) { + fprintf(STDERR, "MOP OUT\n"); + $target = substr($msg, 5); + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + $user_out = $this->user[$i]; + if (!strcmp($user_out->name, $target)) { + + $user_out->the_end = TRUE; + fprintf(STDERR, "MOP: GHOST_SESS: %d\n", GHOST_SESS_REAS_LOUT); + $this->ghost_sess->push($curtime, $user_out->sess, GHOST_SESS_REAS_LOUT); + + if ($user_out->stat == 'table' || $user_out->stat == 'room') { + if ($user_out->subst == 'sitdown' || $user_out->stat == 'table') { + $this->room_wakeup($user_out); + } + else if ($user_out->subst == 'standup') { + $this->room_outstandup($user_out); + } + else { + log_rd2("LOGOUT FROM WHAT ???"); + } + } + + fprintf(STDERR, "MOP: OUT FIND [%s] step %d rd_step %d\n", $target, $user_out->step, $user_out->rd_step); + break; + } + } + } + + else if (strncmp($msg, "/alarm ", 7) == 0) { if (strncmp($msg, "/alarm to ", 10) == 0) { @@ -1796,8 +1921,7 @@ class Brisk /* MLANG: "Alarm %s inviato a %s." */ $prestr = sprintf($mlang_brisk['alarret'][$G_lang], xcape(substr($msg, strlen($alarm_check))), ($target == "" ? $mlang_brisk['tit_all'][$G_lang] : xcape($target)) ); - $to_user = sprintf('chatt_sub("%s",[2,"%s"],%s);', - $dt, NICKSERV, $prestr); + $to_user = nickserv_msg($dt, $prestr); $msg = sprintf("
    %s

    %s

    ", $dt.NICKSERV, xcape(substr($msg, strlen($alarm_check)))); @@ -1812,7 +1936,7 @@ class Brisk $flags_old = 0; if ($user->stat == 'room' && $user->subst == 'sitdown' && $user->table >= TABLES_AUTH_N) { - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['listmust'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['listmust'][$G_lang]); } else { @@ -1845,7 +1969,7 @@ class Brisk } else { /* MLANG: "Per autenticare qualcuno devi a tua volta essere autenticato.", "Il nickname deve contenere almeno una lettera dell\'alfabeto o una cifra.", "Nickname %s già in uso." */ - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['authmust'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['authmust'][$G_lang]); } } else if (strncmp($msg, "/mesgtoadm", 8) == 0) { @@ -1854,7 +1978,7 @@ class Brisk } else { /* MLANG: "Per inviare un messaggio devi essere autenticato." */ - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['mesgmust'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['mesgmust'][$G_lang]); } } else if (strncmp($msg, "/nick ", 6) == 0) { @@ -1862,7 +1986,7 @@ class Brisk do { if (($name_new = validate_name(substr($msg, 6))) == FALSE) { - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['nickmust'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['nickmust'][$G_lang]); break; } @@ -1870,14 +1994,14 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; - if ($user_cur->sess == '') + if ($user_cur->is_active() == FALSE) continue; if (strcasecmp($user_cur->name,$name_new) == 0) break; } if ($i < MAX_PLAYERS) { $prestr = sprintf($mlang_brisk['nickdupl'][$G_lang], xcape($name_new)); - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $prestr); + $to_user = nickserv_msg($dt, $prestr); break; } @@ -1895,7 +2019,7 @@ class Brisk } } else { - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['authchan'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['authchan'][$G_lang]); break; } } @@ -1908,7 +2032,7 @@ class Brisk /* MLANG: "Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */ if ($bdb->login_exists($name_new)) { $prestr = sprintf($mlang_brisk['nickjust'][$G_lang], xcape($name_new)); - $to_user .= sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $prestr); + $to_user .= nickserv_msg($dt, $prestr); } } } @@ -1979,7 +2103,7 @@ class Brisk } else { /* MLANG: "Questo stato non esiste." */ - $to_user = sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, $mlang_brisk['statunkn'][$G_lang]); + $to_user = nickserv_msg($dt, $mlang_brisk['statunkn'][$G_lang]); break; } @@ -2049,7 +2173,9 @@ class Brisk $user_cur = $this->user[$i]; if ($target != "" && $user_cur->name != $target) continue; - if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user->idx_get() == $i) + if ($user_cur->is_active() == FALSE // is not active user + || $user_cur->stat == 'table' // or stat is 'table' + || $user->idx_get() == $i) // or the $user idx is equal to current var continue; if ($is_normchat == TRUE) { @@ -2114,30 +2240,32 @@ class Brisk function get_user($sess, &$idx) { - GLOBAL $PHP_SELF; + GLOBAL $PHP_SELF; - if (validate_sess($sess)) { - for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - if (strcmp($sess, $this->user[$i]->sess) == 0) { - // find it - $idx = $i; - $ret = $this->user[$i]; - return ($ret); - } + if (validate_sess($sess)) { + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + if ($this->user[$i]->is_empty()) + continue; + if (strcmp($sess, $this->user[$i]->sess) == 0) { + // find it + $idx = $i; + $ret = $this->user[$i]; + return ($ret); + } + } + log_main(sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF)); + // for ($i = 0 ; $i < MAX_PLAYERS ; $i++) + // log_main(sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess)); + } + else { + log_main(sprintf("get_user: Wrong strlen [%s]",$sess)); } - log_main(sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF)); - // for ($i = 0 ; $i < MAX_PLAYERS ; $i++) - // log_main(sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess)); - } - else { - log_main(sprintf("get_user: Wrong strlen [%s]",$sess)); - } - return (FALSE); + return (FALSE); } /* - * function add_user(&$brisk, &$sess, &$idx, $name, $pass, $ip) + * function add_user(&$brisk, &$sess, &$idx, $name, $pass, $ip, $header, $cookie) * * RETURN VALUE: * if ($idx > -1 && ret == FALSE) => duplicated nick @@ -2148,7 +2276,7 @@ class Brisk * if ($idx == -$idx && ret == user) => SUCCESS (but the login exists in the auth db) */ - function add_user(&$sess, &$idx, $name, $pass, $ip, $cookie) + function add_user(&$sess, &$idx, $name, $pass, $ip, $header, $cookie) { GLOBAL $G_base; @@ -2199,25 +2327,28 @@ class Brisk // no actions at this moment } for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - /* free user ? */ - if (strcmp($sess, $this->user[$i]->sess) == 0) { - if ($idx == -1) - $idx = $i; - } - 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) { - $ghost = $i; - $ghost_auth = $this->user[$i]->is_auth(); - } - else { - $idx = $i; - break; - } - } + /* free user ? */ + if ($this->user[$i]->is_empty()) { + if ($idfree == -1) { + $idfree = $i; + } + continue; + } + if (strcmp($sess, $this->user[$i]->sess) == 0) { + if ($idx == -1) { + $idx = $i; + } + } + if (strcasecmp($this->user[$i]->name, $name_new) == 0) { + if ($authenticate != FALSE) { + $ghost = $i; + $ghost_auth = $this->user[$i]->is_auth(); + } + else { + $idx = $i; + break; + } + } } if ($idx == -1) $idx = $idfree; @@ -2231,6 +2362,7 @@ class Brisk $ghost_user = $this->user[$ghost]; $curtime = time(); + $this->ghost_sess->push($curtime, $ghost_user->sess, GHOST_SESS_REAS_ANOT); $ghost_user->comm[$ghost_user->step % COMM_N] = ""; $ghost_user->step_inc(); if ($sess == "") { @@ -2257,6 +2389,9 @@ class Brisk } $idx = $ghost; + if (defined('CURL_DE_SAC_VERS')) { + brisk_cds_execute($this, $ghost, $idx, $sess, $ip, $authenticate, $header); + } return ($this->user[$ghost]); } else if ($idx != -1 && $i == MAX_PLAYERS) { @@ -2356,6 +2491,9 @@ class Brisk log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s] count [%d] name [%s] code [%s]", $idx, $sess, $name_new, count($this->user),$this->user[$real_idx]->name, $this->user[$real_idx]->code)); $ret = $this->user[$real_idx]; + if (defined('CURL_DE_SAC_VERS')) { + brisk_cds_execute($this, $ghost, $real_idx, $sess, $ip, $authenticate, $header); + } return ($ret); } @@ -2366,7 +2504,7 @@ class Brisk { for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; - if ($user_cur->sess == '') + if ($user_cur->is_active() == FALSE) continue; log_main("STANDUP START: ".$user_cur->stat); @@ -2377,7 +2515,7 @@ class Brisk $user_cur->comm[$user_cur->step % COMM_N] .= $user->myname_innerHTML(); } log_main("FROM STANDUP: NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]); - + $user_cur->step_inc(); } } @@ -2397,24 +2535,17 @@ class Brisk function standup_content($user) { $ret = ""; - $content = ""; if ($user->stat != 'room') return; - for ($i = 0 , $ct = 0 ; $ct < 4 && $i < MAX_PLAYERS ; $i++) { - if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "") - continue; - $ct++; - } - - // $content .= sprintf('', $ct); - $content = ' j_stand_cont( [ '; $user_cur_id = $user->idx_get(); for ($i = 0 , $ct = 0 ; $i < MAX_PLAYERS ; $i++) { - if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "") + if ($this->user[$i]->is_active() == FALSE // is not active user + || $this->user[$i]->stat != "room" // or the stat isn't 'room' + || $this->user[$i]->name == "") // or the name is empty, happens when user is reset (TODO: check it) continue; $flags = $this->user[$i]->flags; @@ -2516,7 +2647,7 @@ class Brisk case "": case "index.php": ob_start(); - index_main($this, $transp_type, $header_out, $addr, $get, $post, $cookie); + index_main($this, $transp_type, $header, $header_out, $addr, $get, $post, $cookie); $content = ob_get_contents(); ob_end_clean(); @@ -2708,6 +2839,60 @@ function log_mop($step, $log) } } +function log_step($log) +{ + GLOBAL $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_STEP) == 0) + return; + + $sess = Brisk::sess_cur_get(); + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_STEP) == 0) + return; + + if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/step.log", 'a')) != FALSE) { + fwrite($fp, sprintf("STEP: [%f] [%s] [%s]\n", gettimeofday(TRUE), $log, $btrace)); + fclose($fp); + } +} + + + +function log_cds($log) +{ + GLOBAL $PHP_SELF; + + if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CDS) == 0) + return; + + $sess = Brisk::sess_cur_get(); + if (isset($sess) == FALSE) + $ssess = "XXXX"; + else + $ssess = $sess; + + if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CDS) == 0) + return; + + if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC) + $btrace = btrace_line(debug_backtrace()); + else + $btrace = ""; + if (($fp = @fopen(LEGAL_PATH."/cds.log", 'a')) != FALSE) { + fwrite($fp, sprintf("CDS: [%f] [%s] [%s]\n", gettimeofday(TRUE), $log, $btrace)); + fclose($fp); + } +} + function log_only2($log) { @@ -3091,7 +3276,7 @@ function root_welcome($user) $dt = date("H:i ", $curtime); for ($i = 0 ; $i < count($root_wellarr[$G_lang]) ; $i++) - $ret .= sprintf('chatt_sub("%s",[2,"%s"],"%s");', $dt, NICKSERV, str_replace('"', '\"', $root_wellarr[$G_lang][$i])); + $ret .= nickserv_msg($dt, str_replace('"', '\"', $root_wellarr[$G_lang][$i])); return ($ret); }