* rewrote checking for sickness, the player now sees a nice summary before getting to the table...

* wedding is now announced
* for solo and normal games, re and contra are assigned correctly 
* the score for re and contra is computed at the end
* used one variable $CARDS instead of several global ones e.g. $CARDS["trump"] instead of $TRUMP

4 files changed, 260 insertions, 125 deletions

diff --git a/db.php b/db.php
index 8843712..31098d4 100644
--- a/db.php
+++ b/db.php
@@ -417,7 +417,7 @@ function DB_get_all_userid_by_gameid($id)
   $names = array();
   
   $result = mysql_query("SELECT user_id FROM Hand WHERE game_id=".
-			DB_quote_smart($id));
+			DB_quote_smart($id)." ORDER BY position ");
   while($r = mysql_fetch_array($result,MYSQL_NUM))
     $names[] = $r[0];
 
@@ -584,4 +584,21 @@ function DB_get_ruleset($dullen,$schweinchen)
   return -1; /* something went wrong */
 }
 
+function DB_get_party_by_hash($hash)
+{
+  $result = mysql_query("SELECT party FROM Hand WHERE hash=".DB_quote_smart($hash));
+  $r      = mysql_fetch_array($result,MYSQL_NUM);
+  
+  if($r)
+    return $r[0];
+  else
+    return NULL;
+}
+function DB_set_party_by_hash($hash,$party)
+{
+  mysql_query("UPDATE Hand SET party=".DB_quote_smart($party)." WHERE hash=".DB_quote_smart($hash));
+  return;
+}
+
+
 ?>
\ No newline at end of file
diff --git a/functions.php b/functions.php
index 162b544..31167e9 100644
--- a/functions.php
+++ b/functions.php
@@ -51,9 +51,9 @@ function pos_array($c,$arr)
 
 function is_trump($c) 
 { 
-  global $TRUMP;
+  global $CARDS;
 
-  if(in_array($c,$TRUMP))
+  if(in_array($c,$CARDS["trump"]))
     return 1;
   else 
     return 0;
@@ -61,13 +61,13 @@ function is_trump($c)
 
 function is_same_suite($c1,$c2) 
 {
-  global $TRUMP,$DIAMONDS,$HEARTS,$CLUBS,$SPADES;
+  global $CARDS;
   
-  if(in_array($c1,$TRUMP   ) && in_array($c2,$TRUMP   ) ) return 1;
-  if(in_array($c1,$CLUBS   ) && in_array($c2,$CLUBS   ) ) return 1;
-  if(in_array($c1,$HEARTS  ) && in_array($c2,$HEARTS  ) ) return 1;
-  if(in_array($c1,$SPADES  ) && in_array($c2,$SPADES  ) ) return 1;
-  if(in_array($c1,$DIAMONDS) && in_array($c2,$DIAMONDS) ) return 1;
+  if(in_array($c1,$CARDS["trump"]   ) && in_array($c2,$CARDS["trump"]   ) ) return 1;
+  if(in_array($c1,$CARDS["clubs"]   ) && in_array($c2,$CARDS["clubs"]   ) ) return 1;
+  if(in_array($c1,$CARDS["hearts"]  ) && in_array($c2,$CARDS["hearts"]  ) ) return 1;
+  if(in_array($c1,$CARDS["spades"]  ) && in_array($c2,$CARDS["spades"]  ) ) return 1;
+  if(in_array($c1,$CARDS["diamonds"]) && in_array($c2,$CARDS["diamonds"]) ) return 1;
   
   return 0;
 }
@@ -76,7 +76,7 @@ function compare_cards($a,$b,$game)
 {
   /* if "a" is higher than "b" return 1, else 0, "a" being the card first played */
 
-  global $TRUMP,$DIAMONDS,$HEARTS,$CLUBS,$SPADES;
+  global $CARDS;
   global $RULES;
 
   /* first map all cards to the odd number, 
@@ -114,8 +114,8 @@ function compare_cards($a,$b,$game)
 	{ /* both no trump */
 
 	  /* both clubs? */
-	  $posA = pos_array($a,$CLUBS);
-	  $posB = pos_array($b,$CLUBS);
+	  $posA = pos_array($a,$CARDS["clubs"]);
+	  $posB = pos_array($b,$CARDS["clubs"]);
 	  if($posA && $posB)
 	    if($posA <= $posB)
 	      return 1;
@@ -123,8 +123,8 @@ function compare_cards($a,$b,$game)
 	      return 0;
 
 	  /* both spades? */
-	  $posA = pos_array($a,$SPADES);
-	  $posB = pos_array($b,$SPADES);
+	  $posA = pos_array($a,$CARDS["spades"]);
+	  $posB = pos_array($b,$CARDS["spades"]);
 	  if($posA && $posB)
 	    if($posA <= $posB)
 	      return 1;
@@ -132,8 +132,8 @@ function compare_cards($a,$b,$game)
 	      return 0;
 
 	  /* both hearts? */
-	  $posA = pos_array($a,$HEARTS);
-	  $posB = pos_array($b,$HEARTS);
+	  $posA = pos_array($a,$CARDS["hearts"]);
+	  $posB = pos_array($b,$CARDS["hearts"]);
 	  if($posA && $posB)
 	    if($posA <= $posB)
 	      return 1;
@@ -141,8 +141,8 @@ function compare_cards($a,$b,$game)
 	      return 0;
 
 	  /* both diamonds? */
-	  $posA = pos_array($a,$DIAMONDS);
-	  $posB = pos_array($b,$DIAMONDS);
+	  $posA = pos_array($a,$CARDS["diamonds"]);
+	  $posB = pos_array($b,$CARDS["diamonds"]);
 	  if($posA && $posB)
 	    if($posA <= $posB)
 	      return 1;
@@ -317,7 +317,7 @@ function card_to_name($card)
       case 48:
       return "nine of hearts";
       default:
-      return "something went wrong, please contact the admin. Error: code1.";
+      return "something went wrong, please contact the admin. Error: code1. $card <br />";
     }
 }
 
