X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=b83532ca0514df31769153bf9cc2a913fa203f03;hb=43cab39ea58529cd2442c28f4157bb7efc97856f;hp=587acd820d7a36624df988611b2e708fa35779cc;hpb=c3ccbbd5bc7c8534127fa10b4f88b81cffc6029a;p=brisk.git
diff --git a/web/index.php b/web/index.php
index 587acd8..b83532c 100644
--- a/web/index.php
+++ b/web/index.php
@@ -182,13 +182,6 @@ $mlang_room = array( 'userpasserr' => array('it' => 'Utente e/o password errati
require_once("briskin5/Obj/briskin5.phh");
-if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') {
- echo "Debugging time!";
- exit;
-}
-
-log_load("index.php");
-
function poll_dom() {
GLOBAL $G_with_poll, $G_poll_title, $G_poll_entries;
@@ -220,7 +213,7 @@ function carousel_top()
return (sprintf('', $rn));
}
-function index_main(&$room, &$header_out, $get, $post, $cookie)
+function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
{
GLOBAL $G_with_donors, $G_donors_cur, $G_donors_all;
GLOBAL $G_with_topbanner, $G_topbanner, $G_is_local;
@@ -231,7 +224,7 @@ function index_main(&$room, &$header_out, $get, $post, $cookie)
GLOBAL $BRISK_SHOWHTML, $BRISK_DEBUG, $_SERVER;
if (($sess = gpcs_var('sess', $get, $post, $cookie)) === FALSE)
- unset($sess);
+ $sess = "";
if (($name = gpcs_var('name', $get, $post, $cookie)) === FALSE)
unset($name);
if (($pass_private = gpcs_var('pass_private', $get, $post, $cookie)) === FALSE)
@@ -243,7 +236,7 @@ function index_main(&$room, &$header_out, $get, $post, $cookie)
// Use of proxies isn't allowed.
- if (!$G_is_local && is_proxy()) {
+ if (!$G_is_local && is_proxy($addr)) {
return FALSE;
}
@@ -269,7 +262,7 @@ function index_main(&$room, &$header_out, $get, $post, $cookie)
if ($user->stat == "table") {
setcookie("table_token", $user->table_token, $curtime + 31536000);
setcookie("table_idx", $user->table, $curtime + 31536000);
- $header_out['Location'] = "Location: briskin5/index.php";
+ $header_out['Location'] = "briskin5/index.php";
return TRUE;
}
$ACTION = "room";
@@ -287,14 +280,14 @@ function index_main(&$room, &$header_out, $get, $post, $cookie)
$room->garbage_manager(TRUE);
/* try login */
- if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $_SERVER['REMOTE_ADDR'])) != FALSE) {
+ if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $addr)) != FALSE) {
$ACTION = "room";
if ($idx < 0) {
$idx = -$idx - 1;
$is_login = TRUE;
}
- log_legal($curtime, $user, "STAT:LOGIN", '');
+ log_legal($curtime, $addr, $user, "STAT:LOGIN", '');
// recovery lost game
if ($user->stat == "table") {
@@ -865,7 +858,7 @@ supported by:
-
+
@@ -878,13 +871,14 @@ supported by:
-
+
@@ -1012,6 +1006,7 @@ echo "$body"; ?>