X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=6e45cb0e8a0c06b7e5928f7868517bc59f62f288;hb=8b9c2b3ec59baef7c9f64f9663347bc5b9cf69fe;hp=7166b5b4177cad46d7ff1a955eea39f7a2d5eb23;hpb=628c0ad0666348d62d0e46fcace789c38edb5350;p=brisk.git

diff --git a/web/index.php b/web/index.php
index 7166b5b..6e45cb0 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('<a target="_blank" href="http://shop.alternativeoutput.it"><img class="nobo" style="display: inline; border: 1px solid #808080;" src="img/briskshop%d.gif"></a>', $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&ugrave; posti liberi. Riprova pi&ugrave; tardi.", "Il tuo nickname &egrave; gi&agrave; in uso." */
               /*
-               if ($idx == -3) 
+               if ($idx == -3)
                $body .= '<div class="urgmsg"><b>'.$mlang_room['userpasserr'][$G_lang].'</b></div>';
                else if ($idx == -2)
                // $body .= '<div class="urgmsg"><b>Il nickname deve contenere almeno una lettera o una cifra.</b></div>';
                $body .= '<div class="urgmsg"><b>'.$mlang_room['userpassmust'][$G_lang].'</b></div>';
-               else if ($idx == -1) 
+               else if ($idx == -1)
                // $body .= '<div class="urgmsg"><b>Spiacenti, non ci sono pi&ugrave; posti liberi. Riprova pi&ugrave; tardi.</b></div>';
                $body .= '<div class="urgmsg"><b>'.$mlang_room['userpassend'][$G_lang].'</b></div>';
                else
                // $body .= '<div class="urgmsg"><b>Il tuo nickname &egrave; gi&agrave; in uso.</b></div>';
                $body .= '<div class="urgmsg"><b>'.$mlang_room['userpassuse'][$G_lang].'</b></div>';
               */
-              
-              if ($idx == -3) 
+
+              if ($idx == -3)
                   $sfx = 'err';
               else if ($idx == -2)
                   $sfx = 'must';
-              else if ($idx == -1) 
+              else if ($idx == -1)
                   $sfx = 'end';
               else
                   $sfx = 'use';
-              
+
               $body .= '<div class="urgmsg"><b>'.$mlang_room['userpass'.$sfx][$G_lang].'</b></div>';
           }
       }
