CLEANUP: removed all calls to mysql functions and replaced them with calls to DB_xxx

should be very easy now to change to a different database. also made the code look nicer ;)

Signed-off-by: Arun Persaud <arun@nubati.net>

1 files changed, 97 insertions, 98 deletions

diff --git a/include/stats.php b/include/stats.php
index bde6a09..cf9b412 100644
--- a/include/stats.php
+++ b/include/stats.php
@@ -5,8 +5,8 @@
 if(!isset($HOST))
   exit;
 
-$name = $_SESSION["name"];
-$email     = DB_get_email('name',$name);
+$name  = $_SESSION["name"];
+$email = DB_get_email('name',$name);
 
 $myid = DB_get_userid('email',$email);
 if(!$myid)
@@ -27,40 +27,39 @@ echo "<div class=\"user\">\n";
 
 /* total number of games */
 echo "<p>The number of finished games on this server is: ";
-$result = mysql_query("SELECT COUNT(*) from Game".
-		      " WHERE status='gameover'");
-$r = mysql_fetch_array($result,MYSQL_NUM);
+$r = DB_query_array("SELECT COUNT(*) from Game".
+		    " WHERE status='gameover'");
 $GameN =  $r[0];
 echo " $GameN </p>\n";
 
 echo "<p>The contra party wins in ";
-$result = mysql_query("SELECT COUNT(*) from Score".
-		      " LEFT JOIN Game ON Game.id=game_id".
-		      " WHERE score='againstqueens'".
-		      " AND Game.status='gameover'");
-while( $r = mysql_fetch_array($result,MYSQL_NUM))
+$result = DB_query("SELECT COUNT(*) from Score".
+		   " LEFT JOIN Game ON Game.id=game_id".
+		   " WHERE score='againstqueens'".
+		   " AND Game.status='gameover'");
+while( $r = DB_fetch_array($result))
   echo $r[0];
 echo " games.</p>\n";
 
 
 /* number of solos */
 echo "<p>These kind of games have been played this often: <br />";
-$result = mysql_query("SELECT COUNT(*) as c,type from Game".
-		      " WHERE status='gameover'".
-		      " GROUP BY type".
-		      " ORDER BY c DESC");
-while( $r = mysql_fetch_array($result,MYSQL_NUM))
+$result = DB_query("SELECT COUNT(*) as c,type from Game".
+		   " WHERE status='gameover'".
+		   " GROUP BY type".
+		   " ORDER BY c DESC");
+while( $r = DB_fetch_array($result))
   echo "".$r[1]." (".$r[0].") <br />";
 echo " </p>\n";
 
 /* break up solos in types */
 echo "<p>These kind of solos have been played this often: <br />";
-$result = mysql_query("SELECT COUNT(*) as c,solo from Game".
-		      " WHERE status='gameover'".
-		      " AND type='solo'".
-		      " GROUP BY solo".
-		      " ORDER BY c DESC");
-while( $r = mysql_fetch_array($result,MYSQL_NUM))
+$result = DB_query("SELECT COUNT(*) as c,solo from Game".
+		   " WHERE status='gameover'".
+		   " AND type='solo'".
+		   " GROUP BY solo".
+		   " ORDER BY c DESC");
+while( $r = DB_fetch_array($result))
   echo "".$r[1]." (".$r[0].")<br />";
 echo "</p>\n";
 
@@ -77,41 +76,41 @@ echo "</p>\n";
  
 */
 echo "<p>Most extra points (doko, fox, karlchen) in a single game:<br />\n";
-$result = mysql_query("SELECT COUNT(*) as c,fullname FROM Score".
-		      " LEFT JOIN User ON User.id=winner_id" .
-		      " WHERE score IN ('fox','doko','karlchen')".
-		      " GROUP BY game_id,fullname".
-		      " ORDER BY c DESC LIMIT 3" );
-while( $r = mysql_fetch_array($result,MYSQL_NUM))
+$result = DB_query("SELECT COUNT(*) as c,fullname FROM Score".
+		   " LEFT JOIN User ON User.id=winner_id" .
+		   " WHERE score IN ('fox','doko','karlchen')".
+		   " GROUP BY game_id,fullname".
+		   " ORDER BY c DESC LIMIT 3" );
+while( $r = DB_fetch_array($result))
   echo $r[1]." (".$r[0].") <br />\n";
 echo "</p>\n";
 
 /* longest and shortest game */
