X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=390bc784317db97c1c0fbed410691b805138c0e5;hb=9ffc7e5dc05fdd25cc273661ba8dc394c5d5518b;hp=42fa7ac0cb18ea239e5aa3a91ea368c2d7078dea;hpb=82602601a4300006e470e92cb44f18844a656a44;p=brisk.git
diff --git a/web/index.php b/web/index.php
index 42fa7ac..390bc78 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
@@ -20,9 +20,13 @@
* not, write to the Free Software Foundation, Inc, 59 Temple Place -
* Suite 330, Boston, MA 02111-1307, USA.
*
- */
-$G_base = "";
+
+TODO:
+ - header
+ - setcookie
+ - gestire per intero la var globale di output
+*/
require_once("Obj/brisk.phh");
require_once("Obj/auth.phh");
@@ -175,18 +179,9 @@ $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') {
- echo "Debugging time!";
- exit;
-}
-
-log_load("index.php");
+require_once("briskin5/Obj/briskin5.phh");
function poll_dom() {
GLOBAL $G_with_poll, $G_poll_title, $G_poll_entries;
@@ -218,15 +213,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 = "";
@@ -235,12 +248,7 @@ function main()
if (isset($BRISK_SHOWHTML) == FALSE) {
$is_table = FALSE;
- $sem = Room::lock_data(TRUE);
log_main("lock Room");
- if (($room = Room::load_data()) == FALSE) {
- log_crit("load_data failed");
- exit();
- }
$curtime = time();
/* Actions */
@@ -252,24 +260,16 @@ 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;
+ $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";
}
- if (Room::save_data(&$room) == FALSE) {
- echo "ERRORE SALVATAGGIO\n";
- exit;
- }
}
if ($ACTION == "login" && isset($name)) {
@@ -282,37 +282,29 @@ 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, $cookie)) != 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;
+ $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;
}
// setcookie ("sess", "", time() + 180);
$room->standup_update(&$user);
- if (Room::save_data($room) == FALSE) {
- echo "ERRORE SALVATAGGIO\n";
- exit;
- }
}
else {
/* Login Rendering */
@@ -343,7 +335,6 @@ function main()
$body .= '
'.$banner_top_right.' |
-