fixed margin collapse in .main (gray bar below header)

[e-DoKo.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index 9d9856bcd4cf15449a59d96b69cf70486c0873a2..c6544131045bde1fd6725c6cf099b5ac061d55b1 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1206,16 +1206,25 @@ function display_single_user($r)
 }
 
 
-function display_user_menu($id)
+function display_user_menu($id, $skiphash=NULL)
 {
   global $WIKI,$INDEX;
 
-  $result = DB_query("SELECT Hand.hash,Hand.game_id,Game.player from Hand".
-                    " LEFT JOIN Game On Hand.game_id=Game.id".
-                    " WHERE Hand.user_id='$id'".
-                    " AND ( Game.player='$id' OR ISNULL(Game.player) )".
-                    " AND ( Game.status='pre' OR Game.status='play' )".
-                    " ORDER BY Game.session" );
+  if($skiphash)
+    $result = DB_query("SELECT Hand.hash,Hand.game_id,Game.player from Hand".
+                      " LEFT JOIN Game On Hand.game_id=Game.id".
+                      " WHERE Hand.user_id='$id'".
+                      " AND Hand.hash!='$skiphash'".
+                      " AND ( Game.player='$id' OR ISNULL(Game.player) )".
+                      " AND ( Game.status='pre' OR Game.status='play' )".
+                      " ORDER BY Game.session" );
+  else
+    $result = DB_query("SELECT Hand.hash,Hand.game_id,Game.player from Hand".
+                      " LEFT JOIN Game On Hand.game_id=Game.id".
+                      " WHERE Hand.user_id='$id'".
+                      " AND ( Game.player='$id' OR ISNULL(Game.player) )".
+                      " AND ( Game.status='pre' OR Game.status='play' )".
+                      " ORDER BY Game.session" );
 
   $i=0;
   while( $r = DB_fetch_array($result))
@@ -1232,7 +1241,7 @@ function display_user_menu($id)
 
       $i++;
       echo "  <a href=\"".$INDEX."?action=game&amp;me=".$r[0].
-       "\">game ".DB_format_gameid($r[1])." </a>\n";
+       "\"> ".DB_format_gameid($r[1])." </a>\n";
       if($i>4)
        {
          echo ",  ...\n";