X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fdb.php;h=e5699f6a19095b161504f0b9fb16396c360b313e;hp=b7c6f707fd2c8abf786589def567346bc3bc6a01;hb=c3f011c01dbab0d02321859a03d91dc88a7b560b;hpb=3e07ecbf6f6b1f9f027bc5895a43d5efa774d083

diff --git a/include/db.php b/include/db.php
index b7c6f70..e5699f6 100644
--- a/include/db.php
+++ b/include/db.php
@@ -1,5 +1,5 @@
 <?php
-/* make sure that we are not called from outside the scripts, 
+/* make sure that we are not called from outside the scripts,
  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))
@@ -81,14 +81,14 @@ function DB_query_array($query)
 {
   $result = DB_query($query);
   $return = DB_fetch_array($result);
-  
+
   return $return;
 }
 
 function DB_query_array_all($query)
 {
   $result = array();
-  
+
   $queryresult  = DB_query($query);
   while($row = DB_fetch_array($queryresult))
     $result[] = $row;
@@ -638,7 +638,7 @@ function DB_get_ruleset($dullen,$schweinchen,$call)
 
   $result = DB_query("SELECT id FROM Rulesets WHERE".
 		     " dullen=".DB_quote_smart($dullen)." AND ".
-		     " call=".DB_quote_smart($call)." AND ".
+		     " Rulesets.call=".DB_quote_smart($call)." AND ".
 		     " schweinchen=".DB_quote_smart($schweinchen));
   if($result)
     $r    = DB_fetch_array($result);
@@ -695,7 +695,7 @@ function DB_get_PREF($myid)
   if($r)
     {
       /* licence only valid until then */
-      if($r[0]=="altenburg" && (time()-strtotime( "2009-12-31 23:59:59")<0) ) 
+      if($r[0]=="altenburg" && (time()-strtotime( "2009-12-31 23:59:59")<0) )
 	$PREF["cardset"]="altenburg";
       else
 	$PREF["cardset"]="english";
@@ -729,6 +729,14 @@ function DB_get_PREF($myid)
   else
     $PREF['autosetup']='no';
 
+  /* Sorting */
+  $r = DB_query_array("SELECT value FROM User_Prefs".
+		      " WHERE user_id='$myid' AND pref_key='sorting'" );
+  if($r)
+    $PREF['sorting'] = $r[0];
+  else
+    $PREF['sorting']='high-low';
+
   return $PREF;
 }
 
@@ -737,11 +745,11 @@ function DB_get_RULES($gameid)
   $r = DB_query_array("SELECT * FROM Rulesets".
 		      " LEFT JOIN Game ON Game.ruleset=Rulesets.id ".
 		      " WHERE Game.id='$gameid'" );
-  
+
   $RULES["dullen"]      = $r[2];
   $RULES["schweinchen"] = $r[3];
   $RULES["call"]        = $r[4];
-  
+
   return $RULES;
 }
 
@@ -778,13 +786,18 @@ function DB_get_email_pref_by_uid($uid)
 
 function DB_get_unused_randomnumbers($userstr)
 {
-  $r = DB_query_array(" SELECT randomnumbers FROM Game".
-		      "   WHERE randomnumbers NOT IN".
-		      "           (SELECT randomnumbers FROM Game".
-		      "                LEFT JOIN Hand ON Game.id=Hand.game_id".
-		      "                WHERE user_id IN  (". $userstr .")".
-		      "                GROUP BY randomnumbers".
-		      "           )");
+  /* optimized version of this query using temporary tables (perhaps we should use a procedure here?).
+     First we create a copy of the Game table using just the gameid and the cards.
+     Then in a second round we delete all the gameids of games where our players are in.
+     At the end we return only the first entry in the temporary table.
+  */
+  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."));");
+
+  $r = DB_query_array("SELECT randomnumbers FROM gametmp LIMIT 1;");
+  DB_query("DROP   TEMPORARY TABLE IF EXISTS gametmp;");
+
   if($r)
     return $r[0];
   else
@@ -877,10 +890,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];
 }
 
@@ -980,7 +992,7 @@ function DB_get_userid($type,$var1="",$var2="")
    */
 
   $r = NULL;
-  
+
   switch($type)
     {
     case 'name':
@@ -1052,7 +1064,7 @@ function DB_get_email($type,$var1='',$var2='')
 			 "AND Hand.position=".DB_quote_smart($var1)."");
       break;
     }
-  
+
   $r = DB_fetch_array($result);
 
   if($r)
@@ -1103,5 +1115,13 @@ function DB_get_exchanged_cards($hash)
   return $cards;
 }
 
-
+function DB_played_by_others($gameid)
+{
+  $gameids = array();
+  $result = DB_query("SELECT id FROM Game WHERE randomnumbers=(SELECT randomnumbers from Game where id=$gameid) and status='gameover'");
+  while($r = DB_fetch_array($result))
+    if($r[0]!=$gameid)
+      $gameids[]=$r[0];
+  return $gameids;
+}
 ?>
\ No newline at end of file