-$r=mysql_query("SELECT timediff(mod_date,create_date) ,session,id".
-	       " FROM Game WHERE status='gameover'".
-	       " ORDER BY time_to_sec(timediff(mod_date,create_date)) ASC LIMIT 1");
+$r=DB_query("SELECT timediff(mod_date,create_date) ,session,id".
+	    " FROM Game WHERE status='gameover'".
+	    " ORDER BY time_to_sec(timediff(mod_date,create_date)) ASC LIMIT 1");
 
 if($r)
   {
-    $short= mysql_fetch_array($r,MYSQL_NUM);
+    $short= DB_fetch_array($r);
     $names = DB_get_all_names_by_gameid($short[2]);
     echo "<p> The shortest game took only ".$short[0]." hours and was played by  ".join(", ",$names).".<br />\n";
   }
 
-$r=mysql_query("SELECT datediff(mod_date,create_date) ,session,id".
-	       " FROM Game WHERE status='gameover'".
-	       " ORDER BY time_to_sec(timediff(mod_date,create_date)) DESC LIMIT 1");
+$r=DB_query("SELECT datediff(mod_date,create_date) ,session,id".
+	    " FROM Game WHERE status='gameover'".
+	    " ORDER BY time_to_sec(timediff(mod_date,create_date)) DESC LIMIT 1");
 if($r)
   {
-    $long= mysql_fetch_array($r,MYSQL_NUM);
+    $long= DB_fetch_array($r);
     echo "The longest game took ".$long[0]." days.</p>\n";
   }
 
