X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=a5e1ebc8d5b0924d63a7f6b37b43f02ead02bb7d;hb=b65dddf6cb8fdc5a98719ed170ca38c2059b362c;hp=ee4e79128d5a82c6c73a8793e73d81929b92a6bd;hpb=182eff6ad1aafbdcb765a4190a24a1c8f2f93f6b;p=brisk.git diff --git a/web/index.php b/web/index.php index ee4e791..a5e1ebc 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,13 +22,10 @@ * */ -$G_base = ""; - 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.', @@ -41,13 +38,13 @@ $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'), 'passwarn' => array('it' => 'Se non hai ancora una password, lascia il campo in bianco ed entra.', 'en' => 'If you don\'t have a password, leave blank the field and enter.'), - 'browwarn' => array('it' => '(se qualcosa non funziona
prova a ricaricare la pagina con Ctrl + F5)', + 'browwarn' => array('it' => 'Se qualcosa non funziona prova a ricaricare la pagina con Ctrl + F5

Se non riesci più ad entrare nel nuovo Brisk e prima ci riuscivi potrebbe essere un problema di antivirus,
guarda la pagina sugli antivirus per maggiori informazioni su come configurarlo.

Se ancora non funziona nulla contatta l\'amministratore del sito.', 'en' => '(if something don\'t work
try to reload the current page with Ctrl + F5)'), 'regwarn' => array('it' => '
Il nickname che stai usando è già registrato,

se il suo proprietario si autentificherà

verrai rinominato d\'ufficio come ghostN.', 'en' => '
The nickname you are using it\'s already registered,

if its proprietary authenticates

you will named ghostN.'), @@ -55,6 +52,10 @@ $mlang_room = array( 'userpasserr' => array('it' => 'Utente e/o password errati 'en' => 'back to tables'), 'btn_exit' => array('it' => 'Esco.', 'en' => 'Exit.'), + 'btn_prefs_save' => array('it' => 'Salva.', + 'en' => 'Save.'), + 'btn_prefs_close' => array('it' => 'Chiudi.', + 'en' => 'Close.'), 'tit_tabl' => array('it' => 'Tavolo ', 'en' => 'Table '), 'tit_stat' => array('it' => 'imposta lo stato del tuo utente', @@ -85,6 +86,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'), @@ -114,6 +123,10 @@ $mlang_room = array( 'userpasserr' => array('it' => 'Utente e/o password errati 'en' => 'splash'), 'splash_desc' => array('it' => 'attiva la finestra di splash', 'en' => 'show the splash window'), + 'tit_prefs' => array('it' => 'preferenze', + 'en' => 'preferences'), + 'prefs_desc' => array('it' => 'preferenze dell\' utente', + 'en' => 'user\'s preferences'), 'tit_help' => array('it' => 'informazioni utili su Brisk', 'en' => 'usefull information about Brisk'), 'itm_help' => array('it' => 'aiuto', @@ -176,18 +189,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; @@ -219,15 +223,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 = ""; @@ -236,9 +257,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 +269,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)) { @@ -280,37 +291,31 @@ function main() $room->garbage_manager(TRUE); /* try login */ - if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $_SERVER['REMOTE_ADDR'])) != FALSE) { + + $ipv4addr = addrtoipv4($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 */ @@ -341,7 +346,6 @@ function main() $body .= '
'.$mlang_room['userpass'.$sfx][$G_lang].'
'; } } - Room::unlock_data($sem); } /* Rendering. */ @@ -351,7 +355,7 @@ function main() else if ($BRISK_SHOWHTML == "debuglogin") { $ACTION = "login"; } - + if ($ACTION == "room") { $tables .= '
'; $tables .= ''; @@ -413,14 +417,18 @@ function main() array ( 'id' => 'btn_foroli', 'url' => 'http://www.forumolimpia.it', 'content' => 'img/forumolimpia.gif', - 'content_big' => 'img/forumolimpia_big.png' ) ); + 'content_big' => 'img/forumolimpia_big.png' ), + array ( 'id'=> 'btn_niini', + 'url' => 'http://www.niinivirta.it', + 'content' => 'img/niinivirta.png', + 'content_big' => 'img/niinivirta_big.png') ); $altout_support = ""; $altout_support_big = ""; - for ($i = 0 ; $i < 3 ; $i++) { - $ii = ($i < 2 ? $i : 0); + for ($i = 0 ; $i < 4 ; $i++) { + $ii = ($i < 3 ? $i : 0); $altout_support .= sprintf('
', $i * 20, $altout_support_arr[$ii]['url'], @@ -521,7 +529,7 @@ google_color_url = "000000"; "
donatori
") ) : '').' -
'.$banner_top_right.'
+
'; /* MLANG: ALL THE VERTICAL MENU */ @@ -568,7 +576,7 @@ google_color_url = "000000"; '.$mlang_room['itm_pro'][$G_lang].'
-about
@@ -579,15 +587,15 @@ google_color_url = "000000";
-'.$mlang_room['itm_cla'][$G_lang].'
-'.$mlang_room['itm_rmap'][$G_lang].'
@@ -645,98 +653,118 @@ google_color_url = "000000"; .$mlang_room['stat_desc'][$G_lang]. '

-
' - // MLANG ascolta - .$mlang_room['itm_list'][$G_lang]. -'
-
+'.($user->flags & USER_FLAG_AUTH ? ' +
' + // MLANG garantisci + .$mlang_room['tit_prefs'][$G_lang].'
' : '').' '.($G_with_poll ? '' : '
').' @@ -857,50 +835,58 @@ supported by:


%s %s -
'; +
+'; /* Templates. */ if ($ACTION == 'login') { - header('Content-type: text/html; charset="utf-8"',true); + $header_out['Content-type'] = "text/html; charset=\"utf-8\""; ?> Brisk - - - + + + + + - + - - - + + - +