X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=11694ca83ef9f0064f183554bc8edaae257b12cf;hb=14cd1fc05b5d9148de3c427e43bf60cfdf098e9d;hp=0b3076ae0b81782db4fb3a5919ba0867e50ef47d;hpb=7b4375bcaf7de9530942d79b3bb78991054d7e84;p=brisk.git
diff --git a/web/index.php b/web/index.php
index 0b3076a..11694ca 100644
--- a/web/index.php
+++ b/web/index.php
@@ -3,7 +3,7 @@
* brisk - index.php
*
* Copyright (C) 2006-2012 Matteo Nastasi
- * mailto: nastasi@alternativeoutput.it
+ * mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
*
@@ -96,7 +96,7 @@ $mlang_room = array( 'userpasserr' => array('it' => 'Utente e/o password errati
'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'),
'itm_warr' => array('it' => 'garantisci',
@@ -185,6 +185,10 @@ $mlang_room = array( 'userpasserr' => array('it' => 'Utente e/o password errati
'en' => 'user\'s placings'),
'itm_cla' => array('it' => 'classifiche',
'en' => 'placings'),
+ 'tit_mnu' => array('it' => 'minuta giornaliera',
+ 'en' => 'daily report'),
+ 'itm_mnu' => array('it' => 'minuta',
+ 'en' => 'daily deport'),
'tit_rmap' => array('it' => 'prossime funzionalità implementate',
'en' => 'roadmap of next functionalities'),
'itm_rmap' => array('it' => 'roadmap',
@@ -233,23 +237,17 @@ function poll_dom() {
return '';
}
-function carousel_top()
-{
- $rn = rand(1, 3);
- return (sprintf('', $rn));
-}
-
-function index_main(&$room, $transp_type, &$header_out, $addr, $get, $post, $cookie)
+function index_main(&$brisk, $transp_type, &$header_out, $remote_addr_full, $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_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)
+ if (($sess = gpcs_var('sess', $get, $post, $cookie)) === FALSE)
$sess = "";
if (($name = gpcs_var('name', $get, $post, $cookie)) === FALSE)
unset($name);
@@ -260,8 +258,10 @@ function index_main(&$room, $transp_type, &$header_out, $addr, $get, $post, $coo
if (($table_token = gpcs_var('table_idx', $get, $post, $cookie)) === FALSE)
unset ($table_token);
+ $remote_addr = addrtoipv4($remote_addr_full);
+
// Use of proxies isn't allowed.
- if (!$G_is_local && is_proxy($addr)) {
+ if (!$G_is_local && is_proxy($remote_addr)) {
return FALSE;
}
@@ -270,19 +270,20 @@ function index_main(&$room, $transp_type, &$header_out, $addr, $get, $post, $coo
$tables = "";
$standup = "";
$ACTION = "login";
-
+
if (isset($BRISK_SHOWHTML) == FALSE) {
$is_table = FALSE;
- log_main("lock Room");
+ log_main("lock Brisk");
$curtime = time();
-
+
/* Actions */
-
+
if (validate_sess($sess)) {
log_main("pre garbage_manager UNO");
- $room->garbage_manager(TRUE);
+ $brisk->garbage_manager(TRUE);
log_main("post garbage_manager");
- if (($user = &$room->get_user($sess, &$idx)) != FALSE) {
+ if (($user = &$brisk->get_user($sess, &$idx)) != FALSE) {
+ $brisk->sess_cur_set($user->sess);
log_main("user stat: ".$user->stat);
if ($user->stat == "table") {
$cookies = new Cookies();
@@ -294,30 +295,36 @@ function index_main(&$room, $transp_type, &$header_out, $addr, $get, $post, $coo
}
$ACTION = "room";
}
-
}
-
+
if ($ACTION == "login" && isset($name)) {
-
log_main("pre garbage_manager DUE");
-
- if (isset($pass_private) == FALSE) {
+
+ if (isset($pass_private) == FALSE || $pass_private == "") {
$pass_private = FALSE;
+
+ $banned = FALSE;
+ if ($brisk->ban_check($remote_addr)) {
+ // TODO: find a way to add a nonblocking sleep(5) here
+ $banned = TRUE;
+ $idx = -1;
+ }
}
-
- $room->garbage_manager(TRUE);
+
+ $brisk->garbage_manager(TRUE);
/* try login */
- $ipv4addr = addrtoipv4($addr);
- if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $ipv4addr, $cookie)) != FALSE) {
+ if ($banned == FALSE &&
+ ($user = $brisk->add_user(&$sess, &$idx, $name, $pass_private, $remote_addr, $cookie)) != FALSE) {
+ $brisk->sess_cur_set($user->sess);
$ACTION = "room";
if ($idx < 0) {
$idx = -$idx - 1;
$is_login = TRUE;
}
-
- log_legal($curtime, $ipv4addr, $user, "STAT:LOGIN", '');
-
+
+ log_legal($curtime, $remote_addr, $user, "STAT:LOGIN", '');
+
// recovery lost game
if ($user->stat == "table") {
$cookies = new Cookies();
@@ -327,38 +334,36 @@ function index_main(&$room, $transp_type, &$header_out, $addr, $get, $post, $coo
$header_out['Location'] = "briskin5/index.php";
return TRUE;
}
-
-
+
// setcookie ("sess", "", time() + 180);
- $room->standup_update(&$user);
-
+ $brisk->standup_update(&$user);
}
else {
/* Login Rendering */
/* MLANG: "Utente e/o password errati.", "Il nickname deve contenere almeno una lettera o una cifra.", "Spiacenti, non ci sono più posti liberi. Riprova più tardi.", "Il tuo nickname è già in uso." */
/*
- if ($idx == -3)
+ if ($idx == -3)
$body .= '
';
-
+
$tables .= ' '.$mlang_room['tit_tabl'][$G_lang].$i.' ';
$tables .= sprintf('', $i);
$tables .= sprintf('', $i);
@@ -398,14 +403,13 @@ function index_main(&$room, $transp_type, &$header_out, $addr, $get, $post, $coo
}
}
$tables .= ' |
';
$standup .= ' ';
/* MLANG: "Giocatori in piedi" */
// $standup .= '
Giocatori in piedi - Come ottenere user e password - ';
$standup .= ''.$mlang_room['standing'][$G_lang].' ';
-
+
$standup .= sprintf('');
// MLANG Esco.
$standup .= '';
@@ -473,9 +477,12 @@ function index_main(&$room, $transp_type, &$header_out, $addr, $get, $post, $coo
-
-
- $brisk_donate = file_get_contents(FTOK_PATH."/brisk_donate.txt");
+ /* NOTE: Brisk donate or donate fake if local */
+ if (!$G_is_local)
+ $brisk_donate = file_get_contents(FTOK_PATH."/brisk_donate.txt");
+ else
+ $brisk_donate = 'BRISK_DONATE ';
+
if ($brisk_donate == FALSE)
$brisk_donate = "";
@@ -611,6 +618,10 @@ google_color_url = "000000";
onmouseover="menu_hide(0,1);"
title="'.$mlang_room['tit_cla'][$G_lang].'" onclick="act_placing();">'.$mlang_room['itm_cla'][$G_lang].'+'.$mlang_room['itm_mnu'][$G_lang].' + '.$mlang_room['itm_rmap'][$G_lang].' @@ -846,13 +857,15 @@ supported by: '.$altout_support_big.' ![]() -
- FACEBOOK HERE
+' ) . '
+ ![]() - ![]() var g_lng = " echo $G_lng; ?>"; var g_tables_n = echo TABLES_N; ?>; var g_tables_auth_n = echo TABLES_AUTH_N; ?>; + var g_tables_cert_n = echo TABLES_CERT_N; ?>; var g_prefs, g_prefs_new = null; var g_listen; var g_withflash = false; var g_is_spawn = 0; + var g_nd = null; + var g_brow = null; var gst = new globst(); var topbanner_sfx, topbanner_dx; - var g_brow = null; var xstm = null; var sess = "not_connected"; var spo_slide, sup_slide; @@ -928,8 +943,27 @@ supported by: //--> + + + + + + | ||
\n");
@@ -941,9 +975,6 @@ supported by: if ($G_with_sidebanner) { printf("%s", $G_sidebanner); - if ($G_with_sidebanner2) { - printf(" "); - } } @@ -954,7 +985,7 @@ supported by: ?> - @@ -1025,19 +1056,21 @@ echo "$body"; ?> var g_lng = " echo $G_lng; ?>"; var g_tables_n = echo TABLES_N; ?>; var g_tables_auth_n = echo TABLES_AUTH_N; ?>; + var g_tables_cert_n = echo TABLES_CERT_N; ?>; var g_prefs, g_prefs_new = null; var g_listen; + var g_is_spawn = 0; + var g_withflash = false; + var g_imgct = 0; + var g_imgtot = g_preload_img_arr.length; + var g_brow = null; + var g_nd = null; var tra = null; var stat = ""; var subst = ""; var gst = new globst(); - var g_is_spawn = 0; var topbanner_sfx, topbanner_dx; // var nonunload = false; - var g_withflash = false; - var g_imgct = 0; - var g_imgtot = g_preload_img_arr.length; - var g_brow = null; var spo_slide, sup_slide; window.onload = function() { @@ -1071,7 +1104,7 @@ else { ?> sess = ""; -xstm = new xynt_streaming(window, "", null /* console */, gst, 'index_php', 'sess', sess, $('sandbox'), 'index_rd_ifra.php', function(com){eval(com);}); +xstm = new xynt_streaming(window, "", 80, 2, null /* console */, gst, 'index_php', 'sess', sess, $('sandbox'), 'index_rd.php', function(com){eval(com);}); xstm.hbit_set(heartbit); tra = new train($('room_tit')); window.onunload = onunload_cb; @@ -1102,17 +1135,31 @@ if ($is_login) { //--> + + + + + + | ||
\n");
- /* printf($brisk_vertical_menu, ' ', - $brisk_donate); - printf($brisk_vertical_menu, ' ', - $brisk_donate);*/ - printf($brisk_vertical_menu, ' ', - $brisk_donate); + printf($brisk_vertical_menu, '', $brisk_donate); if ($G_with_sidebanner xor $G_with_sidebanner2) { @@ -1121,9 +1168,6 @@ if ($is_login) { if ($G_with_sidebanner) { printf("%s", $G_sidebanner); - if ($G_with_sidebanner2) { - printf(" "); - } } @@ -1132,7 +1176,7 @@ if ($is_login) { } printf(" | ");
-?>
+?>
sess"; ?>">
|