X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=26c1452dcbd18e942729a73294adbf5d570c10ab;hb=a838a4cb3f09dec55f9edb3d882d30320faa3eef;hp=865880a3b043ca7e8c8ac1e380e4dcb2e656fa32;hpb=797ca6fe7c0f9754599f82167edb3cdddc70593c;p=brisk.git
diff --git a/web/brisk.phh b/web/brisk.phh
index 865880a..26c1452 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -2,7 +2,7 @@
/*
* brisk - brisk.phh
*
- * Copyright (C) 2006 matteo.nastasi@milug.org
+ * Copyright (C) 2006-2007 matteo.nastasi@milug.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
define(FTOK_PATH, "/var/lib/brisk");
define(LEGAL_PATH, "/tmp/legal_brisk");
+define(PROXY_PATH, "/var/lib/brisk_proxy");
define(TABLES_N, 8);
define(PLAYERS_N, 3);
define(MAX_POINTS, 5);
@@ -39,9 +40,9 @@ define(BRISK_DEBUG, FALSE);
// define(DEBUGGING, "local");
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "0.6.1";
+$G_brisk_version = "0.7.0";
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': log per il tracciamento di eventuali illeciti.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': "donate" e piccole rifiniture.',
'Se vuoi iscriverti alla Mailing List, cliccala!' );
$table_wellarr = Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non può risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.');
@@ -103,13 +104,13 @@ class Card {
function Card($value, $stat, $owner)
{
$this->value = $value;
- $this->stat = $stat;
+ $this->stat = $stat; // Card stat
$this->owner = $owner;
}
function assign($stat,$owner)
{
- $this->stat = $stat;
+ $this->stat = $stat; // Card stat
$this->owner = $owner;
}
@@ -120,14 +121,14 @@ class Card {
function play($x,$y)
{
- $this->stat = 'table';
+ $this->stat = 'table'; // Card stat
$this->x = $x;
$this->y = $y;
}
function take($newown)
{
- $this->stat = 'take';
+ $this->stat = 'take'; // Card stat
$this->owner = $newown;
}
}
@@ -350,6 +351,7 @@ class Table {
class User {
var $name; // name of the user
var $sess; // session of the user
+ var $ip; // ip of the user
var $lacc; // last access (for the cleanup)
var $laccwr; // last access (for the cleanup)
var $bantime; // timeout to temporary ban
@@ -380,11 +382,58 @@ class User {
$this->asta_pnt = -1;
$this->handpt = -1;
$this->exitislock = TRUE;
-
+
$this->table = $table;
}
+
+ function stat_set($stat) {
+ $this->stat = "$stat";
+
+ /*
+ if (validate_sess($this->sess)) {
+ $fp = fopen(PROXY_PATH."/".$this->sess.".stat", 'w');
+ fwrite($fp, sprintf("%s\n",$this->stat));
+ fclose($fp);
+ }
+ */
+ }
+
+ function step_set($step) {
+ $this->step = $step;
+
+ if (validate_sess($this->sess)) {
+ $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
+ fwrite($fp, pack("l",$this->step), 4);
+ fclose($fp);
+ }
+ }
+
+ function step_inc() {
+ $this->step++;
+
+ if (validate_sess($this->sess)) {
+ $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
+ fwrite($fp, pack("l",$this->step), 4);
+ fclose($fp);
+ }
+ }
+}
+
+function step_get($sess) {
+ $fp = fopen(PROXY_PATH."/".$sess.".step", 'r');
+ $arr = unpack('l', fread($fp, 4));
+ fclose($fp);
+
+ // log_rd2($sess, "A0: ".$arr[0]." A1: ".$arr[1]);
+ return ($arr[1]);
+}
+
+function step_unproxy($sess) {
+ log_rd2($sess, "UNPROXY: ".PROXY_PATH."/".$sess.".step");
+ unlink(PROXY_PATH."/".$sess.".step");
}
+
class brisco {
var $user;
var $table;
@@ -421,7 +470,9 @@ class brisco {
if ($user_cur->stat == 'table' || $user_cur->stat == 'room') {
log_auth($user_cur->sess, "Autologout session.");
+ $tmp_sess = $user_cur->sess;
$user_cur->sess = "";
+ step_unproxy($tmp_sess);
$user_cur->name = "";
$user_cur->the_end = FALSE;
@@ -440,7 +491,7 @@ class brisco {
$this->room_wakeup(&$user_cur);
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
$user_cur->comm[$user_cur->step % COMM_N] .= show_notify("
Sei stato inattivo per ".(EXPIRE_TIME_SMAMMA/60.0)." minuti.
Quindi ritorni tra i Giocatori in piedi.", 0, "torna ai tavoli", 400, 100);
- $user_cur->step++;
+ $user_cur->step_inc();
}
}
}
@@ -448,6 +499,9 @@ class brisco {
$this->garbage_timeout = time() + GARBAGE_TIMEOUT;
}
+
+ // BAN_IP_CLEAN
+
}
@@ -469,12 +523,12 @@ class brisco {
log_main("PREIMPOST", "INLOOP name: ".$user_cur->name);
if ($user_cur != $user) {
- $user_cur->stat = "room";
+ $user_cur->stat_set("room");
$user_cur->subst = "sitdown";
$user_cur->laccwr = $curtime;
}
else if ($user->sess != "") {
- $user_cur->stat = "room";
+ $user_cur->stat_set("room");
$user_cur->subst = "standup";
$user_cur->laccwr = $curtime;
$user_cur->table = -1;
@@ -482,7 +536,7 @@ class brisco {
}
}
else {
- $user->stat = "room";
+ $user->stat_set("room");
$user->subst = "standup";
$user->laccwr = $curtime;
}
@@ -528,7 +582,7 @@ class brisco {
}
log_wr($user_cur->sess, "ROOM_WAKEUP: ".$ret);
$user_cur->comm[$user_cur->step % COMM_N] = $ret;
- $user_cur->step++;
+ $user_cur->step_inc();
}
}
@@ -563,7 +617,7 @@ class brisco {
$ret .= sprintf('$("myname").innerHTML = "%s: ";', xcape($user->name));
}
$user_cur->comm[$user_cur->step % COMM_N] = $ret;
- $user_cur->step++;
+ $user_cur->step_inc();
}
log_main("table_update", "post");
@@ -602,7 +656,7 @@ class brisco {
}
}
$user_cur->comm[$user_cur->step % COMM_N] = $ret;
- $user_cur->step++;
+ $user_cur->step_inc();
}
}
@@ -623,7 +677,7 @@ class brisco {
if (($name_new = validate_name(substr($user_mesg, 6))) == FALSE) {
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
$user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s","Il nickname deve contenere almeno una lettera o una cifra.");', $dt.NICKSERV, xcape($name_new));
- $user->step++;
+ $user->step_inc();
return;
}
@@ -640,7 +694,7 @@ class brisco {
if ($user_cur->name == $name_new) {
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
$user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s","Nickname %s già in uso.");', $dt.NICKSERV, xcape($name_new));
- $user->step++;
+ $user->step_inc();
break;
}
}
@@ -682,7 +736,7 @@ class brisco {
if ($user_cur == $user)
$user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s";',
xcape($user->name,ENT_COMPAT,"UTF-8"));
- $user_cur->step++;
+ $user_cur->step_inc();
}
}
}
@@ -701,7 +755,7 @@ class brisco {
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
$user_cur->comm[$user_cur->step % COMM_N] .= sprintf('chatt_sub("%s","%s");',
$dt.xcape($user->name), xcape($user_mesg));
- $user_cur->step++;
+ $user_cur->step_inc();
}
log_legal($timecur, $user->sess, $user->name,
($user->stat == 'room' ? 'room' : 'table '.$user->table),$user_mesg);
@@ -711,8 +765,8 @@ class brisco {
function &get_user($sess, &$idx)
{
GLOBAL $PHP_SELF;
-
- if (strlen($sess) == SESS_LEN) {
+
+ if (validate_sess($sess)) {
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
if (strcmp($sess, $this->user[$i]->sess) == 0) {
// find it
@@ -732,7 +786,7 @@ class brisco {
}
/*
- * function &add_user(&$bri, &$sess, &$idx, $name)
+ * function &add_user(&$bri, &$sess, &$idx, $name, $ip)
*
* RETURN VALUE:
* if ($idx != -1 && ret == FALSE) => duplicated nick
@@ -740,7 +794,7 @@ class brisco {
* if ($idx == -1 && ret == FALSE) => no space left
* if (ret == TRUE) => SUCCESS
*/
- function &add_user(&$sess, &$idx, $name)
+ function &add_user(&$sess, &$idx, $name, $ip)
{
$idx = -1;
$idfree = -1;
@@ -785,12 +839,12 @@ class brisco {
$this->user[$idx]->sess = $sess;
}
$this->user[$idx]->name = $name_new;
- $this->user[$idx]->stat = "room";
+ $this->user[$idx]->stat_set("room");
$this->user[$idx]->subst = "standup";
$this->user[$idx]->lacc = $curtime;
$this->user[$idx]->laccwr = $curtime;
$this->user[$idx]->bantime = 0;
-
+ $this->user[$idx]->ip = $ip;
log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
return ($this->user[$idx]);
@@ -815,7 +869,7 @@ class brisco {
log_main("FROM STANDUP", "NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]);
- $user_cur->step++;
+ $user_cur->step_inc();
}
}
}
@@ -936,6 +990,28 @@ function unlock_data($res)
}
+function lock_banlist()
+{
+ if (($tok = ftok(FTOK_PATH."/main", "L")) == -1) {
+ echo "FTOK FAILED";
+ exit;
+ }
+ if (($res = sem_get($tok)) == FALSE) {
+ echo "SEM_GET FAILED";
+ exit;
+ }
+ if (sem_acquire($res))
+ return ($res);
+ else
+ return (false);
+}
+
+function unlock_banlist($res)
+{
+ return (sem_release($res));
+}
+
+
function &load_data()
{
if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
@@ -1513,7 +1589,7 @@ function calculate_winner(&$table)
for ($i = 0 ; $i < PLAYERS_N ; $i++) {
$table->card[$ontid[$i]]->owner = $cur_win;
- $table->card[$ontid[$i]]->stat = "take";
+ $table->card[$ontid[$i]]->stat = "take"; // Card stat
}
return ($cur_win);
}