projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
increment game and match counter at the end of a game
[brisk.git]
/
web
/
Obj
/
brisk.phh
diff --git
a/web/Obj/brisk.phh
b/web/Obj/brisk.phh
index
f221518
..
5fe56c6
100644
(file)
--- a/
web/Obj/brisk.phh
+++ b/
web/Obj/brisk.phh
@@
-2,7
+2,7
@@
/*
* brisk - brisk.phh
*
/*
* brisk - brisk.phh
*
- * Copyright (C) 2006-201
4
Matteo Nastasi
+ * Copyright (C) 2006-201
5
Matteo Nastasi
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
@@
-347,16
+347,35
@@
$G_PG_cons_n = 345;
function ip2int($s)
{
function ip2int($s)
{
- $v = ip2long($s);
+ return (ip2long($s));
+}
+
+function int2ip($i)
+{
+ return (long2ip($i));
+}
+
+function int2four($l)
+{
if (PHP_INT_SIZE == 4)
if (PHP_INT_SIZE == 4)
- return ($
v
);
+ return ($
l
);
- return ( ($
v & 0x80000000 ? 0xffffffff00000000 : 0x00) | $v
);
+ return ( ($
l & 0x80000000 ? 0xffffffff00000000 : 0x00) | $l
);
}
}
-function int2ip($i)
+function four2int($s)
+{
+ return ($s & 0xffffffff);
+}
+
+function ip2four($s)
+{
+ return int2four( ip2int($s) );
+}
+
+function four2ip($i)
{
{
- return
long2ip($i & 0xffffffff
);
+ return
int2ip( four2int($i)
);
}
function nickserv_msg($dt, $msg) {
}
function nickserv_msg($dt, $msg) {
@@
-797,13
+816,13
@@
class Table {
if ($sitted < PLAYERS_N) {
switch ($this->auth_type) {
case TABLE_AUTH_TY_CERT:
if ($sitted < PLAYERS_N) {
switch ($this->auth_type) {
case TABLE_AUTH_TY_CERT:
- if ($user->is_cert())
+ if ($user->is_cert()
&& !$user->is_appr()
)
$act = "sitcert";
else
$act = 'resercert';
break;
case TABLE_AUTH_TY_AUTH:
$act = "sitcert";
else
$act = 'resercert';
break;
case TABLE_AUTH_TY_AUTH:
- if ($user->is_auth())
+ if ($user->is_auth()
&& !$user->is_appr()
)
$act = "sitreser";
else
$act = 'reserved';
$act = "sitreser";
else
$act = 'reserved';