X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=5ed0bd364645d9c64933c621d3de7e8543a42e76;hb=c35dd062490b68aa01f887afa3ddf705b3e32372;hp=1294ad6b69808d797deee2c1aa7a452b61d6b424;hpb=123416d979e44c2cf3403fffc23fe99c8d6d80d5;p=brisk.git
diff --git a/web/index.php b/web/index.php
index 1294ad6..5ed0bd3 100644
--- a/web/index.php
+++ b/web/index.php
@@ -2,7 +2,7 @@
/*
* brisk - index.php
*
- * Copyright (C) 2006-2011 Matteo Nastasi
+ * Copyright (C) 2006-2012 Matteo Nastasi
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
@@ -213,7 +213,7 @@ function carousel_top()
return (sprintf('', $rn));
}
-function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
+function index_main(&$room, $transp_type, &$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;
@@ -233,8 +233,7 @@ function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
unset ($table_idx);
if (($table_token = gpcs_var('table_idx', $get, $post, $cookie)) === FALSE)
unset ($table_token);
-
-
+
// Use of proxies isn't allowed.
if (!$G_is_local && is_proxy($addr)) {
return FALSE;
@@ -260,9 +259,11 @@ function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
if (($user = &$room->get_user($sess, &$idx)) != FALSE) {
log_main("user stat: ".$user->stat);
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";
+ $cookies = new Cookies();
+ $cookies->add("table_token", $user->table_token, $curtime + 31536000);
+ $cookies->add("table_idx", $user->table, $curtime + 31536000);
+ $header_out['cookies'] = $cookies;
+ $header_out['Location'] = "briskin5/index.php";
return TRUE;
}
$ACTION = "room";
@@ -280,7 +281,7 @@ function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
$room->garbage_manager(TRUE);
/* try login */
- if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $addr)) != FALSE) {
+ if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $addr, $cookie)) != FALSE) {
$ACTION = "room";
if ($idx < 0) {
$idx = -$idx - 1;
@@ -291,9 +292,11 @@ function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
// recovery lost game
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";
+ $cookies = new Cookies();
+ $cookies->add("table_token", $user->table_token, $curtime + 31536000);
+ $cookies->add("table_idx", $user->table, $curtime + 31536000);
+ $header_out['cookies'] = $cookies;
+ $header_out['Location'] = "briskin5/index.php";
return TRUE;
}
@@ -510,7 +513,7 @@ google_color_url = "000000";
"