X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=84c3ce6342ea340911b5b7dc139f5eb661af10f2;hb=286da1eb1ec912c9d2c49a132f555b10e0084e53;hp=0aa8592ec2fc44d6e23600bfa21027fc23a3817d;hpb=bdb3cb2379f32bfb9279da661b1d4dbaf9712299;p=brisk.git diff --git a/web/index.php b/web/index.php index 0aa8592..84c3ce6 100644 --- a/web/index.php +++ b/web/index.php @@ -2,7 +2,7 @@ /* * brisk - index.php * - * Copyright (C) 2006-2009 Matteo Nastasi + * Copyright (C) 2006-2011 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -20,15 +20,18 @@ * not, write to the Free Software Foundation, Inc, 59 Temple Place - * Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.33.2.28 2009-12-12 08:42:19 nastasi Exp $ - * - */ + + +TODO: + - header + - setcookie + - gestire per intero la var globale di output +*/ require_once("Obj/brisk.phh"); require_once("Obj/auth.phh"); require_once("Obj/proxyscan.phh"); - $mlang_room = array( 'userpasserr' => array('it' => 'Utente e/o password errati.', 'en' => 'Wrong user and/or password.'), 'userpassmust' => array('it' => 'Il nickname deve contenere almeno una lettera o una cifra.', @@ -176,9 +179,7 @@ $mlang_room = array( 'userpasserr' => array('it' => 'Utente e/o password errati 'en' => 'Close.') ); -// Use of proxies isn't allowed. -if (!$G_is_local && is_proxy()) - exit; + require_once("briskin5/Obj/briskin5.phh"); if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') { @@ -219,15 +220,33 @@ function carousel_top() return (sprintf('', $rn)); } -function main() +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; - GLOBAL $G_with_sidebanner, $G_sidebanner; - GLOBAL $G_with_sidebanner2, $G_sidebanner2; - GLOBAL $G_with_poll; - GLOBAL $sess, $name, $pass_private, $table_idx, $table_token, $BRISK_SHOWHTML, $BRISK_DEBUG, $_SERVER; - GLOBAL $G_lang, $G_lng, $mlang_room; + GLOBAL $G_with_donors, $G_donors_cur, $G_donors_all; + GLOBAL $G_with_topbanner, $G_topbanner, $G_is_local; + GLOBAL $G_with_sidebanner, $G_sidebanner; + GLOBAL $G_with_sidebanner2, $G_sidebanner2; + GLOBAL $G_with_poll; + GLOBAL $G_lang, $G_lng, $mlang_room; + GLOBAL $BRISK_SHOWHTML, $BRISK_DEBUG, $_SERVER; + + if (($sess = gpcs_var('sess', $get, $post, $cookie)) === FALSE) + $sess = ""; + if (($name = gpcs_var('name', $get, $post, $cookie)) === FALSE) + unset($name); + if (($pass_private = gpcs_var('pass_private', $get, $post, $cookie)) === FALSE) + unset ($pass_private); + if (($table_idx = gpcs_var('table_idx', $get, $post, $cookie)) === FALSE) + 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; + } + $is_login = FALSE; $body = ""; $tables = ""; @@ -236,9 +255,7 @@ function main() if (isset($BRISK_SHOWHTML) == FALSE) { $is_table = FALSE; - $sem = Room::lock_data(); log_main("lock Room"); - $room = &Room::load_data(); $curtime = time(); /* Actions */ @@ -250,24 +267,14 @@ function main() if (($user = &$room->get_user($sess, &$idx)) != FALSE) { log_main("user stat: ".$user->stat); if ($user->stat == "table") { - if (Room::save_data(&$room) == FALSE) { - echo "ERRORE SALVATAGGIO\n"; - exit; - } - log_main("unlock Room"); - Room::unlock_data($sem); setcookie("table_token", $user->table_token, $curtime + 31536000); setcookie("table_idx", $user->table, $curtime + 31536000); - header ("Location: briskin5/index.php"); - exit; + $header_out['Location'] = "Location: briskin5/index.php"; + return TRUE; } $ACTION = "room"; } - if (Room::save_data(&$room) == FALSE) { - echo "ERRORE SALVATAGGIO\n"; - exit; - } } if ($ACTION == "login" && isset($name)) { @@ -280,37 +287,27 @@ function main() $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") { - if (Room::save_data(&$room) == FALSE) { - echo "ERRORE SALVATAGGIO\n"; - exit; - } - log_main("unlock Room"); - Room::unlock_data($sem); setcookie("table_token", $user->table_token, $curtime + 31536000); setcookie("table_idx", $user->table, $curtime + 31536000); - header ("Location: briskin5/index.php"); - exit; + $header_out['Location'] = "Location: briskin5/index.php"; + return TRUE; } // setcookie ("sess", "", time() + 180); $room->standup_update(&$user); - if (Room::save_data(&$room) == FALSE) { - echo "ERRORE SALVATAGGIO\n"; - exit; - } } else { /* Login Rendering */ @@ -341,7 +338,6 @@ function main() $body .= '
'.$mlang_room['userpass'.$sfx][$G_lang].'
'; } } - Room::unlock_data($sem); } /* Rendering. */ @@ -351,7 +347,7 @@ function main() else if ($BRISK_SHOWHTML == "debuglogin") { $ACTION = "login"; } - + if ($ACTION == "room") { $tables .= '
'; $tables .= ''; @@ -459,10 +455,11 @@ function main() /* MLANG: "briscola chiamata in salsa ajax", */ mt_srand(make_seed()); - $rn = rand(0, 1); - - if ($rn == 0) { - $banner_top_left = ' - + + + + - - - - + + -