X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=de606829605ad11f461d664b95739dab38e04a53;hb=07c17bc6b57350654f6da42b27dc57ac3ea6d8ad;hp=bc65746240f0b557d5de4419ee2957b648acc98c;hpb=e246dc1e59ed187a121f0cae319881f40e1fd426;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index bc65746..de60682 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -153,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.15.0";
+$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\': primo passo per rendere più robusto il sistema di notifica.',
+$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, refactored sidebanner 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' => '
@@ -983,8 +983,12 @@ class Client_prefs {
}
}
-define('GHOST_SESS_TOUT', 300);
-define('GHOST_SESS_REAS_ANOT', 1);
+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;
@@ -1315,6 +1319,9 @@ class Brisk
$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);
@@ -1377,6 +1384,7 @@ class Brisk
// 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.");
@@ -1859,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) {
@@ -2100,10 +2139,27 @@ class Brisk
$to_user = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape("== chat ban =="));
}
else {
- $to_user = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape($msg));
- // temporary silentiation for troll (will became array check)
- // if (strcasecmp($user->name,'JackRokka') != 0 && $user->sess != '47ea653f602e8')
- $to_room = $to_user;
+ if ( TRUE && (! $user->is_auth()) ) {
+ $to_user = nickserv_msg($dt, xcape("Visto l'elevato numero di molestatori che ultimamente hanno preso dimora su Brisk abbiamo deciso"));
+ $to_user .= nickserv_msg($dt, xcape("di disattivare temporaneamente la chat in room per i non registrati, non ce ne vogliate e buone feste."));
+ $aug_head = array("Tanti", "Tantissimi", "Un enormità ", "Un milione", "Un' esagerazione");
+ $aug_body = array("a tutti gli utenti", "a tutti gli uomini", "a tutte le donne", "a tutti gli utenti");
+ $aug_tail = array("di Brisk", "del sito", "della ciurma", "della comitiva", "del gruppo");
+
+ $auguri = sprintf("%s auguri %s %s.",
+ $aug_head[mt_rand(0, count($aug_head)-1)],
+ $aug_body[mt_rand(0, count($aug_body)-1)],
+ $aug_tail[mt_rand(0, count($aug_tail)-1)]);
+
+ $to_room = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name),
+ xcape($auguri));
+ }
+ else {
+ $to_user = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape($msg));
+ // temporary silentiation for troll (will became array check)
+ // if (strcasecmp($user->name,'JackRokka') != 0 && $user->sess != '47ea653f602e8')
+ $to_room = $to_user;
+ }
}
log_legal($curtime, $user->ip, $user,
@@ -2234,7 +2290,7 @@ class Brisk
* 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 + 1) && ret == user) => SUCCESS (but the login exists in the auth db)
*/
function add_user(&$sess, &$idx, $name, $pass, $ip, $header, $cookie)
@@ -2351,7 +2407,7 @@ class Brisk
$idx = $ghost;
if (defined('CURL_DE_SAC_VERS')) {
- brisk_cds_execute($this, $ghost, $real_idx, $sess, $ip, $authenticate, $header);
+ brisk_cds_execute($this, $ghost, $idx, $sess, $ip, $authenticate, $header);
}
return ($this->user[$ghost]);
}