X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fdb.php;h=23959080ba704661c98737f641344d947fb39567;hp=6568e75c5d7bc3b0298765e32243abf51f5d250e;hb=d3841fcbcb98f5e2bbdeb7b89733b8757e848f20;hpb=7a6c422d36beb00e0b6719fec7d3675b37d69af2

diff --git a/include/db.php b/include/db.php
index 6568e75..2395908 100644
--- a/include/db.php
+++ b/include/db.php
@@ -88,13 +88,21 @@ function DB_query($query)
   /* debug/optimize the database
   $time = microtime();
   $return = $DB->query($query);
-  $time = $time - microtime();
+  $time = microtime() - $time;
 
-  if($time > 0.05) // this way we can find only the long ones
+  if($time > 0.15) // this way we can find only the long ones
   {
-    $logfile=fopen('/tmp/DBlog.log','a+');
-    fwrite($logfile,"EXPLAIN $query ;\n");
-    fwrite($logfile,"time of above query: $time\n");
+    $logfile=fopen('DBlog.log','a+');
+    fwrite($logfile,"time of query: $time\n");
+    fwrite($logfile,wordwrap("  EXPLAIN $query ;\n", 60, "\n         "));
+
+    $result = "";
+    $queryresult  = mysql_query("EXPLAIN $query ;");
+    if( $queryresult )
+      while($row = DB_fetch_array($queryresult))
+        $result  .= "   |".implode("|",$row)."|\n";
+
+    fwrite($logfile,"$result \n\n");
     fclose($logfile);
   };
 
@@ -106,7 +114,10 @@ function DB_query($query)
 
 function DB_fetch_array($result)
 {
-  return $result->fetch_array(MYSQLI_NUM);
+  if($result)
+    return $result->fetch_array(MYSQLI_NUM);
+  else
+    return NULL;
 }
 
 function DB_insert_id()
@@ -791,12 +802,14 @@ function DB_get_PREF($myid)
 
   /* get all preferences */
   $r = DB_query('SELECT pref_key, value FROM User_Prefs'.
-		      " WHERE user_id='$myid' " );
+		" WHERE user_id=".DB_quote_smart($myid) );
   while($pref = DB_fetch_array($r) )
     {
       switch($pref[0])
 	{
 	case 'cardset':
+	  if($pref[1])
+	    $PREF['cardset'] = $pref[1];
 	  break;
 
 	case 'email':
@@ -853,7 +866,7 @@ function DB_get_RULES($gameid)
 {
   $r = DB_query_array("SELECT * FROM Rulesets".
 		      " LEFT JOIN Game ON Game.ruleset=Rulesets.id ".
-		      " WHERE Game.id='$gameid'" );
+		      " WHERE Game.id=".DB_quote_smart($gameid) );
 
   $RULES['dullen']      = $r[2];
   $RULES['schweinchen'] = $r[3];
@@ -867,7 +880,7 @@ function DB_get_email_pref_by_hash($hash)
 {
   $r = DB_query_array("SELECT value FROM Hand".
 		      " LEFT JOIN User_Prefs ON Hand.user_id=User_Prefs.user_id".
-		      " WHERE hash='$hash' AND pref_key='email'" );
+		      " WHERE hash=".DB_quote_smart($hash)." AND pref_key='email'" );
   if($r)
     {
       if($r[0]=="emailaddict")
@@ -882,7 +895,7 @@ function DB_get_email_pref_by_hash($hash)
 function DB_get_email_pref_by_uid($uid)
 {
   $r = DB_query_array("SELECT value FROM User_Prefs ".
-		      " WHERE user_id='$uid' AND pref_key='email'" );
+		      " WHERE user_id=".DB_quote_smart($uid)." AND pref_key='email'" );
   if($r)
     {
       if($r[0]=="emailaddict")
@@ -917,7 +930,7 @@ function DB_get_unused_randomnumbers($userstr)
 function DB_get_number_of_passwords_recovery($user)
 {
   $r = DB_query_array("SELECT COUNT(*) FROM Recovery ".
-		      "  WHERE user_id=$user ".
+		      "  WHERE user_id=".DB_quote_smart($user).
 		      "  AND DATE_SUB(CURDATE(),INTERVAL 1 DAY) <= create_date".
 		      "  GROUP BY user_id " );
   if($r)
@@ -944,7 +957,7 @@ function DB_get_card_name($card)
   if($card==0)
     return 'backside';
 
-  $r = DB_query_array("SELECT strength,suite FROM Card WHERE id='$card'");
+  $r = DB_query_array("SELECT strength,suite FROM Card WHERE id=".DB_quote_smart($card));
 
   if($r)
     return $r[0]." of ".$r[1];
@@ -959,7 +972,7 @@ function DB_get_current_playid($gameid)
 
   if(!$trick) return -1;
 
-  $r = DB_query_array("SELECT id FROM Play WHERE trick_id='$trick' ORDER BY create_date DESC LIMIT 1");
+  $r = DB_query_array("SELECT id FROM Play WHERE trick_id=".DB_quote_smart($trick)." ORDER BY create_date DESC LIMIT 1");
 
   if($r)
     return $r[0];
@@ -969,7 +982,7 @@ function DB_get_current_playid($gameid)
 
 function DB_get_call_by_hash($hash)
 {
-  $r = DB_query_array("SELECT point_call FROM Hand WHERE hash='$hash'");
+  $r = DB_query_array("SELECT point_call FROM Hand WHERE hash=".DB_quote_smart($hash));
 
   if($r)
     return $r[0];
@@ -983,7 +996,7 @@ function DB_get_partner_call_by_hash($hash)
 
   if($partner)
     {
-      $r = DB_query_array("SELECT point_call FROM Hand WHERE hash='$partner'");
+      $r = DB_query_array("SELECT point_call FROM Hand WHERE hash=".DB_quote_smart($partner));
 
       if($r)
 	return $r[0];
@@ -997,7 +1010,8 @@ function DB_get_partner_hash_by_hash($hash)
   $gameid = DB_get_gameid_by_hash($hash);
   $party  = DB_get_party_by_hash($hash);
 
-  $r = DB_query_array("SELECT hash FROM Hand WHERE game_id='$gameid' AND party='$party' AND hash<>'$hash'");
+  $r = DB_query_array("SELECT hash FROM Hand WHERE game_id=".DB_quote_smart($gameid).
+		      " AND party=".DB_quote_smart($party)." AND hash<>".DB_quote_smart($hash));
 
   if($r)
     return $r[0];
@@ -1008,22 +1022,22 @@ function DB_get_partner_hash_by_hash($hash)
 function DB_format_gameid($gameid)
 {
   /* get session and create date */
-  $r = DB_query_array("SELECT session, create_date FROM Game WHERE id='$gameid' ");
+  $r = DB_query_array("SELECT session, create_date FROM Game WHERE id=".DB_quote_smart($gameid));
   $session = $r[0];
   $date    = $r[1];
 
   /* get number of game */
   $r = DB_query_array("SELECT SUM(TIME_TO_SEC(TIMEDIFF(create_date, '$date'))<=0) ".
 		      " FROM Game".
-		      " WHERE session='$session' ");
+		      " WHERE session=".DB_quote_smart($session));
   return $session.'.'.$r[0];
 }
 
 function DB_get_reminder($user,$gameid)
 {
   $r = DB_query_array("SELECT COUNT(*) FROM Reminder ".
-		      "  WHERE user_id=$user ".
-		      "  AND game_id=$gameid ".
+		      "  WHERE user_id=".DB_quote_smart($user).
+		      "  AND game_id=".DB_quote_smart($gameid).
 		      "  AND DATE_SUB(CURDATE(),INTERVAL 1 DAY) <= create_date".
 		      "  GROUP BY user_id " );
   if($r)
@@ -1062,11 +1076,11 @@ function DB_get_gameids_of_finished_games_by_session($session)
 				  " GROUP BY Game.id");
   else   /* return games in a session */
     $queryresult = DB_query_array_all("SELECT Game.id,SUM(IF(STRCMP(Score.party,'re'),-1,1)),Game.type FROM Game ".
-				  " LEFT JOIN Score on game_id=Game.id".
-				  "  WHERE session=$session ".
-				  "   AND status='gameover' ".
-				  " GROUP BY Game.id".
-				  " ORDER BY Game.create_date ASC");
+				      " LEFT JOIN Score on game_id=Game.id".
+				      " WHERE session=".DB_quote_smart($session).
+				      " AND status='gameover' ".
+				      " GROUP BY Game.id".
+				      " ORDER BY Game.create_date ASC");
 
   return $queryresult;
 }
@@ -1074,7 +1088,7 @@ function DB_get_gameids_of_finished_games_by_session($session)
 function DB_get_card_value_by_cardid($id)
 {
   $r = DB_query_array("SELECT points FROM Card ".
-		      "  WHERE id=$id ");
+		      "  WHERE id=".DB_quote_smart($id));
 
   if($r)
     return $r[0];