X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=6c7b5b2c0538e0e432a74c8ddc85a35f48563c8f;hb=7379a6c57be3c4ced0871d429bc1de1d6e2a91f8;hp=a2f7bf8c5e93cd9b9af5a65a39f79c7ab4c79a08;hpb=8e2dd2d0326cd960560d55cd405c02825d4254d2;p=brisk.git
diff --git a/web/index.php b/web/index.php
index a2f7bf8..6c7b5b2 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
@@ -22,8 +22,6 @@
*
*/
-$G_base = "";
-
require_once("Obj/brisk.phh");
require_once("Obj/auth.phh");
require_once("Obj/proxyscan.phh");
@@ -40,7 +38,7 @@ $mlang_room = array( 'userpasserr' => array('it' => 'Utente e/o password errati
'en' => 'Standing players'),
'headline' => array('it' => 'briscola chiamata in salsa ajax',
'en' => 'declaration briscola in ajax sauce (Beta)'),
- 'wellcome' => array('it' => 'Digita il tuo nickname per accedere ai tavoli della briscola',
+ 'welcome' => array('it' => 'Digita il tuo nickname per accedere ai tavoli della briscola',
'en' => 'Enter your nickname to access to the tables of briscola'),
'btn_enter' => array('it' => 'entra',
'en' => 'enter'),
@@ -84,6 +82,14 @@ $mlang_room = array( 'userpasserr' => array('it' => 'Utente e/o password errati
'en' => 'baby'),
'st_mop_desc' => array('it' => 'pulizie',
'en' => 'mop'),
+ 'st_babbo_desc' => array('it' => 'babbo',
+ 'en' => 'mop'),
+ 'st_renna_desc' => array('it' => 'renna',
+ 'en' => 'mop'),
+ 'st_pupaz_desc' => array('it' => 'pupazzo',
+ 'en' => 'mop'),
+ 'st_visch_desc' => array('it' => 'vischio',
+ 'en' => 'mop'),
'tit_ticker' => array('it' => 'scrivi un invito al tavolo e clicca',
'en' => 'write an invitation at the table and click'),
@@ -175,18 +181,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 +215,32 @@ function carousel_top()
return (sprintf('', $rn));
}
-function main()
+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;
- 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 +249,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 +261,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 +283,36 @@ function main()
$room->garbage_manager(TRUE);
/* try login */
- if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $_SERVER['REMOTE_ADDR'])) != FALSE) {
+ $ipv4addr_arr = explode(':' , $addr);
+ if (isset($ipv4addr_arr[3])) {
+ $ipv4addr = $ipv4addr_arr[3];
+ }
+ else {
+ $ipv4addr = $addr;
+ }
+ if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $ipv4addr, $cookie)) != FALSE) {
$ACTION = "room";
if ($idx < 0) {
$idx = -$idx - 1;
$is_login = TRUE;
}
- log_legal($curtime, $user, "STAT:LOGIN", '');
+ log_legal($curtime, $ipv4addr, $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'] = "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 +343,6 @@ function main()
$body .= '