@@ -395,7 +395,7 @@ function  create_array_of_random_numbers()
     $a[$i]=$i;
   
   $r = array_rand($a,48);
-   
+  
   return $r;
 }
 
@@ -429,23 +429,23 @@ function return_timezone($offset)
 
 function have_suit($cards,$c)
 {
-  global $TRUMP,$DIAMONDS,$HEARTS,$CLUBS,$SPADES;
-  $suit = array();
-
-  if(in_array($c,$TRUMP))
-    $suit = $TRUMP;
-  else if(in_array($c,$CLUBS))
-    $suit = $CLUBS;
-  else if(in_array($c,$SPADES))
-    $suit = $SPADES;
-  else if(in_array($c,$HEARTS))
-    $suit = $HEARTS;
-  else if(in_array($c,$DIAMONDS))
-    $suit = $DIAMONDS;
+  global $CARDS;
+  $suite = array();
+
+  if(in_array($c,$CARDS["trump"]))
+    $suite = $CARDS["trump"];
+  else if(in_array($c,$CARDS["clubs"]))
+    $suite = $CARDS["clubs"];
+  else if(in_array($c,$CARDS["spades"]))
+    $suite = $CARDS["spades"];
+  else if(in_array($c,$CARDS["hearts"]))
+    $suite = $CARDS["hearts"];
+  else if(in_array($c,$CARDS["diamonds"]))
+    $suite = $CARDS["diamonds"];
 
   foreach($cards as $card)
     {
-      if(in_array($card,$suit))
+      if(in_array($card,$suite))
 	return 1;
     }
 
@@ -454,23 +454,23 @@ function have_suit($cards,$c)
 
 function same_type($card,$c)
 {
-  global $TRUMP,$DIAMONDS,$HEARTS,$CLUBS,$SPADES;
-  $suit = "";
+  global $CARDS;
+  $suite = "";
 
   /* figure out what kind of card c is */
-  if(in_array($c,$TRUMP))
-    $suit = $TRUMP;
-  else if(in_array($c,$CLUBS))
-    $suit = $CLUBS;
-  else if(in_array($c,$SPADES))
-    $suit = $SPADES;
-  else if(in_array($c,$HEARTS))
-    $suit = $HEARTS;
-  else if(in_array($c,$DIAMONDS))
-    $suit = $DIAMONDS;
+  if(in_array($c,$CARDS["trump"]))
+    $suite = $CARDS["trump"];
+  else if(in_array($c,$CARDS["clubs"]))
+    $suite = $CARDS["clubs"];
+  else if(in_array($c,$CARDS["spades"]))
+    $suite = $CARDS["spades"];
+  else if(in_array($c,$CARDS["hearts"]))
+    $suite = $CARDS["hearts"];
+  else if(in_array($c,$CARDS["diamonds"]))
+    $suite = $CARDS["diamonds"];
 
   /* card is the same suid return 1 */ 
-  if(in_array($card,$suit))
+  if(in_array($card,$suite))
     return 1;
   
   return 0;
@@ -478,7 +478,7 @@ function same_type($card,$c)
 
 function set_gametype($gametype)
 {
-  global $TRUMP,$DIAMONDS,$HEARTS,$CLUBS,$SPADES;
+  global $CARDS;
   global $RULES;
 
   switch($gametype)
@@ -486,78 +486,85 @@ function set_gametype($gametype)
     case "normal":
     case "trump":
     case "silent":
-      $TRUMP    = array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
-                        '17','18','19','20','21','22','23','24','25','26');
-      $DIAMONDS = array();
-      $CLUBS    = array('27','28','29','30','31','32','33','34');
-      $SPADES   = array('35','36','37','38','39','40','41','42');
-      $HEARTS   = array('43','44','45','46','47','48');
+      $CARDS["trump"]    = array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
+				 '17','18','19','20','21','22','23','24','25','26');
+      $CARDS["diamonds"] = array();
+      $CARDS["clubs"]    = array('27','28','29','30','31','32','33','34');
+      $CARDS["spades"]   = array('35','36','37','38','39','40','41','42');
+      $CARDS["hearts"]   = array('43','44','45','46','47','48');
+      $CARDS["foxes"]    = array('21','22');
       if($RULES["dullen"]=='none')
 	{
-	  $TRUMP    = array('3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
-                        '17','18','19','20','21','22','23','24','25','26');
-	  $HEARTS   = array('43','44','1','2','45','46','47','48');
+	  $CARDS["trump"]    = array('3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
+				     '17','18','19','20','21','22','23','24','25','26');
+	  $CARDS["hearts"]   = array('43','44','1','2','45','46','47','48');
 	}
       break;
     case "queen":
-      $TRUMP    = array('3','4','5','6','7','8','9','10');
-      $CLUBS    = array('27','28','29','30','31','32','11','12','33','34');
-      $SPADES   = array('35','36','37','38','39','40','13','14','41','42');
-      $HEARTS   = array('43','44', '1', '2','45','46','15','16','47','48');
-      $DIAMONDS = array('19','20','21','22','23','24','17','18','25','26');
+      $CARDS["trump"]    = array('3','4','5','6','7','8','9','10');
+      $CARDS["clubs"]    = array('27','28','29','30','31','32','11','12','33','34');
+      $CARDS["spades"]   = array('35','36','37','38','39','40','13','14','41','42');
+      $CARDS["hearts"]   = array('43','44', '1', '2','45','46','15','16','47','48');
+      $CARDS["diamonds"] = array('19','20','21','22','23','24','17','18','25','26');
+      $CARDS["foxes"]    = array();
       break;
     case "jack":
-      $TRUMP    = array('11','12','13','14','15','16','17','18');
-      $CLUBS    = array('27','28','29','30','31','32','3', '4','33','34');
-      $SPADES   = array('35','36','37','38','39','40','5', '6','41','42');
-      $HEARTS   = array('43','44', '1', '2','45','46','7', '8','47','48');
-      $DIAMONDS = array('19','20','21','22','23','24','9','10','25','26');
+      $CARDS["trump"]    = array('11','12','13','14','15','16','17','18');
+      $CARDS["clubs"]    = array('27','28','29','30','31','32','3', '4','33','34');
+      $CARDS["spades"]   = array('35','36','37','38','39','40','5', '6','41','42');
+      $CARDS["hearts"]   = array('43','44', '1', '2','45','46','7', '8','47','48');
+      $CARDS["diamonds"] = array('19','20','21','22','23','24','9','10','25','26');
+      $CARDS["foxes"]    = array();
       break;
     case "trumpless":
-      $TRUMP    = array();
-      $CLUBS    = array('27','28','29','30','31','32','3', '4','11','12','33','34');
-      $SPADES   = array('35','36','37','38','39','40','5', '6','13','14','41','42');
-      $HEARTS   = array('43','44', '1', '2','45','46','7', '8','15','16','47','48');
-      $DIAMONDS = array('19','20','21','22','23','24','9','10','17','18','25','26');
+      $CARDS["trump"]    = array();
+      $CARDS["clubs"]    = array('27','28','29','30','31','32','3', '4','11','12','33','34');
+      $CARDS["spades"]   = array('35','36','37','38','39','40','5', '6','13','14','41','42');
+      $CARDS["hearts"]   = array('43','44', '1', '2','45','46','7', '8','15','16','47','48');
+      $CARDS["diamonds"] = array('19','20','21','22','23','24','9','10','17','18','25','26');
+      $CARDS["foxes"]    = array();
       break;
     case "club":
-      $TRUMP    = array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
-                        '17','18','27','28','29','30','31','32','33','34');
-      $CLUBS    = array();
-      $SPADES   = array('35','36','37','38','39','40','41','42');
-      $HEARTS   = array('43','44','45','46','47','48');
-      $DIAMONDS = array('19','20','21','22','23','24','25','26');
+      $CARDS["trump"]    = array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
+				 '17','18','27','28','29','30','31','32','33','34');
+      $CARDS["clubs"]    = array();
+      $CARDS["spades"]   = array('35','36','37','38','39','40','41','42');
+      $CARDS["hearts"]   = array('43','44','45','46','47','48');
+      $CARDS["diamonds"] = array('19','20','21','22','23','24','25','26');
+      $CARDS["foxes"]    = array();
       if($RULES["dullen"]=='none')
 	{
-	  $TRUMP    = array('3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
-			    '17','18','27','28','29','30','31','32','33','34');
-	  $HEARTS   = array('43','44','1','2','45','46','47','48');
+	  $CARDS["trump"]    = array('3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
+				     '17','18','27','28','29','30','31','32','33','34');
+	  $CARDS["hearts"]   = array('43','44','1','2','45','46','47','48');
 	}
       break;
     case "spade":
