X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=3556c9b1cc2eac753fc4d47a691f3d1c8db4a02e;hb=47ae15c35f3c407208e52329949039a55e1f3693;hp=baad9b5c62d8924431051ae90c8199d44ed17ca4;hpb=bdc40b38c38e78e26d6f4a8a3a7a4be650eb7d2b;p=brisk.git diff --git a/web/index.php b/web/index.php index baad9b5..3556c9b 100644 --- a/web/index.php +++ b/web/index.php @@ -228,18 +228,34 @@ $mlang_room = array( 'userpassuse' => array('it' => 'Il tuo nickname è g 'en' => 'Send a message to the administrator:'), 'mesgtoadm_sub'=> array('it' => 'soggetto:', 'en' => 'subject:'), - 'info_login' => array('it' => 'Utente:', - 'en' => 'User:'), - 'info_state' => array('it' => 'Stato:', - 'en' => 'State:'), - 'info_guar' => array('it' => 'Garante:', - 'en' => 'Guarantee:'), - 'info_match' => array('it' => 'Partite:', - 'en' => 'Matches:'), - 'info_game' => array('it' => 'Mani:', - 'en' => 'Hands:'), + 'info_login' => array('it' => 'Utente', + 'en' => 'User'), + 'info_status' => array('it' => 'Stato', + 'en' => 'Status'), + 'info_status_tit' => array('it' => 'Stato dell\' utente.', + 'en' => 'User status.'), + 'info_guar' => array('it' => 'Garante', + 'en' => 'Guarantee'), + 'info_match' => array('it' => 'Partite', + 'en' => 'Matches'), + 'info_match_tit' => array('it' => 'Partite giocate ai tavoli riservati.', + 'en' => 'Matches played at reserved tables.'), + 'info_party' => array('it' => 'Party', + 'en' => 'Party'), + 'info_party_tit' => array('it' => 'Bravura calcolata in base ad amici, agli amici fidati e agli amici degli amici fidati in base alla credibilità degli amici fidati.', + 'en' => 'Skill calculated with party rules.'), + 'info_game' => array('it' => 'Mani', + 'en' => 'Hands'), + 'info_game_tit' => array('it' => 'Mani giocate ai tavoli riservati.', + 'en' => 'Hands played at reserved tables.'), 'info_frie' => array('it' => 'Conoscenza:', 'en' => 'Friendship:'), + 'info_repfrie' => array('it' => 'Cosa ne pensano gli amici', + 'en' => 'Friends reputation'), + 'info_repbff' => array('it' => 'Cosa ne pensano gli amici fidati', + 'en' => 'Best friends reputation'), + 'info_skill' => array('it' => 'Bravura', + 'en' => 'Skill') ); require_once("briskin5/Obj/briskin5.phh"); @@ -344,6 +360,9 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f GLOBAL $G_lang, $G_lng, $mlang_room; GLOBAL $BRISK_SHOWHTML, $BRISK_DEBUG, $_SERVER, $_COOKIE; + $transp_port = ((array_key_exists("X-Forwarded-Proto", $header) && + $header["X-Forwarded-Proto"] == "https") ? 443 : 80); + if (($sess = gpcs_var('sess', $get, $post, $cookie)) === FALSE) $sess = ""; if (($name = gpcs_var('name', $get, $post, $cookie)) === FALSE) @@ -415,7 +434,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f log_main("pre garbage_manager UNO"); $brisk->garbage_manager(TRUE); log_main("post garbage_manager"); - if (($user = &$brisk->get_user($sess, &$idx)) != FALSE) { + if (($user = $brisk->get_user($sess, $idx)) != FALSE) { if ($user->the_end == FALSE) { $brisk->sess_cur_set($user->sess); log_main("user stat: ".$user->stat); @@ -448,7 +467,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f /* try login */ if ($banned == FALSE && - ($user = $brisk->add_user(&$sess, &$idx, $name, $pass_private, + ($user = $brisk->add_user($sess, $idx, $name, $pass_private, $remote_addr, $header, $cookie)) != FALSE) { $brisk->sess_cur_set($user->sess); $ACTION = "room"; @@ -506,7 +525,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f $tables .= '
'; $tables .= ''; for ($ii = 0 ; $ii < TABLES_N ; $ii++) { - if ($user->is_auth()) + if ($user->is_auth() && !$user->is_appr()) $i = $ii; else $i = TABLES_N - $ii - 1; @@ -633,7 +652,7 @@ google_color_text = "404040"; google_color_url = "000000"; //--> -'; +'; $banner_top_right = carousel_top(); } else { @@ -652,7 +671,7 @@ google_color_text = "404040"; google_color_url = "000000"; //--> -'; +'; } } else { // !$G_is_local @@ -663,18 +682,19 @@ google_color_url = "000000"; $brisk_header_form = '
- -
'.$banner_top_left.'
'.(($G_with_topbanner || $G_with_donors) ? ' /* MLANG: ALL THE VERTICAL MENU */ $brisk_vertical_menu = ' @@ -734,11 +754,6 @@ google_color_url = "000000"; alt="'.$mlang_room['tit_cook'][$G_lang].'">'.$mlang_room['itm_cook'][$G_lang].'
-'.$mlang_room['itm_cla'][$G_lang].'
@@ -761,7 +776,7 @@ google_color_url = "000000"; Parma 11/09
+ title="1° Torneo-Meeting di Parma del 22/11/2009">Parma 11/09
'.$altout_support_big.'
- + ' . ( /* NOTE: here facebook or fake facebook */ (!$G_is_local && $_cookie_law_3party == 'true') ? '
-' : '' ) . '
+' : '' ) . '
%s %s @@ -1003,12 +1018,12 @@ supported by:
+ - @@ -1023,11 +1038,12 @@ var g_debug = 0; var g_lang = ""; var g_lng = ""; var g_tables_n = ; +var g_tables_appr_n = ; var g_tables_auth_n = ; var g_tables_cert_n = ; var g_prefs, g_prefs_new = null; var g_listen; -var g_withflash = false; +var g_jukebox = null; var g_is_spawn = 0; var g_nd = null; var g_brow = null; @@ -1054,12 +1070,13 @@ window.onload = function() { sidebanners_init($G_sidebanner_idx); ?> - g_withflash = DetectFlashVer(6,0,0); - if (g_withflash == false) { - $("proflash").innerHTML = 'Audio con Flash.
'; + g_jukebox = new jukebox([]); + if (g_jukebox.is_enabled() == false) { + $("proaudio").innerHTML = 'Audio HTML5 non supportato.'; + } + else { + $("proaudioext").innerHTML = ""; } - else - $("proflashext").innerHTML = ""; $("nameid").focus(); } //--> @@ -1171,6 +1188,7 @@ cookie_law(null); + @@ -1178,7 +1196,6 @@ cookie_law(null); - @@ -1191,12 +1208,13 @@ cookie_law(null); var g_lang = ""; var g_lng = ""; var g_tables_n = ; + var g_tables_appr_n = ; var g_tables_auth_n = ; var g_tables_cert_n = ; var g_prefs, g_prefs_new = null; var g_listen; var g_is_spawn = 0; - var g_withflash = false; + var g_jukebox = null; var g_imgct = 0; var g_imgtot = g_preload_img_arr.length; var g_brow = null; @@ -1234,17 +1252,18 @@ cookie_law(null); sidebanners_init($G_sidebanner_idx); ?> sess = ""; -xstm = new xynt_streaming(window, "", 80, 2, null /* console */, gst, 'index_php', 'sess', sess, $('sandbox'), 'index_rd.php', function(com){eval(com);}); + xstm = new xynt_streaming(window, , 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; window.onbeforeunload = onbeforeunload_cb; - g_withflash = DetectFlashVer(6,0,0); - if (g_withflash == false) { - $("proflash").innerHTML = 'Audio con Flash.
'; + g_jukebox = new jukebox([]); + if (g_jukebox.is_enabled() == false) { + $("proaudio").innerHTML = 'Audio HTML5 non supportato.'; + } + else { + $("proaudioext").innerHTML = ""; } - else - $("proflashext").innerHTML = ""; // console.log("session from main: "+sess); xstm.start(); @@ -1374,22 +1393,64 @@ type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chi
-
' : '').'
- - '.$mlang_room['headline'][$G_lang].'
+ + + - +
'.$banner_top_left.'
'.(($G_with_topbanner || $G_with_donors) ? '
' : '').'
+ ' +/* ciao Prof' */ + .$mlang_room['headline'][$G_lang].'
'.( ($G_with_topbanner || $G_with_donors) ? sprintf('		%s
', ($G_with_topbanner ? $G_topbanner : "
donatori
") ) : '').'
-'.$banner_top_right.'
'.$banner_top_right.'
'; +// 		'.$banner_top_right.'
- - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
di seguito le opzioni che verranno attivate successivamente:
Da evitareAmico
SconosciutoAmico fidato
In prova
Bravura:Credibilità:
+ +
::
::
::
::
Da evitare: In prova: Amico: Fidato:
::
Da evitare: In prova: Amico: Fidato:
Da evitare
SconosciutoIn provaAmicoAmico fidato
: @@ -1403,26 +1464,28 @@ type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chi
1 2
-		 +Credibilità: - - - - - + + + + +
1 2 3 4 5
- + +