X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Ffunctions.php;h=a17ce0811d28c018bac0d4b578f6d1cae297fcaf;hp=9d9856bcd4cf15449a59d96b69cf70486c0873a2;hb=d760c835fcf5444dd1a0b2997e6eb5744e0be952;hpb=da63cd918a46e4ce8916c21b0b20bf8ef1bf5a7a

diff --git a/include/functions.php b/include/functions.php
index 9d9856b..a17ce08 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -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";
@@ -1256,28 +1265,33 @@ function generate_score_table($session)
   $score = array();
   $i=0;
 
-  /* get all ids */
+  /* get all ids, scores and gametypes */
   $gameids = DB_get_gameids_of_finished_games_by_session($session);
 
   if($gameids == NULL)
     return $score;
 
-  /* get player id, names... from the first game */
   $player = array();
-  $result = DB_query("SELECT User.id, User.fullname from Hand".
-		     " LEFT JOIN User On Hand.user_id=User.id".
-		     " WHERE Hand.game_id=".$gameids[0]);
+  $player_party = array();
+
+  /* get player id from the first game */
+  $result = DB_query("SELECT user_id from Hand".
+		     " WHERE Hand.game_id=".$gameids[0][0]);
   while( $r = DB_fetch_array($result))
     $player[$r[0]] = 0;
 
+  /* get party of players for each game in the session */
+  foreach($player as $id=>$points)
+    $player_party[$id]=DB_get_party_by_session_and_userid($session,$id);
+
   /* get points and generate table */
   foreach($gameids as $gameid)
     {
-      $re_score = DB_get_score_by_gameid($gameid);
-      $gametype = DB_get_gametype_by_gameid($gameid);
+      $re_score = $gameid[1];
+      $gametype = $gameid[2];
       foreach($player as $id=>$points)
 	{
-	  $party = DB_get_party_by_gameid_and_userid($gameid,$id);
+	  $party = $player_party[$id][$i][0];
 	  if($party == "re")
 	    if($gametype=="solo")
 	      $player[$id] += 3*$re_score;
@@ -1286,7 +1300,7 @@ function generate_score_table($session)
 	  else if ($party == "contra")
 	    $player[$id] -= $re_score;
 	}
-      $score[$i]['gameid']  = $gameid ;
+      $score[$i]['gameid']  = $gameid[0] ;
       $score[$i]['players'] = $player;
       $score[$i]['points']  = abs($re_score);
       $score[$i]['solo']    = ($gametype=="solo");
@@ -1301,14 +1315,14 @@ function generate_global_score_table()
 {
   $return = array();
 
-  /* get all ids */
+  /* get all ids, scores and gametypes */
   $gameids = DB_get_gameids_of_finished_games_by_session(0);
 
   if($gameids == NULL)
     return '';
 
-  /* get player id, names... from the User table */
   $player = array();
+  /* get player id, names... from the User table */
   $result = DB_query('SELECT User.id, User.fullname FROM User');
 
   /* save information in an array */
@@ -1319,15 +1333,15 @@ function generate_global_score_table()
   /* get points and generate table */
   foreach($gameids as $gameid)
     {
-      $re_score = DB_get_score_by_gameid($gameid);
-      $gametype = DB_get_gametype_by_gameid($gameid);
+      $re_score = $gameid[1];
+      $gametype = $gameid[2];
 
       /* get players involved in this game */
-      $result = DB_query('SELECT user_id FROM Hand WHERE game_id='.DB_quote_smart($gameid));
+      $result = DB_query('SELECT user_id FROM Hand WHERE game_id='.DB_quote_smart($gameid[0]));
       while($r = DB_fetch_array($result))
 	{
 	  $id = $r[0];
-	  $party = DB_get_party_by_gameid_and_userid($gameid,$id);
+	  $party = DB_get_party_by_gameid_and_userid($gameid[0],$id);
 	  if($party == 're')
 	    if($gametype=='solo')
 	      $player[$id]['points'] += 3*$re_score;