-      $TRUMP    = array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
-                        '17','18','35','36','37','38','39','40','41','42');
-      $CLUBS    = array('27','28','29','30','31','32','33','34');
-      $SPADES   = array();
-      $HEARTS   = array('43','44','45','46','47','48');
-      $DIAMONDS = array('19','20','21','22','23','24','25','26');
+      $CARDS["trump"]    = array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
+				 '17','18','35','36','37','38','39','40','41','42');
+      $CARDS["clubs"]    = array('27','28','29','30','31','32','33','34');
+      $CARDS["spades"]   = array();
+      $CARDS["hearts"]   = array('43','44','45','46','47','48');
+      $CARDS["diamonds"] = array('19','20','21','22','23','24','25','26');
+      $CARDS["foxes"]    = array();
       if($RULES["dullen"]=='none')
 	{
-	  $TRUMP    = array('3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
-			    '17','18','35','36','37','38','39','40','41','42');
-	  $HEARTS   = array('43','44','1','2','45','46','47','48');
+	  $CARDS["trump"]    = array('3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
+				     '17','18','35','36','37','38','39','40','41','42');
+	  $CARDS["hearts"]   = array('43','44','1','2','45','46','47','48');
 	}
       break;
     case "heart":
-      $TRUMP    = array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
-                        '17','18','43','44','45','46','47','48');
-      $CLUBS    = array('27','28','29','30','31','32','33','34');
-      $SPADES   = array('35','36','37','38','39','40','41','42');
-      $HEARTS   = array();
-      $DIAMONDS = array('19','20','21','22','23','24','25','26');
+      $CARDS["trump"]    = array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
+				 '17','18','43','44','45','46','47','48');
+      $CARDS["clubs"]    = array('27','28','29','30','31','32','33','34');
+      $CARDS["spades"]   = array('35','36','37','38','39','40','41','42');
+      $CARDS["hearts"]   = array();
+      $CARDS["diamonds"] = array('19','20','21','22','23','24','25','26');
+      $CARDS["foxes"]    = array();
       if($RULES["dullen"]=='none')
 	{
-	  $TRUMP    = array('3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
+	  $CARDS["trump"]    = array('3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
 			    '17','18','43','44','1','2','45','46','47','48');
 	}
       break;
@@ -572,10 +579,11 @@ function mysort($cards,$gametype)
 
 function sort_comp($a,$b)
 {
-  global $TRUMP,$DIAMONDS,$HEARTS,$CLUBS,$SPADES;
+  global $CARDS;
 
   $ALL = array();
-  $ALL = array_merge($TRUMP,$DIAMONDS,$CLUBS,$HEARTS,$SPADES,$DIAMONDS);
+  $ALL = array_merge($CARDS["trump"],$CARDS["diamonds"],$CARDS["clubs"],
+		     $CARDS["hearts"],$CARDS["spades"],$CARDS["diamonds"]);
 
   return pos_array($a,$ALL)-pos_array($b,$ALL);
 }
diff --git a/index.php b/index.php
index bd5702e..eded836 100644
--- a/index.php
+++ b/index.php
@@ -328,19 +328,20 @@ else if(myisset("me"))
 	  else if($_REQUEST["wedding"] == "yes")
 	    {
 	      /* TODO: add silent solo somewhere*/
-	      echo "wedding was chosen, can't handle it at the moment, you need to send out".
-		" an email by hand to the other players<br />\n";
+	      echo "Ok, you don't want to play a silent solo...wedding was chosen.<br />\n";
 	      DB_set_sickness_by_hash($me,"wedding");
 	    }
 	  else if($_REQUEST["poverty"] == "yes")
 	    {
-	      echo "poverty was chosen. Unfortunately this is not implemented yet,".
-		" so you need to play a normal game... sorry<br />\n";
+	      echo "So you got poverty. You might as well have said nothing, since this is not implemented yet,".
+		" so you need to play a normal game...to make it a bit harder, I'll tell the other people that".
+		" you only have a few trump... should make the game more interesting (although perhaps not for you:))<br />\n";
 	      DB_set_sickness_by_hash($me,"poverty");
 	    }
 	  else if($_REQUEST["nines"] == "yes")
 	    {
-	      echo "Nines was chosen. If no is playing solo, this game will be canceled.<br />\n";
+	      echo "What you just don't want to play a game because you have a few nines? Well, if no one".
+		" is playing solo, this game will be canceled.<br />\n";
 	      DB_set_sickness_by_hash($me,"nines");
 	    }
 	}
