X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=b7e0d854f1c2aaf1eb0878d6ed05ff12bb951f50;hb=1fc2a56fc5b81d917ce929be0e2f0d53672a26fa;hp=2a83a6bb98949a9600e702f442cf0cc7be8d27d7;hpb=8443d4399f04e0f45453490382bb0d6ccc927bec;p=brisk.git diff --git a/web/index.php b/web/index.php index 2a83a6b..b7e0d85 100644 --- a/web/index.php +++ b/web/index.php @@ -126,22 +126,18 @@ $mlang_room = array( 'userpassuse' => array('it' => 'Il tuo nickname è g 'en' => 'guarantee for a friend'), 'tit_warr' => array('it' => 'Garantisci per un tuo conoscente.', 'en' => 'Guarantee for a friend.'), - 'itm_list' => array('it' => 'ascolta', - 'en' => 'listen'), + 'itm_list' => array('it' => 'visualizza', + 'en' => 'visualize'), 'list_desc' => array('it' => 'imposta le regole di ascolto', 'en' => 'set the listen rules'), - 'tit_listall' => array('it' => 'tutti', + 'tit_listall' => array('it' => 'tutti gli utenti', 'en' => 'everybody'), - 'listall_desc' => array('it' => 'leggi tutti i messaggi di tutti gli utenti collegati', - 'en' => 'listen all messages from each user connected'), - 'tit_listaut' => array('it' => 'solo autenticati', - 'en' => 'only authorized'), - 'tit_listisol' => array('it' => 'isolamento', - 'en' => 'isolation'), - 'listaut_desc' => array('it' => 'leggi soltanto i messaggi degli utenti con password', - 'en' => 'listen messages only from authenticated users'), - 'listisol_desc'=> array('it' => 'visualizza Brisk come se fosse solo per utenti con password', - 'en' => 'show Brisk like an authenticated user only site'), + 'listall_desc' => array('it' => 'visualizza tutti gli utenti collegati', + 'en' => 'visualize all connected users'), + 'tit_listisol' => array('it' => 'solo user autenticati', + 'en' => 'authenticated users only'), + 'listisol_desc' => array('it' => 'visualizza solo gli user autenticati e i tavoli a loro riservati', + 'en' => 'visualize authenticated users only and reserved tables to them'), 'suppcomp_tit' => array('it' => 'personalizza la tua S', 'en' => 'customize your S'), 'suppcomp_r' => array('it' => 'rosso', @@ -206,6 +202,10 @@ $mlang_room = array( 'userpassuse' => array('it' => 'Il tuo nickname è g 'en' => 'cookie policy'), 'itm_cook' => array('it' => 'cookie', 'en' => 'cookie'), + 'tit_dtmg' => array('it' => 'trattamento dati personali', + 'en' => 'personal data management'), + 'itm_dtmg' => array('it' => 'dati personali', + 'en' => 'personal data'), 'tit_cla' => array('it' => 'classifiche degli utenti', 'en' => 'user\'s placings'), 'itm_cla' => array('it' => 'classifiche', @@ -360,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) @@ -431,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); @@ -464,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"; @@ -486,7 +489,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f } } else { - fprintf(STDERR, "POST CHECK QUI\n"); + // fprintf(STDERR, "POST CHECK QUI\n"); /* Login Rendering */ switch($idx) { case -4: @@ -530,7 +533,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f if ($ii % 4 == 0) { $tables .= ''; } - if (TRUE || !($user->flags & USER_FLAG_ISOLAUTH) || $ii < TABLES_AUTH_N) { + if (TRUE || !($user->flags & USER_FLAG_ISOLAUTH) || $i < TABLES_APPR_N) { $tables .= ''; $tables .= '
'.$mlang_room['tit_tabl'][$G_lang].$i.'
'; @@ -649,7 +652,7 @@ google_color_text = "404040"; google_color_url = "000000"; //--> -'; +'; $banner_top_right = carousel_top(); } else { @@ -668,7 +671,7 @@ google_color_text = "404040"; google_color_url = "000000"; //--> -'; +'; } } else { // !$G_is_local @@ -679,19 +682,19 @@ google_color_url = "000000"; $brisk_header_form = '