projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into post-bold2
[brisk.git]
/
web
/
briskin5
/
Obj
/
briskin5.phh
diff --git
a/web/briskin5/Obj/briskin5.phh
b/web/briskin5/Obj/briskin5.phh
index
9382782
..
72bd500
100644
(file)
--- a/
web/briskin5/Obj/briskin5.phh
+++ b/
web/briskin5/Obj/briskin5.phh
@@
-32,6
+32,7
@@
define('BIN5_PROXY_PATH', PROXY_PATH."/bin5");
require_once('rules.phh');
require_once('rules.phh');
+// FOR TORNEO TURN IT TO BIN5_TOURNAMENT_TOGETHER17
define('BIN5_TOURNAMENT_CURRENT', BIN5_TOURNAMENT_NO_DRAW);
$mlang_bin5_bin5 = array(
define('BIN5_TOURNAMENT_CURRENT', BIN5_TOURNAMENT_NO_DRAW);
$mlang_bin5_bin5 = array(
@@
-88,7
+89,7
@@
function dom_select_rules()
$ret = "<select id='select_rules'>\n";
foreach (rules_keys() as $key) {
$value = rules_id2descr($key, $G_lang);
$ret = "<select id='select_rules'>\n";
foreach (rules_keys() as $key) {
$value = rules_id2descr($key, $G_lang);
- $ret .= sprintf("<option value='%d'
>%s</option>\n", $key
, $value);
+ $ret .= sprintf("<option value='%d'
%s>%s</option>\n", $key, ($key == BIN5_TOURNAMENT_CURRENT ? " selected='selected'" : "")
, $value);
}
$ret .= "</select>\n";
}
$ret .= "</select>\n";
@@
-1200,7
+1201,7
@@
class Bin5 {
($user_cur->stat == 'table' && ($user_cur->subst == 'shutdowned' || $user_cur->subst == 'shutdowner')))
continue;
($user_cur->stat == 'table' && ($user_cur->subst == 'shutdowned' || $user_cur->subst == 'shutdowner')))
continue;
- if ($user_cur->lacc +
EXPIRE_TIME_RD
< ($curtime - $delta)) { // Auto logout dell'utente
+ if ($user_cur->lacc +
(($user_cur->ping_req ? 1.5 : 1.0) * EXPIRE_TIME_RD)
< ($curtime - $delta)) { // Auto logout dell'utente
log_rd2($user_cur->sess." bin5 AUTO LOGOUT.");
if ($user_cur->stat == 'table') {
log_rd2($user_cur->sess." bin5 AUTO LOGOUT.");
if ($user_cur->stat == 'table') {