CLEANUP: get card names from the database

diff --git a/db.php b/db.php
index 86f3d0e4d68fe4de8f14051da84c99b43ca5f10b..75cd8a0e83bcdcdeb77abab0d013c66450070fa5 100644 (file)
--- a/db.php
+++ b/db.php
@@ -803,4 +803,16 @@ function DB_set_recovery_password($user,$newpw)
              
   return;
 }
+
+function DB_get_card_name($card)
+{
+  $queryresult = mysql_query("SELECT strength,suite FROM Card WHERE id='$card'");
+  
+  $r = mysql_fetch_array($queryresult,MYSQL_NUM);
+  if($r)
+    return $r[0]." of ".$r[1];
+  else
+    return "Error during get_card_name ".$card;
+}
+
 ?>
\ No newline at end of file

diff --git a/functions.php b/functions.php
index 3a650a2d94ca3dadb31f418595a962b84d528719..be8897453ab574d2b0f2f4c4e9f8f52745bddf53 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -276,87 +276,6 @@ function count_trump($cards)
   return $trump;
 }
 
-function card_to_name($card)
-{
-  switch($card)
-    {
-      case 1:
-      case 2:
-        return "ten of hearts";
-      case 3:
-      case 4:
-      return "queen of clubs";
-      case 5:
-      case 6:
-      return "queen of spades";
-      case 7:
-      case 8:
-      return "queen of hearts";
-      case 9:
-      case 10:
-      return "queen of diamonds";
-      case 11:
-      case 12:
-      return "jack of clubs";
-      case 13:
-      case 14:
-      return "jack of spades";
-      case 15:
-      case 16:
-      return "jack of hearts";
-      case 17:
-      case 18:
-      return "jack of diamonds";
-      case 19:
-      case 20:
-      return "ace of diamonds";
-      case 21:
-      case 22:
-      return "ten of diamonds";
-      case 23:
-      case 24:
-      return "king of diamonds";
-      case 25:
-      case 26:
-      return "nine of diamonds";;
-      case 27:
-      case 28:
-      return "ace of clubs";
-      case 29:
-      case 30:
-      return "ten of clubs";
-      case 31:
-      case 32:
-      return "king of clubs";
-      case 33:
-      case 34:
-      return "nine of clubs";
-      case 35:
-      case 36:
-      return "ace of spades";
-      case 37:
-      case 38:
-      return "ten of spades";
-      case 39:
-      case 40:
-      return "king of spades";
-      case 41:
-      case 42:
-      return "nine of spades";
-      case 43:
-      case 44:
-      return "ace of hearts";
-      case 45:
-      case 46:
-      return "king of hearts";
-      case 47:
-      case 48:
-      return "nine of hearts";
-      default:
-      return "something went wrong, please contact the admin. Error: code1. $card <br />";
-    }
-}
-
 function card_value($card)
 {
   switch($card)

diff --git a/output.php b/output.php
index fe4a971a9b788bc63eb61805f99f1c83ff045966..f22c6df6962c344ea217ad13dfc48640cdcc310b 100644 (file)
--- a/output.php
+++ b/output.php
@@ -179,9 +179,9 @@ function display_card($card,$dir="english")
    * convert even cards to the matching odd value */
 
   if( $card/2 - (int)($card/2) == 0.5)
-    echo "<img src=\"cards/".$dir."/".$card.".png\"  alt=\"".card_to_name($card)."\" />\n";
+    echo "<img src=\"cards/".$dir."/".$card.".png\"  alt=\"".DB_get_card_name($card)."\" />\n";
   else
-    echo "<img src=\"cards/".$dir."/".($card-1).".png\"  alt=\"".card_to_name($card-1)."\" />\n";
+    echo "<img src=\"cards/".$dir."/".($card-1).".png\"  alt=\"".DB_get_card_name($card-1)."\" />\n";
 
   return;
 }
@@ -189,9 +189,9 @@ function display_card($card,$dir="english")
 function display_link_card($card,$dir="english",$type="card")
 {
   if( $card/2 - (int)($card/2) == 0.5)
-    echo "<div class=\"cardinput\"><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" /><img src=\"cards/".$dir."/".$card.".png\" alt=\"\" /></div>\n";
+    echo "<div class=\"cardinput\"><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" /><img src=\"cards/".$dir."/".$card.".png\" alt=\"".DB_get_card_name($card)."\" /></div>\n";
   else
-    echo "<div class=\"cardinput\" ><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" /><img src=\"cards/".$dir."/".($card-1).".png\" alt=\"\" /></div>\n";
+    echo "<div class=\"cardinput\" ><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" /><img src=\"cards/".$dir."/".($card-1).".png\" alt=\"".DB_get_card_name($card-1)."\" /></div>\n";
   return;
 }