NEW FEATURE: show exchanged cards in poverty pre-game phase

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

diff --git a/include/db.php b/include/db.php
index 6d4080c26ceefaa17232503a9e49e82af096b8a3..27d639ebe3a7da832a7a30a55bccf33b4cc6ea25 100644 (file)
--- a/include/db.php
+++ b/include/db.php
@@ -820,7 +820,7 @@ function DB_get_unused_randomnumbers($userstr)
   */
   DB_query("DROP   TEMPORARY TABLE IF EXISTS gametmp;");
   DB_query("CREATE TEMPORARY TABLE gametmp SELECT id,randomnumbers FROM Game;");
   */
   DB_query("DROP   TEMPORARY TABLE IF EXISTS gametmp;");
   DB_query("CREATE TEMPORARY TABLE gametmp SELECT id,randomnumbers FROM Game;");

-  DB_query("DELETE FROM gametmp WHERE id IN (SELECT game_id FROM Hand WHERE user_id IN (".$userstr."));");
+  DB_query("DELETE FROM gametmp WHERE randomnumbers IN (SELECT randomnumbers FROM Hand LEFT JOIN Game ON Game.id=game_id WHERE user_id IN (".$userstr."));");

 
   $r = DB_query_array("SELECT randomnumbers FROM gametmp LIMIT 1;");
   DB_query("DROP   TEMPORARY TABLE IF EXISTS gametmp;");
 
   $r = DB_query_array("SELECT randomnumbers FROM gametmp LIMIT 1;");
   DB_query("DROP   TEMPORARY TABLE IF EXISTS gametmp;");


@@ -852,6 +852,9 @@ function DB_set_recovery_password($user,$newpw)
 
 function DB_get_card_name($card)
 {
 
 function DB_get_card_name($card)
 {

+  if($card==0)
+    return 'backside';
+

   $r = DB_query_array("SELECT strength,suite FROM Card WHERE id='$card'");
 
   if($r)
   $r = DB_query_array("SELECT strength,suite FROM Card WHERE id='$card'");
 
   if($r)