@@ -356,7 +357,7 @@ else if(myisset("me"))
        * set that one in the Game table
        * tell people about it.
        */
-      echo "<br />checking if someone else selected solo or nines... wedding and poverty not handled at the moment<br />".
+      echo "<br />checking if someone else selected solo or nines... poverty not handled at the moment<br />".
 	" Please click <a href=\"$host?me=$me\">here</a> to finish the setup.<br />";	 
       
       /* check if everyone has reached this stage */
@@ -371,7 +372,7 @@ else if(myisset("me"))
 
       if($ok)
 	{
-	  echo "Everyone has finished checking their cards, the game can now start...<br />";
+	  echo "Everyone has finished checking their cards, let's see what they said...<br />";
 	  /* check what kind of game we are playing */
 	  $gametype    = DB_get_gametype_by_gameid($gameid);
 	  $startplayer = DB_get_startplayer_by_gameid($gameid);
@@ -384,9 +385,9 @@ else if(myisset("me"))
 	      $nines = $user;
 	  
 	  /* gamestatus == normal, => cancel game */
-	  if($nines && $gamestatus == "normal")
+	  if($nines && $gametype != "solo")
 	    {
-	      /* TODO: set game type to nines to be able to keep statistics? */
+	      /* TODO: should we keep statistics of this? */
 	      $message = "Hello, \n\n".
 		"the game has been canceled because ".DB_get_name_by_userid($nines)." has five or more nines.\n";
 	      
@@ -399,7 +400,10 @@ else if(myisset("me"))
 	      
 	      /* delete everything from the dB */
 	      DB_cancel_game($me);
+	      exit();
 	    }
+
+	  /* check for different sickness and just output a general info */
 	  
 	  /* check players for poverty */
 	  $poverty = 0;
@@ -412,21 +416,19 @@ else if(myisset("me"))
 		  echo "$name has a Vorbehalt. <br />";
 		}
 	    }
