projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug to manage SINGLE_SESS debug with TRACKING
[brisk.git]
/
web
/
Obj
/
brisk.phh
diff --git
a/web/Obj/brisk.phh
b/web/Obj/brisk.phh
index
91121e5
..
f0e412b
100644
(file)
--- a/
web/Obj/brisk.phh
+++ b/
web/Obj/brisk.phh
@@
-284,6
+284,12
@@
Copyright 2006-2009 <a href=\\"mailto:brisk@alternativeoutput.it\\">Matteo Nasta
<br><b>version '.$G_brisk_version.'</b><br><br>
Copyright 2006-2009 <a href=\\"mailto:brisk@alternativeoutput.it\\">Matteo Nastasi</a> (aka mop)<br><br>');
<br><b>version '.$G_brisk_version.'</b><br><br>
Copyright 2006-2009 <a href=\\"mailto:brisk@alternativeoutput.it\\">Matteo Nastasi</a> (aka mop)<br><br>');
+function mop_flush()
+{
+ ob_flush();
+ flush();
+}
+
function file_lock($fname, $is_exclusive)
{
if (($res = fopen($fname, "r+")) == FALSE) {
function file_lock($fname, $is_exclusive)
{
if (($res = fopen($fname, "r+")) == FALSE) {
@@
-315,6
+321,9
@@
function webservers_check()
{
GLOBAL $G_webserver_max;
{
GLOBAL $G_webserver_max;
+ /* FIXME: check all procs expirations */
+ return (10);
+
$ct = 0;
$dh = opendir('/proc');
$ct = 0;
$dh = opendir('/proc');
@@
-1793,7
+1802,7
@@
class Room {
if ($user_cur->sess == '')
continue;
if ($user_cur->sess == '')
continue;
- if (
$user_cur->name == $name_new
)
+ if (
strcasecmp($user_cur->name,$name_new) == 0
)
break;
}
if ($i < MAX_PLAYERS) {
break;
}
if ($i < MAX_PLAYERS) {
@@
-2148,7
+2157,7
@@
class Room {
log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
- /* there is another user logged with your account and you and him have authenticated =>
che
new user
+ /* there is another user logged with your account and you and him have authenticated => new user
get the session of the old user */
if ($ghost > -1 && $ghost_auth && ($authenticate != FALSE)) {
/* swap session */
get the session of the old user */
if ($ghost > -1 && $ghost_auth && ($authenticate != FALSE)) {
/* swap session */
@@
-2240,7
+2249,7
@@
class Room {
if (strcmp("", $this->user[$i]->sess) == 0)
continue;
if (strcmp("", $this->user[$i]->sess) == 0)
continue;
- if (strcmp($this->user[$i]->name, $ghostname) == 0) {
+ if (strc
asec
mp($this->user[$i]->name, $ghostname) == 0) {
$ghostname = '';
break;
}
$ghostname = '';
break;
}
@@
-2357,7
+2366,7
@@
class Room {
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
if (($room->user[$i] = User::load_data($i, FALSE)) == FALSE) {
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
if (($room->user[$i] = User::load_data($i, FALSE)) == FALSE) {
- log_crit("
Bin5_u
ser::load_data failed");
+ log_crit("
U
ser::load_data failed");
break;
}
}
break;
}
}
@@
-2649,7
+2658,7
@@
function log_mop($step, $log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2675,7
+2684,7
@@
function log_only2($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2700,7
+2709,7
@@
function log_crit($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CRIT) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CRIT) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2725,7
+2734,7
@@
function log_only($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2750,7
+2759,7
@@
function log_main($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2775,7
+2784,7
@@
function log_rd($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2800,7
+2809,7
@@
function log_rd2($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2825,8
+2834,8
@@
function log_send($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0)
return;
-
- if (
BRISK_DEBUG & DBG_TRAC)
+
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2851,7
+2860,7
@@
function log_lock($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2876,7
+2885,7
@@
function log_wr($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2901,7
+2910,7
@@
function log_load($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2921,7
+2930,7
@@
function log_auth($sess, $log)
if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0)
return;
if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@
-2946,7
+2955,7
@@
function log_shme($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SHME) == 0)
return;
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SHME) == 0)
return;
- if (
BRISK_DEBUG & DBG_TRAC)
+ if (
(BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";