BUGFIX: db_format_game wasn't working any more

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

diff --git a/include/db.php b/include/db.php
index c8750b49d88264a966863103a2b71e0142636d8d..2cc94e97497ec2a904de2655f2ef684d4947760a 100644 (file)
--- a/include/db.php
+++ b/include/db.php
@@ -85,6 +85,17 @@ function DB_query_array($query)
   return $return;
 }
 
+function DB_query_array_all($query)
+{
+  $result = array();
+  
+  $queryresult  = DB_query($query);
+  while($row = DB_fetch_array($queryresult))
+    $result[] = $row;
+
+  return $result;
+}
+
 function DB_get_passwd_by_name($name)
 {
   $r = DB_query_array("SELECT password FROM User WHERE fullname=".DB_quote_smart($name)."");
@@ -866,10 +877,9 @@ function DB_format_gameid($gameid)
   $session = DB_get_session_by_gameid($gameid);
 
   /* get number of game */
-  $r = DB_query_array("SELECT COUNT(*),create_date FROM Game".
-                     " WHERE session='$session' ".
-                     " AND TIMEDIFF(create_date, (SELECT create_date FROM Game WHERE id='$gameid'))<=0 ".
-                     " GROUP by session");
+  $r = DB_query_array("SELECT SUM(TIME_TO_SEC(TIMEDIFF(create_date, (SELECT create_date FROM Game WHERE id='$gameid')))<=0) ".
+                     " FROM Game".
+                     " WHERE session='$session' ");
   return $session.".".$r[0];
 }
 
@@ -1073,4 +1083,24 @@ function DB_get_name($type,$var1='')
     return "";
 }
 
+function DB_add_exchanged_card($card,$old_hand_id,$new_hand_id)
+{
+  DB_query("INSERT INTO Card_Exchange VALUES (NULL,$new_hand_id,$old_hand_id,$card)");
+  return;
+}
+
+function DB_get_exchanged_cards($hash)
+{
+  $cards = array();
+
+  $handid = DB_get_handid('hash',$hash);
+
+  $result = DB_query("SELECT card_id FROM Card_Exchange WHERE orig_hand_id=".DB_quote_smart($handid));
+  while($r = DB_fetch_array($result))
+    $cards[]=$r[0];
+
+  return $cards;
+}
+
+
 ?>
\ No newline at end of file