-	  /* if gamestatus == normal, set poverty or dpovert (in case two people have poverty) */
-	  
+
 	  /* check players for wedding */
 	  $wedding = 0;
 	  foreach($userids as $user)
 	    {
 	      if(DB_get_sickness_by_userid_and_gameid($user,$gameid) == 'wedding')
 		{
-		  $wedding++;
+		  $wedding=$user;
 		  $name = DB_get_name_by_userid($user);
 		  echo "$name has a Vorbehalt. <br />"  ;
 		}
-	    }
-	  /* if gamestatus == normal, set wedding  */
-	  
+	    };
+
 	  /* check for solo, output vorbehalt */
 	  $solo = 0;
 	  foreach($userids as $user)
@@ -439,8 +441,91 @@ else if(myisset("me"))
 		}
 	    }
 
-	  /* finished the setup, go to next stage */
-	  DB_set_hand_status_by_hash($me,'play');
+	  /* now check which sickness comes first and set the gametype to it */
+
+	  /* if gamestatus == normal, set poverty or dpovert (in case two people have poverty) */
+	  if($poverty>0 && $gametype == "normal")
+	    {
+	      if($poverty==1)
+		{
+		  DB_set_gametype_by_gameid($gameid,"poverty");
+		  $gametype = "poverty";
+		}
+	      else if($poverty==2)
+		{
+		  DB_set_gametype_by_gameid($gameid,"dpoverty");
+		  $gametype = "dpoverty";
+		};
+	    };
+	  /* if gamestatus == normal, set wedding  */
+	  if($wedding> 0 && $gametype == "normal")
+	    {
+	      DB_set_gametype_by_gameid($gameid,"wedding");
+	      $gametype = "wedding";
+	    };
+	  
+	  /* now the gametype is set correctly (shouldn't matter that this is calculated for every user)
+	   * output what kind of game we have */
+	  
+	  echo "<br />\n";
+
+	  $poverty=0;
+	  foreach($userids as $user)
+	    {
+	      $name = DB_get_name_by_userid($user);
+	      $usersick = DB_get_sickness_by_userid_and_gameid($user,$gameid);
+	      if($usersick=="poverty")
+		$poverty++;
+	      if($usersick)
+		echo "$name has $usersick <br />";
+	      if($usersick == "wedding" && $gametype =="wedding")
+		break;
+	      if($usersick == "poverty" && $gametype =="poverty")
+		break;
+	      if($usersick == "poverty" && $gametype =="dpoverty" && $poverty==2)
+		break;
+	      if($usersick == "solo" && $gametype =="solo")
+		break;
+	    };	  
+	  echo "<br />\n";
+	  
+	  /* check for Schweinchen (cards 21,22) */
+	  if($RULES["schweinchen"]=="both")
+	    {
+	      set_gametype($gametype);
+	      echo "TODO: check if one user has both foxes and output here ";
+	    }    
+
+	  /* finished the setup, go to next stage unless there is a case of poverty*/
+	  switch($gametype)
+	    {
+	    case "solo":
+	      /* are we the solo player? set us to re, else set us to contra */
+	      $pos = DB_get_pos_by_hash($me);
+	      if($pos == $startplayer)
+		DB_set_party_by_hash($me,"re");
+	      else
+		DB_set_party_by_hash($me,"contra");
+	      DB_set_hand_status_by_hash($me,'play');
+	      break;
+	    case "wedding":
+	      echo "Don't know who will be Re and Contra, you need to figure that out at the end of the game yourself <br />\n";
+	      DB_set_hand_status_by_hash($me,'play');
+	      break;
+	    case "normal":
+	      $hand = DB_get_all_hand($me);
+	      
+	      if(in_array('3',$hand)||in_array('4',$hand))
+		DB_set_party_by_hash($me,"re");
+	      else
+		DB_set_party_by_hash($me,"contra");
+	      DB_set_hand_status_by_hash($me,'play');
+	      break;
+	    case "poverty":
+	    case "dpoverty":
+	      echo "TODO: handle poverty here";
+	      DB_set_hand_status_by_hash($me,'play');
+	    };
 	}
       else
 	{
@@ -467,7 +552,8 @@ else if(myisset("me"))
        */
       
       /* figure out what kind of game we are playing, 
-       * set the global variables $TRUMP,$DIAMONDS,$HEARTS,$CLUBS,$SPADES
+       * set the global variables $CARDS["trump"],$CARDS["diamonds"],$CARDS["hearts"],
+       * $CARDS["clubs"],$CARDS["spades"],$CARDS["foxes"]
        * accordingly
        */
       
@@ -717,15 +803,26 @@ else if(myisset("me"))
 		    echo "ERROR during scoring";
 		  
 		  /* email all players */
-		  $result = mysql_query("SELECT fullname, SUM(score) FROM Score".
+		  /* individual score */
+		  $result = mysql_query("SELECT fullname, SUM(score), Hand.party FROM Score".
 					" LEFT JOIN Hand ON Hand.id=hand_id".
 					" LEFT JOIN User ON Hand.user_id=User.id".
 					" WHERE Hand.game_id=$gameid".
 					" GROUP BY fullname" );
 		  $message = "The game is over. Thanks for playing :)\n";
 		  while( $r = mysql_fetch_array($result,MYSQL_NUM))
+		    $message .= " FINAL SCORE: ".$r[0]."(".$r[2].") ".$r[1]."\n";
+		  $message .= "\nIf your not in the list above your score is zero...\n\n";
+
+		  $result = mysql_query("SELECT Hand.party, SUM(score) FROM Score".
+					" LEFT JOIN Hand ON Hand.id=hand_id".
+					" LEFT JOIN User ON Hand.user_id=User.id".
+					" WHERE Hand.game_id=$gameid".
+					" GROUP BY Hand.party" );
+		  $message .= "\n";
+		  while( $r = mysql_fetch_array($result,MYSQL_NUM))
 		    $message .= " FINAL SCORE: ".$r[0]." ".$r[1]."\n";
-		  $message .= "\nIf your not in the list above your score is zero...\n";
+
 		  foreach($userids as $user)
 		    {
 		      $To = DB_get_email_by_userid($user);
@@ -847,14 +944,22 @@ else if(myisset("me"))
 	{
 	  echo "the game is over now...<br />\n";
 	  
-	  $result = mysql_query("SELECT fullname, SUM(score) FROM Score".
+	  $result = mysql_query("SELECT fullname, SUM(score), Hand.party FROM Score".
 				" LEFT JOIN Hand ON Hand.id=hand_id".
 				" LEFT JOIN User ON Hand.user_id=User.id".
 				" WHERE Hand.game_id=$gameid".
 				" GROUP BY fullname" );
 	  while( $r = mysql_fetch_array($result,MYSQL_NUM))
-	    echo " FINAL SCORE: ".$r[0]." ".$r[1]."<br />";
+	    echo " FINAL SCORE: ".$r[0]."(".$r[2].") ".$r[1]."<br />";
 	  
+	  $result = mysql_query("SELECT Hand.party, SUM(score) FROM Score".
+				" LEFT JOIN Hand ON Hand.id=hand_id".
+				" LEFT JOIN User ON Hand.user_id=User.id".
+				" WHERE Hand.game_id=$gameid".
+				" GROUP BY Hand.party" );
+	  while( $r = mysql_fetch_array($result,MYSQL_NUM))
+	    echo " FINAL SCORE: ".$r[0]." ".$r[1]."<br />\n";
+
 	  
 	  $session = DB_get_session_by_gameid($gameid);
 	  $result  = mysql_query("SELECT id,create_date FROM Game".
diff --git a/output.php b/output.php
index 721858f..d20d725 100644
--- a/output.php
+++ b/output.php
@@ -39,7 +39,7 @@ function output_register()
 {
   echo "IMPORTANT: passwords are going over the net as clear text, so pick an easy password. No need to pick anything complicated here ;)<br /><br />";
   echo "TODO: convert timezone into a menu<br />\n";
-  echo "TODO: figure out a way to handle passwrods <br />\n";
+  echo "TODO: figure out a way to handle passwords <br />\n";
   ?>
         <form action="index.php" method="post">
           <fieldset>
@@ -126,9 +126,14 @@ function output_form_for_new_game($names)
       <p> schweinchen (both foxes): 
         <ul>
         <li> <input type="radio" name="schweinchen" value="none" /> none </li>
-      <li> <input type="radio" name="schweinchen" value="both" /> both become highest trump (call at beginning of the game)(doesn't work yet) </li>
-        <li> <input type="radio" name="schweinchen" value="second" checked="checked" /> first one normal, second one becomes highest (call during the game) (doesn't work yet) </li>
-      <li> <input type="radio" name="schweinchen" value="secondaftercall"  /> second one become highest only in case re/contra was announced (doesn't work yet)</li>
+        <li> <input type="radio" name="schweinchen" value="both" /> 
+              both become highest trump (automatic call at beginning of the game)
+              (does not work yet) </li>
+        <li> <input type="radio" name="schweinchen" value="second" checked="checked" /> 
+              first one normal, second one becomes highest (call during the game) (does not work yet) </li>
+        <li> <input type="radio" name="schweinchen" value="secondaftercall"  /> 
+             second one become highest only in case re/contra was announced 
+            (does not work yet)</li>
       </ul>
       </p>