X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=478d8805632d14175120907dde3d2db5f54bc42f;hb=828872a069b4092703067ee5df3d4cc8bbb334ca;hp=99e401166419bc37df7f1db1c6f7b0981f0f0710;hpb=e941e33787f5686885b88070a68005aa1eab5273;p=brisk.git
diff --git a/web/index.php b/web/index.php
index 99e4011..478d880 100644
--- a/web/index.php
+++ b/web/index.php
@@ -71,13 +71,13 @@ $mlang_room = array( 'userpassuse' => array('it' => 'Il tuo nickname è g
'en' => 'back to tables'),
'btn_exit' => array('it' => 'Esco.',
'en' => 'Exit.'),
- 'btn_prefs_save' => array('it' => 'Salva.',
+ 'btn_save' => array('it' => 'Salva.',
'en' => 'Save.'),
- 'btn_prefs_reset' => array('it' => 'Annulla.',
+ 'btn_reset' => array('it' => 'Annulla.',
'en' => 'Reset.'),
- 'btn_prefs_close' => array('it' => 'Chiudi.',
+ 'btn_close' => array('it' => 'Chiudi.',
'en' => 'Close.'),
- 'btn_prefs_send' => array('it' => 'Invia.',
+ 'btn_send' => array('it' => 'Invia.',
'en' => 'Send.'),
'tit_tabl' => array('it' => 'Tavolo ',
'en' => 'Table '),
@@ -228,6 +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_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");
@@ -332,10 +360,16 @@ 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)
unset($name);
+ else
+ log_step("LOGIN: $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)
@@ -343,8 +377,6 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f
if (($table_token = gpcs_var('table_idx', $get, $post, $cookie)) === FALSE)
unset ($table_token);
- log_step("LOGIN: $name");
-
// default values
$_cookie_law_3party = 'true';
if (isset($cookie['_cookie_law_3party']))
@@ -402,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);
@@ -435,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";
@@ -493,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;
@@ -620,7 +652,7 @@ google_color_text = "404040";
google_color_url = "000000";
//-->
-';
+';
$banner_top_right = carousel_top();
}
else {
@@ -639,7 +671,7 @@ google_color_text = "404040";
google_color_url = "000000";
//-->
-';
+';
}
}
else { // !$G_is_local
@@ -653,8 +685,9 @@ google_color_url = "000000";
'.$banner_top_left.'
'.(($G_with_topbanner || $G_with_donors) ? '' : '').'
-
- '.$mlang_room['headline'][$G_lang].'
+
'
+/*
' */
+ .$mlang_room['headline'][$G_lang].'
'.( ($G_with_topbanner || $G_with_donors) ? sprintf(' %s
',
($G_with_topbanner ? $G_topbanner :
"donatori
") ) : '').'
@@ -721,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].'
@@ -748,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') ?
'
@@ -988,7 +1016,9 @@ supported by:
+
+
@@ -1009,6 +1039,7 @@ var g_debug = 0;
var g_lang = " echo $G_lang; ?>";
var g_lng = " echo $G_lng; ?>";
var g_tables_n = echo TABLES_N; ?>;
+var g_tables_appr_n = echo TABLES_APPR_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;
@@ -1107,7 +1138,7 @@ window.onload = function() {
Vuoi ottenere un accesso da apprendista ?
-
e-mail:
-
+
@@ -1155,7 +1186,9 @@ cookie_law(null);
+
+
@@ -1176,6 +1209,7 @@ cookie_law(null);
var g_lang = " echo $G_lang; ?>";
var g_lng = " echo $G_lng; ?>";
var g_tables_n = echo TABLES_N; ?>;
+ var g_tables_appr_n = echo TABLES_APPR_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;
@@ -1219,7 +1253,7 @@ 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;
@@ -1318,11 +1352,11 @@ xstm = new xynt_streaming(window, "", 80, 2, null /
"
+""
type="submit" onclick="this.form.elements['realsub'].value = 'invia';" class="button">
"
+""
type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chiudi';">
@@ -1342,8 +1376,8 @@ type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chi
-
-
+
+
@@ -1358,6 +1392,104 @@ type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chi
+
+
+
@@ -1460,9 +1592,9 @@ type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chi
-
-
-
+
+
+