X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Ffunctions.php;h=c6544131045bde1fd6725c6cf099b5ac061d55b1;hp=fc46a61e576fc3a06484336e4f86e25e21b177a8;hb=bb25d07c113ba90c830b3a005f0297599bfad2ed;hpb=34dca92fa9209df27921dcc58b9ea5bfb8f131f0

diff --git a/include/functions.php b/include/functions.php
index fc46a61..c654413 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -971,7 +971,7 @@ function can_call($what,$hash)
   return 0;
 }
 
-function display_table ()
+function display_table_begin ()
 {
   global $gameid, $GT, $debug,$INDEX,$defaulttimezone,$session;
   global $RULES,$GAME,$gametype;
@@ -991,10 +991,57 @@ function display_table ()
 		     "WHERE Hand.game_id='".$gameid."' ".
 		     "ORDER BY position ASC");
 
-  echo "<div class=\"table\">\n".
-    "  <img class=\"table\" src=\"pics/table.png\" alt=\"table\" />\n";
-  while($r = DB_fetch_array($result))
-    {
+  $row0 = DB_fetch_array($result);
+  $row1 = DB_fetch_array($result);
+  $row2 = DB_fetch_array($result);
+  $row3 = DB_fetch_array($result);
+
+  echo "<div class=\"table\">\n";
+  display_single_user($row1);
+  echo "\n<div class=\"middle\">\n";
+  display_single_user($row0);
+  echo "  <img class=\"table\" src=\"pics/table.png\" alt=\"table\" />\n";
+  display_single_user($row2);
+
+  return;
+}
+function display_table_end ()
+{
+  global $gameid, $GT, $debug,$INDEX,$defaulttimezone,$session;
+  global $RULES,$GAME,$gametype;
+
+  $result = DB_query("SELECT  User.fullname as name,".
+		     "        Hand.position as position, ".
+		     "        User.id, ".
+		     "        Hand.party as party, ".
+		     "        Hand.sickness as sickness, ".
+		     "        Hand.point_call, ".
+		     "        User.last_login, ".
+		     "        Hand.hash,       ".
+		     "        User.timezone,    ".
+		     "        User.email       ".
+		     "FROM Hand ".
+		     "LEFT JOIN User ON User.id=Hand.user_id ".
+		     "WHERE Hand.game_id='".$gameid."' ".
+		     "ORDER BY position ASC");
+
+  $row0 = DB_fetch_array($result);
+  $row1 = DB_fetch_array($result);
+  $row2 = DB_fetch_array($result);
+  $row3 = DB_fetch_array($result);
+
+  echo "</div>\n";
+  display_single_user($row3);
+  echo "</div>\n";
+
+  return;
+}
+
+function display_single_user($r)
+{
+  global $gameid, $GT, $debug,$INDEX,$defaulttimezone,$session;
+  global $RULES,$GAME,$gametype;
+
       $name  = $r[0];
       $pos   = $r[1];
       $user  = $r[2];
@@ -1139,7 +1186,7 @@ function display_table ()
 	"title=\"local time: ".date("Y-m-d H:i:s",$timenow).  " ".
 	"last login: ".date("Y-m-d H:i:s",$lastlogin)."\" />";
 
-      echo "   <span class=\"numberoftricks\">";
+      echo "   <br /><span class=\"numberoftricks\">";
       /* show how many tricks the person made */
       switch($wins)
 	{
@@ -1156,25 +1203,28 @@ function display_table ()
 	}
       echo "</span>\n";
       echo "  </div>\n";
-
-    }
-  echo  "</div>\n"; /* end output table */
-
-
-  return;
 }
 
 
-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))
@@ -1184,13 +1234,17 @@ function display_user_menu($id)
 	  echo "\n<div class=\"usermenu\">\n  ";
 	  echo _('It\'s your turn in these games').":\n";
 	}
+      else
+	{
+	  echo ", ";
+	}
 
       $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";
+	  echo ",  ...\n";
 	  break;
 	}
     }