X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2FObj%2Fbrisk.phh;h=cad94201568df618e40094503437caafb4b92f0b;hb=2e538b5aad894f5cec1ee2969b1f028bd2ba6d75;hp=a18b96c8cc8978b6a970a365ab9c9f444733f038;hpb=95bdfa257b2bd14ae7572fa26953cf62b9074b88;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index a18b96c..cad9420 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
@@ -53,6 +53,7 @@ define(BAN_TIME, 3600);
define(GARBAGE_TIMEOUT, 10);
define(NICKSERV, "BriskServ");
+
define(DBG_ONL2, 0x0001);
define(DBG_ONLY, 0x0002);
define(DBG_MAIN, 0x0004);
@@ -64,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);
@@ -104,16 +106,21 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
'en' => 'The nickname have to contain at least one letter or one number.'),
'nickdupl' => array( 'it' => 'Nickname %s già in uso.',
'en' => 'The nickname %s is already in use.'),
- 'authchan' => array( 'it' => 'Non puoi cambiare nick a un tavolo per soli autenticati.',
- 'en' => 'You can\'t change your nickname into a table for only authenticated.'),
+ 'authchan' => array( 'it' => 'Non puoi cambiare nick a un tavolo per soli autenticati o se sei in modalità isolata.',
+ 'en' => 'You can\'t change your nickname into a table for only authenticated or if you are in isolation mode.'),
'nickjust' => array( 'it' => 'Il nickname \'%s\' è già registrato, se il suo proprietario si autentificherà verrai rinominato d\'ufficio come ghostN.',
'en' => 'The nickname \'%s\' is already registered, if its proprietary will authenticate you will named again officially ghostN.'), // FIXME: him ???
'statunkn' => array( 'it' => 'Questo stato non esiste.',
'en' => 'This state don\'t exists.'),
'tabincon' => array( 'it' => '
I dati del tavolo n° %d sono inconsistenti, verranno resettati.
Torni in piedi.
',
'en' => 'EN
I dati del tavolo n° %d sono inconsistenti, verranno resettati.
Torni in piedi.
'),
+ 'listmust' => array( 'it' => 'Per andare in isolamento non bisogna essere seduti a tavoli non riservati.',
+ 'en' => 'To go to isolation you must don\'t stay on not reserved tables'),
+
'tit_onauth'=>array( 'it' => '(solo aut.)',
'en' => '(only aut.)'),
+ 'tit_onisol'=>array( 'it' => '(isolam.to)',
+ 'en' => '(isolation)')
);
@@ -122,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.2.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\': bug della carta coperta risolto, assenso all\'apertura del tavolo non revocabile, multi-lingua quasi ultimato.',
- 'Se vuoi iscriverti alla Mailing List, cliccala!' ),
- 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: Multi-language support',
- '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' => '
@@ -202,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:
@@ -284,19 +292,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;
}
}
@@ -304,7 +313,6 @@ function csplitter($in, $sep)
return ($out);
}
-
function xcape($s)
{
$from = array ( '\\', '@', '|' );
@@ -398,7 +406,7 @@ class Table {
$this->wakeup_time = $from->wakeup_time;
}
- function &clone(&$from)
+ function &myclone(&$from)
{
GLOBAL $G_false;
@@ -542,7 +550,11 @@ class Table {
// User flags
define(USER_FLAG_AUTH, 0x02);
+
+define(USER_FLAG_MAP_AUTH, 0x0c);
+
define(USER_FLAG_LISTAUTH, 0x04);
+define(USER_FLAG_ISOLAUTH, 0x08);
// user status
define(USER_FLAG_S_NORM, 0x000); // done
@@ -553,9 +565,18 @@ define(USER_FLAG_S_EAT, 0x400); // done
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, 0xf0000); // done
+define(USER_FLAG_TY_NORM, 0x10000); // done
+define(USER_FLAG_TY_SUPER, 0x20000); // done
+
class User {
var $name; // name of the user
var $sess; // session of the user
@@ -674,7 +695,7 @@ class User {
}
- function &clone(&$from)
+ function &myclone(&$from)
{
GLOBAL $G_false;
@@ -1057,7 +1078,10 @@ class Room {
$ret = sprintf('gst.st = %d; ', $user_step);
- if ($user->flags & USER_FLAG_LISTAUTH) {
+ if ($user->flags & USER_FLAG_ISOLAUTH) {
+ $ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); ';
+ }
+ else if ($user->flags & USER_FLAG_LISTAUTH) {
$ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); ';
}
else {
@@ -1077,6 +1101,7 @@ class Room {
$itou = ($user->flags & USER_FLAG_AUTH ? "" : "");
$ret .= sprintf('$("myname").innerHTML = "%s%s%s";', $itin, xcape($user->name), $itou);
for ($i = 0 ; $i < TABLES_N ; $i++) {
+
$ret .= $this->table_content($user, $i);
// $ret .= table_act_content(($user->subst == 'standup'), $this->table[$i]->player_n, $i, $user->table,
// ($this->table[$i]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH));
@@ -1144,7 +1169,7 @@ class Room {
if ($user_cur->sess == '' || $user_cur->stat != '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);
+ // log_main("VALORI: name: ".$user_cur->name."from_table: ".$from_table." tab: ".$user_cur->table." taix: ".$table_idx." ucur: ".$user_cur." us: ".$user);
$ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : "");
if ($from_table && ($user_cur->table == $table_idx || $user_cur == $user)) {
@@ -1241,7 +1266,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") {
@@ -1399,6 +1424,7 @@ class Room {
$to_room = FALSE;
$to_tabl = FALSE;
$is_normchat = FALSE;
+ /* for old isolation management $is_ticker = FALSE; */
$update_room = FALSE;
if (strcmp($msg, "/tav") == 0 ||
@@ -1437,7 +1463,7 @@ class Room {
$table->wag_set($user, $msg);
$to_user = sprintf('tra.add(%d, "%s");', $user->table, xcape(sprintf("%s: %s", $user->name, $msg)));
$to_room = $to_user;
-
+ /* for old isolation management $is_ticker = TRUE; */
} while (0);
} // /tav chat command
@@ -1475,13 +1501,35 @@ class Room {
else if (strncmp($msg, "/listen ", 8) == 0) {
$arg = substr($msg, 8);
- if (strcasecmp($arg, "auth") == 0) {
+ if (strcasecmp($arg, "isolation") == 0) {
+ $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]);
+
+ }
+ else {
+ $user->flags &= ~USER_FLAG_MAP_AUTH;
+ $user->flags |= USER_FLAG_ISOLAUTH;
+ $to_user = 'list_set(\'isolation\', true, \''.$mlang_brisk['tit_onisol'][$G_lang].'\'); ';
+ }
+ }
+ else if (strcasecmp($arg, "auth") == 0) {
+ $flags_old = $user->flags;
+ $user->flags &= ~USER_FLAG_MAP_AUTH;
$user->flags |= USER_FLAG_LISTAUTH;
$to_user = 'list_set(\'auth\', true, \''.$mlang_brisk['tit_onauth'][$G_lang].'\'); ';
}
else {
- $user->flags &= ~USER_FLAG_LISTAUTH;
+ $flags_old = $user->flags;
+ $user->flags &= ~USER_FLAG_MAP_AUTH;
$to_user = 'list_set(\'all\', true, \'\'); ';
+
+ }
+ // if from isolation redraw standup area
+ if (($flags_old ^ $user->flags) & USER_FLAG_ISOLAUTH) {
+ $to_user .= 'standup_data_old = null; '.$this->standup_content($user);
+
}
}
else if (strcmp($msg, "/authreq") == 0) {
@@ -1529,8 +1577,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->subst == 'standup' || ($user->subst != 'standup' && $this->table[$user->table]->auth_only == FALSE)) {
- $user->flags &= ~USER_FLAG_AUTH; // Remove auth if name changed
+ 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 | USER_FLAG_TY_ALL); // Remove auth if name changed
for ($i = 0 ; $i < TABLES_N ; $i++) {
$to_user .= $this->table[$i]->act_content($user);
}
@@ -1588,6 +1640,18 @@ class Room {
else if (strcasecmp($st_str, "presente") == 0) {
$st = USER_FLAG_S_EYE;
}
+ 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]);
@@ -1665,13 +1729,21 @@ class Room {
continue;
if ($is_normchat == TRUE) {
- if ($user_cur->flags & USER_FLAG_LISTAUTH) {
+ // use MAP_AUTH to check if auth or isolation
+ if ($user_cur->flags & USER_FLAG_MAP_AUTH) {
if (($user->flags & USER_FLAG_AUTH) == 0) {
continue;
}
}
}
-
+ /*
+ else if ($is_ticker) {
+ if (($user_cur->flags & USER_FLAG_MAP_AUTH) == USER_FLAG_ISOLAUTH) {
+ if ($user->table >= TABLES_AUTH_N)
+ continue;
+ }
+ }
+ */
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
$user_cur->comm[$user_cur->step % COMM_N] .= $to_room;
$user_cur->step_inc();
@@ -1782,6 +1854,7 @@ class Room {
$idx = 0;
$authenticate = FALSE;
+ $user_type = 0;
$login_exists = FALSE;
$ghost = -1;
$ghost_auth = FALSE;
@@ -1803,11 +1876,14 @@ class Room {
if ($pass != FALSE) {
log_auth("XXX", "auth2");
$authenticate = $userdb->login_verify($name_new, $pass);
- log_auth("XXX", "authenticate: ".($authenticate == TRUE ? "TRUE" : "FALSE"));
+ log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE"));
- if ($authenticate == FALSE) {
- $idx = -3;
- return ($G_false);
+ if ($authenticate != FALSE) {
+ $user_type = $authenticate->typeget();
+ }
+ else {
+ $idx = -3;
+ return ($G_false);
}
}
else {
@@ -1824,14 +1900,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)
@@ -1839,7 +1915,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];
@@ -1893,13 +1969,26 @@ 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]->flags |= USER_FLAG_LISTAUTH;
- if (isset($CO_list) && strcmp($CO_list, "all") == 0) {
- $this->user[$idx]->flags &= ~USER_FLAG_LISTAUTH;
+ if (isset($CO_list)) {
+ if (strcmp($CO_list, "auth") == 0) {
+ $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
+ $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
+ }
+ if (strcmp($CO_list, "isolation") == 0) {
+ $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
+ $this->user[$idx]->flags |= USER_FLAG_ISOLAUTH;
+ }
+ else {
+ $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
+ }
}
}
@@ -2184,8 +2273,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;
@@ -2199,13 +2309,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;
@@ -2219,13 +2329,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;
@@ -2239,13 +2349,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;
@@ -2259,13 +2369,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;
@@ -2279,13 +2389,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;
@@ -2299,13 +2409,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;
@@ -2319,13 +2429,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;
@@ -2339,13 +2449,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;
@@ -2359,13 +2469,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;
@@ -2379,12 +2489,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;
@@ -2392,7 +2503,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);
}
}
@@ -2480,10 +2591,10 @@ function show_notify($text, $tout, $butt, $w, $h)
return sprintf('var noti = new notify(gst,"%s",%d,"%s",%d,%d);', $text, $tout, $butt, $w, $h);
}
-function show_notify_opaque($text, $tout, $butt, $w, $h)
+function show_notify_ex($text, $tout, $butt, $w, $h, $is_opaque, $block_time)
{
log_main("SHOW_NOTIFY OPAQUE: ".$text);
- return sprintf('var noti = new notify_ex(gst,"%s",%d,"%s",%d,%d, true);', $text, $tout, $butt, $w, $h);
+ return sprintf('var noti = new notify_ex(gst,"%s",%d,"%s",%d,%d, %s, %d);', $text, $tout, $butt, $w, $h, ($is_opaque ? "true" : "false"), $block_time);
}