X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=e71684276a7104a76213dae93f476ffca7a0e6ac;hb=34495fd64f6e0749144412348c2dfdad37bddf85;hp=84c3ce6342ea340911b5b7dc139f5eb661af10f2;hpb=286da1eb1ec912c9d2c49a132f555b10e0084e53;p=brisk.git diff --git a/web/index.php b/web/index.php index 84c3ce6..e716842 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 @@ -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, $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; @@ -240,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; @@ -267,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"; @@ -287,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; @@ -298,8 +292,10 @@ 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); + $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'] = "Location: briskin5/index.php"; return TRUE; } @@ -517,7 +513,7 @@ google_color_url = "000000"; "