X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=89385a20a859f594fe88e6f1f4a14979b516aa42;hb=fda577257a10dc76c0326926b0d544f1897d1e2c;hp=135d2999b7b8ceaa50786bed2337db31ff04a744;hpb=f6a4ad0c8fed8ed0d3bab5fba9842cf00576c028;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 135d299..89385a2 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -136,10 +136,10 @@ $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 = "3.5.6";
+$G_brisk_version = "3.6.1";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': (tecnica) utilizzo di locking tipo lettori/scrittori al posto del locking esclusivo generico.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo sistema di evidenziazione degli utenti registrati.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: usage of reader/writer locking instead of generic exclusive locking.',
'If you want to subscribe our Mailing List, click it!' ) );
@@ -286,8 +286,8 @@ Copyright 2006-2009 Matteo Nasta
function mop_flush()
{
- flush();
ob_flush();
+ flush();
}
function file_lock($fname, $is_exclusive)
@@ -321,6 +321,9 @@ function webservers_check()
{
GLOBAL $G_webserver_max;
+ /* FIXME: check all procs expirations */
+ return (10);
+
$ct = 0;
$dh = opendir('/proc');
@@ -1084,6 +1087,13 @@ class User {
return (FALSE);
}
+ function myname_innerHTML()
+ {
+ $class_id = ($this->flags & USER_FLAG_AUTH) + 1;
+
+ return (sprintf('$("myname").innerHTML = "%s";', $class_id,
+ xcape($this->name,ENT_COMPAT,"UTF-8")));
+ }
} // end class User
@@ -1332,9 +1342,8 @@ class Room {
}
$ret .= sprintf('subst = "%s";', $user->subst);
- $itin = ($user->flags & USER_FLAG_AUTH ? "" : "");
- $itou = ($user->flags & USER_FLAG_AUTH ? "" : "");
- $ret .= sprintf('$("myname").innerHTML = "%s%s%s";', $itin, xcape($user->name), $itou);
+ $ret .= $user->myname_innerHTML();
+
for ($i = 0 ; $i < TABLES_N ; $i++) {
$ret .= $this->table_content($user, $i);
@@ -1575,9 +1584,7 @@ class Room {
$ret .= $this->table_content($user_cur, $table_idx);
if ($user->idx_get() == $i) {
- $itin = ($user->flags & USER_FLAG_AUTH ? "" : "");
- $itou = ($user->flags & USER_FLAG_AUTH ? "" : "");
- $ret .= sprintf('$("myname").innerHTML = "%s%s%s: ";', $itin, xcape($user->name), $itou);
+ $ret .= $user->myname_innerHTML();
}
$user_cur->comm[$user_cur->step % COMM_N] = $ret;
$user_cur->step_inc();
@@ -1799,7 +1806,7 @@ class Room {
if ($user_cur->sess == '')
continue;
- if ($user_cur->name == $name_new)
+ if (strcasecmp($user_cur->name,$name_new) == 0)
break;
}
if ($i < MAX_PLAYERS) {
@@ -2246,7 +2253,7 @@ class Room {
if (strcmp("", $this->user[$i]->sess) == 0)
continue;
- if (strcmp($this->user[$i]->name, $ghostname) == 0) {
+ if (strcasecmp($this->user[$i]->name, $ghostname) == 0) {
$ghostname = '';
break;
}
@@ -2298,11 +2305,7 @@ class Room {
if ($user_cur->stat == 'room') {
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".$this->standup_content($user_cur);
if ($user->idx_get() == $i) {
- $itin = ($user->flags & USER_FLAG_AUTH ? "" : "");
- $itou = ($user->flags & USER_FLAG_AUTH ? "" : "");
-
- $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s%s%s: ";',
- $itin, xcape($user->name), $itou);
+ $user_cur->comm[$user_cur->step % COMM_N] .= $user->myname_innerHTML();
}
log_main("FROM STANDUP: NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]);
@@ -2363,7 +2366,7 @@ class Room {
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
if (($room->user[$i] = User::load_data($i, FALSE)) == FALSE) {
- log_crit("Bin5_user::load_data failed");
+ log_crit("User::load_data failed");
break;
}
}
@@ -2655,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2681,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2706,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2731,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2756,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2781,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2806,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2831,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 & DBG_TRAC)
+
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2857,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2882,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2907,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2927,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2952,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 & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";