@@ -376,17 +381,17 @@ function index_main(&$room, $transp_type, &$header_out, $addr, $get, $post, $coo
       $tables .= '<div class="room_tab">';
       $tables .= '<table class="room_tab">';
       for ($ii = 0 ; $ii < TABLES_N ; $ii++) {
-          if ($user->flags & USER_FLAG_AUTH)
-        $i = $ii;
+          if ($user->is_auth())
+              $i = $ii;
           else
               $i = TABLES_N - $ii - 1;
-          
+
           if ($ii % 4 == 0) {
               $tables .= '<tr id = "tr_noauth'.$ii.'">';
           }
           if (TRUE || !($user->flags & USER_FLAG_ISOLAUTH) || $ii < TABLES_AUTH_N) {
               $tables .= '<td id = "td_noauth'.$ii.'">';
-              
+
               $tables .= '<div class="room_div"><div class="room_tit"><b>'.$mlang_room['tit_tabl'][$G_lang].$i.'</b></div>';
               $tables .= sprintf('<div class="proxhr" id="table%d"></div>', $i);
               $tables .= sprintf('<div class="table_act" id="table_act%d"></div>', $i);
@@ -398,14 +403,13 @@ function index_main(&$room, $transp_type, &$header_out, $addr, $get, $post, $coo
           }
       }
       $tables .= '</table></div>';
-      
-      
+
       $standup .= '<table class="room_standup"><tr><td><div class="room_standup_orig" id="room_standup_orig"></div>';
       $standup .= '<div class="room_ex_standup">';
       /* MLANG: "Giocatori in piedi" */
       // $standup .= '<div id="room_tit"><span class="room_titin"><b>Giocatori in piedi</b> - <a target="_blank" href="weboftrust.php">Come ottenere user e password</a> - </span></div>';
       $standup .= '<div id="room_tit"><span class="room_titin"><b>'.$mlang_room['standing'][$G_lang].'</b></span></div>';
-      
+
       $standup .= sprintf('<div id="standup" class="room_standup"></div>');
       // MLANG Esco.
       $standup .= '<div id="esco" class="esco"><input type="button" class="button" name="xreload"  value="Reload." onclick="act_reloadroom();"><input class="button" name="logout" value="'.$mlang_room['btn_exit'][$G_lang].'" onclick="esco_cb();" type="button"></div>';
@@ -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 = '<div style="background-color: #ff0; height: 27px; margin-top: 4px;">BRISK_DONATE</div>';
+
   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].'</a><br>
 
+<a target="_blank" href="briskin5/explain.php"
+   onmouseover="menu_hide(0,1);"
+   title="'.$mlang_room['tit_mnu'][$G_lang].'">'.$mlang_room['itm_mnu'][$G_lang].'</a><br>
+
 <a href="#"
    onmouseover="menu_hide(0,1);"
    title="'.$mlang_room['tit_rmap'][$G_lang].'" onclick="act_roadmap();">'.$mlang_room['itm_rmap'][$G_lang].'</a><br>
@@ -805,7 +816,7 @@ google_color_url = "000000";
           // MLANG garantisci
           .$mlang_room['tit_splash'][$G_lang].
           '</a><br>
-'.($user->flags & USER_FLAG_AUTH ? '
+'.($user->is_auth() ? '
 <a href="#" title="'
           // MLANG garantisci per un tuo conoscente
           .$mlang_room['prefs_desc'][$G_lang].'"
@@ -846,13 +857,15 @@ supported by:<br>
 '.$altout_support_big.'
 </div>
 <a style="/* position: absolute; top: 40px; left: 6px;" */ target="_blank" href="http://it-it.facebook.com/group.php?gid=59742820791"><img class="nobo" id="btn_facebook" src="img/facebook_btn.png" title="unisciti al gruppo \'quelli della brisk\'"></a>
-<br>
-<div id="proflashext" class="proflashext"><div id="proflash" class="proflash">
-</div><br><br></div>
+' . ( /* NOTE: here facebook or fake facebook */
+! $G_is_local ?
+'<div class="fb-like" style="margin-top: 4px;" data-href="https://www.facebook.com/pages/Brisk-briscola-chiamata-in-salsa-ajax/716026558416911" data-share="false" data-send="true" data-width="70" data-show-faces="false" data-colorscheme="dark" layout="button_count"></div>
+' : '<div style="margin-top: 4px; height: 20px; background-color: #00f;">FACEBOOK HERE</div>
+' ) . '<div id="proflashext" class="proflashext"><div id="proflash" class="proflash"></div></div>
+<img id="stm_stat" class="nobo" style="margin-top: 4px;" src="img/line-status_b.png">
 %s
 %s
-<br>
-<img id="stm_stat" class="nobo" src="img/line-status_b.png"></div>';
+</div>';
     
   /* Templates. */
   if ($ACTION == 'login') {
@@ -884,13 +897,15 @@ supported by:<br>
    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:<br>
    //-->
 </SCRIPT>
 </head>
+<?php
+    if (!$G_is_local) {
+?>
 <!-- if myconsole <body onunload="deconsole();"> -->
+<body xmlns:fb="http://ogp.me/ns/fb#">
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/it_IT/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+<?php
+    }
+    else {
+?>
 <body>
+<?php
+  }
+?>
 <?php
     printf($brisk_header_form);
     printf("<table class=\"floaty\"><tr><td class=\"floatyleft\">\n");
@@ -941,9 +975,6 @@ supported by:<br>
 
    if ($G_with_sidebanner) {
      printf("%s", $G_sidebanner);
-     if ($G_with_sidebanner2) {
-       printf("<br>");
-     }
    }
 
 
@@ -954,7 +985,7 @@ supported by:<br>
 ?> 
 
 <!--  =========== tables ===========  -->
-<?php 
+<?php
 
 /* MLANG: "Digita il tuo nickname per accedere ai tavoli della briscola.", "entra", "Se non hai ancora una password, lascia il campo in bianco ed entra." ,"(se usi firefox e qualcosa non funziona prova a ricaricare la pagina con Ctrl + F5)" */
 echo "$body"; ?>
@@ -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 = "<?php echo "$sess"; ?>";
-xstm = new xynt_streaming(window, "<?php echo "$transp_type"; ?>", null /* console */, gst, 'index_php', 'sess', sess, $('sandbox'), 'index_rd_ifra.php', function(com){eval(com);});
+xstm = new xynt_streaming(window, "<?php echo "$transp_type"; ?>", 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) {
    //-->
 </SCRIPT>
 </head>
+<?php
+    if (!$G_is_local) {
+?>
 <!-- if myconsole <body onunload="deconsole();"> -->
+<body xmlns:fb="http://ogp.me/ns/fb#">
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/it_IT/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+<?php
+    }
+    else {
+?>
 <body>
+<?php
+  }
+?>
 <?php
    printf($brisk_header_form);
    printf("<table class=\"floaty\"><tr><td class=\"floatyleft\">\n");
-   /*   printf($brisk_vertical_menu, '<input type="button" class="button" name="xhelp"  value="Help." onclick="act_help();"><br><!-- <br><input type="button" class="button" name="xabout"  value="About." onclick="act_about();">--><br><br><br>',
-	   $brisk_donate);
-   printf($brisk_vertical_menu, '<input type="button" class="button" name="xhelp"  value="Help." onclick="act_help();"><br><!-- <br><input type="button" class="button" name="xabout"  value="About." onclick="act_about();">--><br>',
-	   $brisk_donate);*/
-   printf($brisk_vertical_menu, '<!-- <br><input type="button" class="button" name="xabout"  value="About." onclick="act_about();">--><br>',
-	   $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("<br>");
-     }
    }
 
 
@@ -1132,7 +1176,7 @@ if ($is_login) {
    }
 
    printf("</td><td>");
-?> 
+?>
 <!--  =========== tables ===========  -->
 <input name="sess" type="hidden" value="<?php echo "$user->sess"; ?>">
 <table class="macro"><tr><td>
@@ -1215,10 +1259,11 @@ type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chi
 <div id="xhrlog"></div>
 <div id="xhrdeltalog"></div>
 </div>
-<div id="preferences" class="notify" style="z-index: 200; width: 600px; margin-left: -300px; height: 400px; top: 126px; visibility: hidden;">
+<div id="preferences" class="notify" style="z-index: 200; width: 600px; margin-left: -300px; height: 240px; top: 150px; visibility: hidden;">
 <div id="preferences_child" style="border-bottom: 1px solid gray; overflow: auto; height: 370px;">
 
 <h2><?php echo $mlang_room['tit_prefs'][$G_lang]; ?></h2>
+<table style="margin: auto;"><tr><td style="vertical-align: top;">
 <!--#
     #  LISTEN
     #-->
@@ -1243,10 +1288,11 @@ type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chi
 </span></td></tr>
 </table>
 </div>
-
 <?php
-if ($user->rec != FALSE && $user->rec->last_dona > 1356994800) {
+if ($user->is_supp_custom()) {
 ?>
+</td>
+<td style="vertical-align: top;">
 <!--#
     #  SUPPORTER ONLY
     #-->
@@ -1287,11 +1333,13 @@ if ($user->rec != FALSE && $user->rec->last_dona > 1356994800) {
  title="'<?php echo $mlang_room['suppcomp_range'][$G_lang];?>'">
    <span id="list_all"><?php echo $mlang_room['suppcomp_b'][$G_lang];?></span></td>
 </tr>
-<tr><td colspan="4">
+<tr><td colspan="4" style="text-align: center;">
 <img id="s_img" class="nobo" src="img/noimg.png">
 </td></tr>
 </table>
 </div>
+</td>
+<td>
 <?php
 }
 else {
@@ -1306,6 +1354,7 @@ else {
 <?php
 }
 ?>
+</td></tr></table>
 <div style="width: 95%; /* background-color: red; */ margin: auto; text-align: left;">
 <br><br>
                                                           <!-- <input type="checkbox" name="pref_ring_endauct" id="pref_ring_endauct" onclick="pref_ring_endauct_set(this);"><?php /* echo $mlang_room['itm_ringauc'][$G_lang]; */ ?> -->