X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2FObj%2Fbrisk.phh;h=34e08b03e5f03993b3c097536036dbbed7ce15df;hb=e50ff5b78be70468c56ee5218a5ef10e60901ef7;hp=2100fb9c957e736cd3dc0599498b1e6b1a4a5ebb;hpb=905faa3e218eb6a89f175e005c94dc7d5fb2d013;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 2100fb9..34e08b0 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
@@ -65,6 +65,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);
@@ -128,13 +129,13 @@ $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.0 - trusty";
+$G_brisk_version = "2.5.0";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': modalità isolamento, splash window, migliorate le classifiche.',
- 'Se vuoi iscriverti alla Mailing List, cliccala!' ),
- 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: isolation mode, splash window, placings enhanced.',
- '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 +209,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 +277,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 +312,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 +333,6 @@ function csplitter($in, $sep)
return ($out);
}
-
function xcape($s)
{
$from = array ( '\\', '@', '|' );
@@ -564,10 +586,22 @@ 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 $code; // authentication code
var $name; // name of the user
var $sess; // session of the user
var $ip; // ip of the user
@@ -607,6 +641,7 @@ class User {
if (($thiz =& new User()) == FALSE)
return ($G_false);
+ $thiz->code = -1;
$thiz->name = $name;
$thiz->sess = $sess;
$thiz->ip = $ip;
@@ -643,6 +678,7 @@ class User {
{
GLOBAL $G_false;
+ $this->code = $from->code;
$this->name = $from->name;
$this->sess = $from->sess;
$this->ip = $from->ip;
@@ -704,6 +740,7 @@ class User {
if (($thiz =& new User()) == FALSE)
return ($G_false);
+ $thiz->code = $from->code;
$thiz->name = $from->name;
$thiz->sess = $from->sess;
$thiz->ip = $from->ip;
@@ -746,6 +783,10 @@ class User {
return ($thiz);
}
+
+ function code_get() {
+ return ($this->code);
+ }
function stat_set($stat) {
log_main("sess: [".$this->sess. "] NEW STAT: [".$stat."]");
@@ -897,7 +938,7 @@ class Room {
function garbage_manager($force)
{
- GLOBAL $G_lang, $mlang_brisk;
+ GLOBAL $G_lang, $mlang_brisk, $G_base;
$ismod = FALSE;
@@ -908,7 +949,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++) {
@@ -1256,7 +1297,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,7 +1438,7 @@ 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
@@ -1567,12 +1608,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,9 +1627,10 @@ 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();
+ $bdb = new BriskDB();
+ $bdb->users_load();
/* MLANG: "Il nickname
\'%s\' è già registrato,
se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN." */
- if ($userdb->login_exists($name_new)) {
+ 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);
}
@@ -1633,6 +1675,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 +1784,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];
@@ -1830,17 +1881,19 @@ class Room {
function &add_user(&$sess, &$idx, $name, $pass, $ip)
{
- GLOBAL $G_false, $CO_list;
+ GLOBAL $G_base, $G_false, $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);
@@ -1852,19 +1905,23 @@ class Room {
/* if pass != FALSE verify the login with pass */
log_auth("XXX", "auth1");
- $userdb = new LoginDB();
+ $bdb = new BriskDB();
+ $bdb->users_load();
if ($pass != FALSE) {
log_auth("XXX", "auth2");
- $authenticate = $userdb->login_verify($name_new, $pass);
- log_auth("XXX", "authenticate: ".($authenticate == TRUE ? "TRUE" : "FALSE"));
+ $authenticate = $bdb->login_verify($name_new, $pass, $code);
+ log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE"));
- if ($authenticate == FALSE) {
- $idx = -3;
- return ($G_false);
+ if ($authenticate != FALSE) {
+ $user_type = $authenticate->type_get();
+ }
+ else {
+ $idx = -3;
+ return ($G_false);
}
}
else {
- $login_exists = $userdb->login_exists($name_new);
+ $login_exists = $bdb->login_exists($name_new);
}
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
/* free user ? */
@@ -1877,14 +1934,14 @@ class Room {
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 +1949,7 @@ 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) {
+ if ($ghost > -1 && $ghost_auth && ($authenticate != FALSE)) {
/* swap session */
$ghost_user =& $this->user[$ghost];
@@ -1910,7 +1967,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 +2003,13 @@ 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 = ($authenticate != FALSE ? USER_FLAG_AUTH : 0x00) | $user_type;
+
+ 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,11 +2066,13 @@ 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);
@@ -2247,8 +2310,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 +2346,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 +2366,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 +2386,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 +2406,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 +2426,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 +2446,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 +2466,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 +2486,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 +2506,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 +2526,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 +2540,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 +2560,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()
{