-$r=mysql_query("SELECT COUNT(*) as c, session, id FROM Game ".
-	       " GROUP BY session ORDER BY c DESC LIMIT 1");
+$r=DB_query("SELECT COUNT(*) as c, session, id FROM Game ".
+	    " GROUP BY session ORDER BY c DESC LIMIT 1");
 if($r)
   {
-    $long  = mysql_fetch_array($r,MYSQL_NUM);
+    $long  = DB_fetch_array($r);
     $names = DB_get_all_names_by_gameid($long[2]);
     echo "The longest session is session ".$long[1]." with ".$long[0].
       " games played by ".join(", ",$names).".</p>\n";
@@ -119,98 +118,98 @@ if($r)
 
 /* most reminders */
 echo "<p>These players got the most reminders per game:<br />\n";
-$result = mysql_query("SELECT COUNT(*)  /" .
-		      "      (SELECT COUNT(*) FROM Hand".
-		      "       WHERE user_id=User.id) as c,".
-		      " fullname FROM Reminder".
-		      " LEFT JOIN User ON User.id=user_id".
-		      " GROUP BY user_id".
-		      " ORDER BY c DESC LIMIT 5" );
-while( $r = mysql_fetch_array($result,MYSQL_NUM))
+$result = DB_query("SELECT COUNT(*)  /" .
+		   "      (SELECT COUNT(*) FROM Hand".
+		   "       WHERE user_id=User.id) as c,".
+		   " fullname FROM Reminder".
+		   " LEFT JOIN User ON User.id=user_id".
+		   " GROUP BY user_id".
+		   " ORDER BY c DESC LIMIT 5" );
+while( $r = DB_fetch_array($result))
   echo $r[1]." (".$r[0].") <br />\n";
 echo "</p>\n";
 
 /* fox */
 echo "<p>These players caught the most foxes per game:<br />\n";
-$result = mysql_query("SELECT COUNT(*) /" .
-		      "      (SELECT COUNT(*) FROM Hand".
-		      "       WHERE user_id=User.id) as c,".
-		      " fullname".
-		      " FROM Score".
-		      " LEFT JOIN User ON User.id=winner_id".
-		      " WHERE score='fox'".
-		      " GROUP BY winner_id".
-		      " ORDER BY c DESC LIMIT 5" );
-while( $r = mysql_fetch_array($result,MYSQL_NUM))
+$result = DB_query("SELECT COUNT(*) /" .
+		   "      (SELECT COUNT(*) FROM Hand".
+		   "       WHERE user_id=User.id) as c,".
+		   " fullname".
+		   " FROM Score".
+		   " LEFT JOIN User ON User.id=winner_id".
+		   " WHERE score='fox'".
+		   " GROUP BY winner_id".
+		   " ORDER BY c DESC LIMIT 5" );
+while( $r = DB_fetch_array($result))
   echo $r[1]." (".$r[0].") <br />\n";
 echo "</p>\n";
 
 echo "<p>These players lost their fox most often per game:<br />\n";
-$result = mysql_query("SELECT COUNT(*) /" .
-		      "      (SELECT COUNT(*) FROM Hand".
-		      "       WHERE user_id=User.id) as c,".
-		      " fullname".
-		      " FROM Score".
-		      " LEFT JOIN User ON User.id=looser_id".
-		      " WHERE score='fox'".
-		      " GROUP BY looser_id".
-		      " ORDER BY c DESC LIMIT 5" );
-while( $r = mysql_fetch_array($result,MYSQL_NUM))
+$result = DB_query("SELECT COUNT(*) /" .
+		   "      (SELECT COUNT(*) FROM Hand".
+		   "       WHERE user_id=User.id) as c,".
+		   " fullname".
+		   " FROM Score".
+		   " LEFT JOIN User ON User.id=looser_id".
+		   " WHERE score='fox'".
+		   " GROUP BY looser_id".
+		   " ORDER BY c DESC LIMIT 5" );
+while( $r = DB_fetch_array($result))
   echo $r[1]." (".$r[0].") <br />\n";
 echo "</p>\n";
 
 echo "<p>These players lost their fox least often per game:<br />\n";
-$result = mysql_query("SELECT COUNT(*) /" .
-		      "      (SELECT COUNT(*) FROM Hand".
-		      "       WHERE user_id=User.id) as c,".
-		      " fullname".
-		      " FROM Score".
-		      " LEFT JOIN User ON User.id=looser_id".
-		      " WHERE score='fox'".
-		      " GROUP BY looser_id".
-		      " ORDER BY c ASC LIMIT 5" );
-while( $r = mysql_fetch_array($result,MYSQL_NUM))
+$result = DB_query("SELECT COUNT(*) /" .
+		   "      (SELECT COUNT(*) FROM Hand".
+		   "       WHERE user_id=User.id) as c,".
+		   " fullname".
+		   " FROM Score".
+		   " LEFT JOIN User ON User.id=looser_id".
+		   " WHERE score='fox'".
+		   " GROUP BY looser_id".
+		   " ORDER BY c ASC LIMIT 5" );
+while( $r = DB_fetch_array($result))
   echo $r[1]." (".$r[0].") <br />\n";
 echo "</p>\n";
 
 /* which position wins the most tricks  */
 echo "<p>Which positions at the table make the most tricks:<br />\n";
-$result = mysql_query("SELECT COUNT(*) AS c,winner FROM Trick".
-		      " GROUP BY winner".
-		      " ORDER BY winner ASC " );
-$r = mysql_fetch_array($result,MYSQL_NUM);
+$result = DB_query("SELECT COUNT(*) AS c,winner FROM Trick".
+		   " GROUP BY winner".
+		   " ORDER BY winner ASC " );
+$r = DB_fetch_array($result);
 if($r[1]==NULL) /* ongoing games, no winner yet */
-  $r = mysql_fetch_array($result,MYSQL_NUM);
+  $r = DB_fetch_array($result);
 echo " left ".$r[0]." <br />\n";
-$r = mysql_fetch_array($result,MYSQL_NUM);
+$r = DB_fetch_array($result);
 echo " top ".$r[0]." <br />\n";
-$r = mysql_fetch_array($result,MYSQL_NUM);
+$r = DB_fetch_array($result);
 echo " right ".$r[0]." <br />\n";
-$r = mysql_fetch_array($result,MYSQL_NUM);
+$r = DB_fetch_array($result);
 echo " bottom ".$r[0]." <br />\n";
 echo "</p>\n";
 
 /* most games */
 echo "<p>Most games played on the server:<br />\n";
-$result = mysql_query("SELECT COUNT(*) as c,  " .
-		      " fullname FROM Hand".
-		      " LEFT JOIN User ON User.id=user_id".
-		      " GROUP BY user_id".
-		      " ORDER BY c DESC LIMIT 7" );
-while( $r = mysql_fetch_array($result,MYSQL_NUM))
+$result = DB_query("SELECT COUNT(*) as c,  " .
+		   " fullname FROM Hand".
+		   " LEFT JOIN User ON User.id=user_id".
+		   " GROUP BY user_id".
+		   " ORDER BY c DESC LIMIT 7" );
+while( $r = DB_fetch_array($result))
   echo $r[1]." (".$r[0].") <br />\n";
 echo "</p>\n";
 
 /* most active games */
 echo "<p>These players are involved in this many active games:<br />\n";
-$result = mysql_query("SELECT COUNT(*) as c,  " .
-		      " fullname FROM Hand".
-		      " LEFT JOIN User ON User.id=user_id".
-		      " LEFT JOIN Game ON Game.id=game_id".
-		      " WHERE Game.status<>'gameover'".
-		      " GROUP BY user_id".
-		      " ORDER BY c DESC LIMIT 7" );
-while( $r = mysql_fetch_array($result,MYSQL_NUM))
+$result = DB_query("SELECT COUNT(*) as c,  " .
+		   " fullname FROM Hand".
+		   " LEFT JOIN User ON User.id=user_id".
+		   " LEFT JOIN Game ON Game.id=game_id".
+		   " WHERE Game.status<>'gameover'".
+		   " GROUP BY user_id".
+		   " ORDER BY c DESC LIMIT 7" );
+while( $r = DB_fetch_array($result))
   echo $r[1]." (".$r[0].") <br />\n";
 echo "</p>\n";