X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=3556c9b1cc2eac753fc4d47a691f3d1c8db4a02e;hb=47ae15c35f3c407208e52329949039a55e1f3693;hp=a8d84296b7757ad3904d6b62a5d4872262b823ad;hpb=a87693bd247721f88dd0b1bed23c00a75aa51c6e;p=brisk.git

diff --git a/web/index.php b/web/index.php
index a8d8429..3556c9b 100644
--- a/web/index.php
+++ b/web/index.php
@@ -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";
@@ -649,7 +652,7 @@ google_color_text = "404040";
 google_color_url = "000000";
 //-->
 </script>
-<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>';
+<script type="text/javascript" src="https://pagead2.googlesyndication.com/pagead/show_ads.js"></script>';
             $banner_top_right = carousel_top();
         }
         else {
@@ -668,7 +671,7 @@ google_color_text = "404040";
 google_color_url = "000000";
 //-->
 </script>
-<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>';
+<script type="text/javascript" src="https://pagead2.googlesyndication.com/pagead/show_ads.js"></script>';
         }
     }
     else { // !$G_is_local
@@ -679,18 +682,19 @@ google_color_url = "000000";
     $brisk_header_form = '<div class="container">
 <!-- =========== header ===========  -->
 <div id="header" class="header">
-<table width="100%%" border="0" cols="3"><tr>
-<td align="left"><div style="padding-left: 8px;">'.$banner_top_left.'</div></td>
-<td align="center">'.(($G_with_topbanner || $G_with_donors) ? '<table><tr><td>' : '').'<div style="text-align: center;">
-    <img class="nobo" src="img/brisk_logo64.png">
-    '.$mlang_room['headline'][$G_lang].'<br>
+<table width="100%%" style="min-height: 84px;" border="0" cols="3"><tr>
+<td style="width: 33%%;" align="left"><div style="padding-left: 8px;">'.$banner_top_left.'</div></td>
+<td style="width: 34%%;" align="center">'.(($G_with_topbanner || $G_with_donors) ? '<table><tr><td>' : '').'<div style="text-align: center;">
+ <img class="nobo" src="img/brisk_logo64.png">'
+/*    <img class="nobo" src="img/brisk_logo64_blackribbon.png" title="ciao Prof" alt="ciao Prof">' */
+    .$mlang_room['headline'][$G_lang].'<br>
     </div>'.( ($G_with_topbanner || $G_with_donors) ? sprintf('</td><td>%s</td></tr></table>',
                                                                 ($G_with_topbanner ? $G_topbanner :
 "<div style='background-color: #ffd780; border: 1px solid black; text-align: center;'><img class='nobo' src=\"donometer.php?c=".$G_donors_cur."&a=".$G_donors_all."\"><div style='padding: 1px; background-color: white;'><b>donatori</b></div></div>") ) : '').'</td>
-<td align="right"><div style="padding-right: 8px;">
-'.$banner_top_right.'</div></td>
+<td style="width: 33%%;" align="right"><div style="padding-right: 8px;">'.$banner_top_right.'</div></td>
 </tr></table>
 </div>';
+// <td style="width: 33%%;" align="right">'.$banner_top_right.'</td>
 
     /* MLANG: ALL THE VERTICAL MENU */
     $brisk_vertical_menu = '
@@ -992,11 +996,11 @@ supported by:<br>
 <div style="position: absolute;">
 '.$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>
+<a style="/* position: absolute; top: 40px; left: 6px; */" target="_blank" href="https://www.facebook.com/groups/59742820791"><img class="nobo" id="btn_facebook" src="img/facebook_btn.png" title="unisciti al gruppo \'quelli della brisk\'"></a>
 ' . ( /* NOTE: here facebook or fake facebook */
 (!$G_is_local && $_cookie_law_3party == 'true') ?
 '<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 id="proflashext" class="proflashext"><div id="proflash" class="proflash"></div></div>
+' : '' ) . '<div id="proaudioext" class="proaudioext"><div id="proaudio" class="proaudio"></div></div>
 <img id="stm_stat" class="nobo" style="margin-top: 4px;" src="img/line-status_b.png">
 %s
 %s
@@ -1020,7 +1024,6 @@ supported by:<br>
 <script type="text/javascript" src="heartbit.js"></script>
 <script type="text/javascript" src="xynt-streaming.js"></script>
 <script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js"></script>
-<script type="text/javascript" src="AC_OETags.js"></script>
 <script type="text/javascript" src="room.js"></script>
 <script type="text/javascript" src="md5.js"></script>
 <script type="text/javascript" src="probrowser.js"></script>
@@ -1040,7 +1043,7 @@ 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_jukebox = null;
 var g_is_spawn = 0;
 var g_nd = null;
 var g_brow = null;
@@ -1067,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.<br><a href="http://www.macromedia.com/"><img class="nobo" style="padding: 4px; width:73; height: 19;" src="img/download_now_flash.gif"></a>';
+    g_jukebox = new jukebox([]);
+    if (g_jukebox.is_enabled() == false) {
+        $("proaudio").innerHTML = 'Audio HTML5 non supportato.';
+    }
+    else {
+        $("proaudioext").innerHTML = "";
     }
-    else
-        $("proflashext").innerHTML = "";
     $("nameid").focus();
 }
 //-->
@@ -1192,7 +1196,6 @@ cookie_law(null);
 <script type="text/javascript" src="xynt-streaming.js"></script>
 <script type="text/javascript" src="room.js"></script>
 <script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js"></script>
-<script type="text/javascript" src="AC_OETags.js"></script>
 <script type="text/javascript" src="probrowser.js"></script>
 <script type="text/javascript" src="json2.js"></script>
 <script type="text/javascript" src="/cookie_law.js"></script>
@@ -1211,7 +1214,7 @@ cookie_law(null);
    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;
@@ -1249,17 +1252,18 @@ cookie_law(null);
         sidebanners_init($G_sidebanner_idx);
 ?>
      sess = "<?php echo "$sess"; ?>";
-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 = new xynt_streaming(window, <?php printf("\"%s\", %d", $transp_type, $transp_port); ?>, 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.<br><a href="http://www.macromedia.com/"><img class="nobo" style="padding: 4px; width:73; height: 19;" src="img/download_now_flash.gif"></a>';
+     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();