X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=02d6f9658c222e43e4e7de1c769382632d75b2cb;hp=eb66a987157c6bcd98ddbcf57f0ce343e7e7fcca;hb=9597b99442a783621315839880966d68a2fd460f;hpb=8550cac6f9bedbd9219d898f7b3de731bf1cb2b2

diff --git a/include/game.php b/include/game.php
index eb66a98..02d6f96 100644
--- a/include/game.php
+++ b/include/game.php
@@ -43,7 +43,9 @@ if(!$myid)
 
 global $GAME,$RULES,$CARDS;
 
-/* get some information from the DB */
+/**************************************
+ * get some information from the DB
+ **************************************/
 $gameid   = DB_get_gameid_by_hash($me);
 $myname   = DB_get_name('hash',$me);
 $mystatus = DB_get_status_by_hash($me);
@@ -79,6 +81,9 @@ if( $gamestatus == 'pre' )
   {
     /* always need to use Schweinchen to figure out for example who has poverty */
     $ok=1;
+    /* unless the gametype is set and we know that we are in poverty were schweinchen is not valid */
+    if( in_array( $gametype,array('poverty','dpoverty') ))
+      $ok=0;
   }
 else
   {
@@ -114,11 +119,8 @@ if($ok)
  */
 set_gametype('normal');
 
-/* put everyting in a form */
-echo "<form action=\"index.php?action=game&amp;me=$me\" method=\"post\">\n";
-
 /* handle user notes (only possible while game is running)*/
-if( $mystatus!='gameover'  )
+if( $mystatus!='gameover' )
   if(myisset('note'))
     {
       $note = $_REQUEST['note'];
@@ -127,19 +129,21 @@ if( $mystatus!='gameover'  )
 	DB_insert_note($note,$gameid,$myid);
     };
 
-/* make sure that we don't show the notes to the wrong person
- * (e.g. other people looking at an old game)
- */
-if( $mystatus != 'gameover' ||
-    (  $mystatus == 'gameover' &&
-       isset($_SESSION['id'])  &&
-       $myid == $_SESSION['id']))
-  output_user_notes($myid,$gameid,$mystatus);
-
 /* handle calls, output a comment to show when the call was made */
 /* initialize comments */
 $comment  =  '';
 
+/* get information needed to submit comment */
+$playid = DB_get_current_playid($gameid);
+
+/* set comment */
+if($comment != '')
+  DB_insert_comment($comment,$playid,$myid);
+/* clear up */
+unset($comment);
+/* end check for calls */
+
+
 /* check for calls, set comment */
 if(myisset('call')  && $_REQUEST['call']  == '120' && can_call(120,$me))
   {
@@ -170,61 +174,58 @@ if(myisset('call')  && $_REQUEST['call']  == '0' && can_call(0,$me))
     $comment .= "Zero";
   }
 
-/* get information needed to submit comment */
-$playid = DB_get_current_playid($gameid);
-
-/* set comment */
-if($comment != '')
-  DB_insert_comment($comment,$playid,$myid);
-/* clear up */
-unset($comment);
-/* end check for calls */
-
 
-/* output extra division in case this game is part of a session */
+/*****************************************************************
+ * output extra division in case this game is part of a session
+ *****************************************************************/
 if($session)
   {
     echo "<div class=\"session\">\n";
-    echo '  <div class="sessionrules">'._('Rules').': ';
+
+    /* output rule set */
+    echo "  <div class=\"sessionrules\">\n    "._('Rules').":\n";
     switch($RULES['dullen'])
       {
       case 'none':
-	echo "  <img class=\"rulesicon\" alt=\""._('no ten of hearts')."\" src=\"pics/button/no-ten-of-hearts.png\"/>\n"; break;
+	echo "    <img class=\"rulesicon\" alt=\""._('no ten of hearts').
+	  "\" src=\"pics/button/no-ten-of-hearts.png\"/>\n"; break;
       case 'firstwins':
-	echo "  <img class=\"rulesicon\" alt=\""._('ten of hearts')."\" src=\"pics/button/ten-of-hearts.png\"/>\n"; break;
+	echo "    <img class=\"rulesicon\" alt=\""._('ten of hearts').
+	  "\" src=\"pics/button/ten-of-hearts.png\"/>\n"; break;
       case 'secondwins':
-	echo "  <img class=\"rulesicon\" alt=\""._('second ten of hearts')."\" src=\"pics/button/second-ten-of-hearts.png\"/>\n"; break;
+	echo "    <img class=\"rulesicon\" alt=\""._('second ten of hearts').
+	  "\" src=\"pics/button/second-ten-of-hearts.png\"/>\n"; break;
       }
     switch($RULES['schweinchen'])
       {
       case 'none':
-	echo "  <img class=\"rulesicon\" alt=\""._('no schweinchen')."\" ".
+	echo "    <img class=\"rulesicon\" alt=\""._('no schweinchen')."\" ".
 	  "src=\"pics/button/no-schweinchen.png\"/>\n"; break;
       case 'both':
-	echo "  <img class=\"rulesicon\" alt=\""._('two schweinchen')."\" ".
+	echo "    <img class=\"rulesicon\" alt=\""._('two schweinchen')."\" ".
 	  "src=\"pics/button/two-schweinchen.png\"/>\n"; break;
       case 'second':
-	echo "  <img class=\"rulesicon\" alt=\"".('second schweinchen')."\" ".
+	echo "    <img class=\"rulesicon\" alt=\"".('second schweinchen')."\" ".
 	  "src=\"pics/button/second-schweinchen.png\"/>\n"; break;
       case 'secondaftercall':
-	echo "  <img class=\"rulesicon\" alt=\""._('second schweinchen after call')."\" ".
+	echo "    <img class=\"rulesicon\" alt=\""._('second schweinchen after call')."\" ".
 	  "src=\"pics/button/second-schweinchen-after-call.png\"/>\n"; break;
       }
     switch($RULES['call'])
       {
       case '1st-own-card':
-	echo "  <img class=\"rulesicon\" alt=\""._('1st-own-card')."\" src=\"pics/button/1st-own-card.png\"/>\n"; break;
+	echo "    <img class=\"rulesicon\" alt=\""._('1st-own-card')."\" src=\"pics/button/1st-own-card.png\"/>\n"; break;
       case '5th-card':
-	echo "  <img class=\"rulesicon\" alt=\""._('5th-card')."\" src=\"pics/button/5th-card.png\"/>\n"; break;
+	echo "    <img class=\"rulesicon\" alt=\""._('5th-card')."\" src=\"pics/button/5th-card.png\"/>\n"; break;
       case '9-cards':
-	echo "  <img class=\"rulesicon\" alt=\""._('9-cards')."\" src=\"pics/button/9-cards.png\"/>\n"; break;
+	echo "    <img class=\"rulesicon\" alt=\""._('9-cards')."\" src=\"pics/button/9-cards.png\"/>\n"; break;
       }
-    echo "  <div>\n";
-    echo '       '._('10ofhearts').":  {$RULES['dullen']}      <br />\n";
-    echo '       '._('schweinchen').": {$RULES['schweinchen']} <br />\n";
-    echo '       '._('call').":        {$RULES['call']}        <br />\n";
-    echo '       '._('lowtrump').":    {$RULES['lowtrump']}    <br />\n";
-    echo "  </div>\n  </div>\n";
+    echo "    <div>\n";
+    echo '         '._('10ofhearts').":  {$RULES['dullen']}      <br />\n";
+    echo '         '._('schweinchen').": {$RULES['schweinchen']} <br />\n";
+    echo '         '._('call').":        {$RULES['call']}        <br />\n";
+    echo '         '._('lowtrump').":    {$RULES['lowtrump']}    <br />\n";
+    echo "    </div>\n  </div>\n";
 
     /* show score */
 
@@ -280,19 +281,40 @@ if($session)
     else
       $next = NULL;
 
+    /* check for solo, add game type to session number */
+    echo "    Game $session.$j";
+    if($GT !='normal')
+      echo " ($GT)";
     if(isset($_SESSION['id']) && $_SESSION['id']==$myid)
       {
 	if($previous)
-	  echo "<a href=\"{$INDEX}?action=game&amp;me=$previous\">"._('previous game')."</a>&nbsp;&nbsp;&nbsp; \n";
-	echo "This is game number $j of <a href=\"{$INDEX}?action=game&amp;me=$lasthash\">$i</a> in session $session.\n";
+	  echo "&nbsp;&nbsp;&nbsp;<a href=\"{$INDEX}?action=game&amp;me=$previous\">"._('previous')."</a> \n";
 	if($next)
-	  echo "&nbsp;&nbsp;&nbsp;<a href=\"{$INDEX}?action=game&amp;me=$next\">"._('next game')."</a> \n";
+	  echo "&nbsp;&nbsp;&nbsp;<a href=\"{$INDEX}?action=game&amp;me=$next\">"._('next')."</a> \n";
       }
-    else
-      echo "This is game number $j of $i in session $session.";
+    if($j != $i )
+      echo "&nbsp;&nbsp;&nbsp;<a href=\"{$INDEX}?action=game&amp;me=$lasthash\">last</a> \n";
+
     echo "\n</div>\n";
   }
 
+/* the user has done something, update the timestamp. Use $myid in
+ * active games and check for session-id in old games (myid might be wrong in that case)
+ */
+if($mystatus!='gameover')
+  DB_update_user_timestamp($myid);
+ else
+   if(isset($_SESSION['id']))
+     DB_update_user_timestamp($_SESSION['id']);
+
+
+/******************************************************************************
+ * Output tricks played, table, messages, and cards (depending on game status)
+ ******************************************************************************/
+
+/* put everyting in a form */
+echo "<form action=\"index.php?action=game&amp;me=$me\" method=\"post\">\n";
+
 /* display the table and the names */
 display_table();
 
@@ -306,18 +328,13 @@ display_table();
  * gameover: are we revisiting a game
  */
 
-/* the user has done something, update the timestamp. Use $myid in
- * active games and check for session-id in old games (myid might be wrong in that case)
- */
-if($mystatus!='gameover')
-  DB_update_user_timestamp($myid);
- else
-   if(isset($_SESSION['id']))
-     DB_update_user_timestamp($_SESSION['id']);
-
 switch($mystatus)
   {
   case 'start':
+    /****************************************
+     * ask if player wants to join the game *
+     ****************************************/
+
     /* don't ask if user has autosetup set to yest */
     $skip = 0;
     if($PREF['autosetup']=='yes') $skip = 1;
@@ -326,6 +343,7 @@ switch($mystatus)
       {
 	/* asks the player, if he wants to join the game */
 	output_check_want_to_play($me);
+	echo '<div class="mycards"></div>';
 	break;
       }
     else
@@ -334,14 +352,13 @@ switch($mystatus)
 	if(!$skip && $_REQUEST['in'] == 'no' )
 	  {
 	    /* cancel the game */
-	    $message = "Hello, \n\n".
+	    $email_message = "Hello, \n\n".
 	      "the game has been canceled due to the request of one of the players.\n\n";
 
 	    $userids = DB_get_all_userid_by_gameid($gameid);
 	    foreach($userids as $user)
 	      {
-		$subject = 'Game '.DB_format_gameid($gameid).' canceled';
-		mymail($user,$subject,$message);
+		mymail($user,$gameid,GAME_CANCELED,$email_message);
 	      }
 
 	    /* update game status */
@@ -358,9 +375,8 @@ switch($mystatus)
 
 	    DB_set_hand_status_by_hash($me,'init');
 
-	    /* check if everyone has reached this stage, send out email */
+	    /* check if everyone has reached this stage, set player in game-table to the next player */
 	    $userids = DB_get_all_userid_by_gameid($gameid);
-	    $ok = 1;
 	    foreach($userids as $user)
 	      {
 		$userstat = DB_get_hand_status_by_userid_and_gameid($user,$gameid);
@@ -368,36 +384,16 @@ switch($mystatus)
 		  {
 		    /* whos turn is it? */
 		    DB_set_player_by_gameid($gameid,$user);
-		    $ok = 0;
 		    break;
 		  }
 	      };
-	    if($ok)
-	      {
-		/* all done, send out email unless this player is the startplayer */
-		$startplayer = DB_get_startplayer_by_gameid($gameid);
-		if($mypos == $startplayer)
-		  {
-		    /* do nothing, go to next stage */
-		  }
-		else
-		  {
-		    /* email startplayer */
-		    /*
-		     $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
-		     $who         = DB_get_userid('hash',$hash);
-		     DB_set_player_by_gameid($gameid,$who);
-
-		     $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
-		     "Use this link to go the game: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ;
-		     mymail($who,"Ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
-		    */
-		  }
-	      }
 	  }
       }
   case 'init':
-    /* here we ask the player if he is sick */
+    /***************************
+     * check if player is sick *
+     ***************************/
+
     $mycards = DB_get_hand($me);
     $mycards = mysort($mycards,$gametype);
 
@@ -405,7 +401,6 @@ switch($mystatus)
       {
 	/* output sickness of other playes, in case the already selected and are sitting in front of the current player */
 	echo "\n<ul class=\"tricks\">\n";
-	echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
 	echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
 	  "    <div class=\"trick\" id=\"trick0\">\n";
 
@@ -520,6 +515,7 @@ switch($mystatus)
 
 	    /* move on to the next stage*/
 	    DB_set_hand_status_by_hash($me,'check');
+	    $mystatus='check';
 	  };
       };
 
@@ -533,7 +529,6 @@ switch($mystatus)
 
     /* output sickness of other playes, in case they already selected and are sitting in front of the current player */
     echo "\n<ul class=\"tricks\">\n";
-    echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
     echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
       "    <div class=\"trick\" id=\"trick0\">\n";
 
@@ -590,7 +585,6 @@ switch($mystatus)
 	      display_card($card,$PREF['cardset']);
 	    echo "</div>\n";
 	  }
-	break;
       }
     else
       {
@@ -636,7 +630,7 @@ switch($mystatus)
 	    /* cancel game */
 	    if($cancelsick == 'nines')
 	      {
-		$message = "The game has been canceled because ".DB_get_name('userid',$cancel).
+		$email_message = "The game has been canceled because ".DB_get_name('userid',$cancel).
 		  " has five or more nines and nobody is playing solo.\n\n".
 		  "To redeal either start a new game or, in case the game was part of a tournament,\n".
 		  "go to the last game and use the link at the bottom of the page to redeal.\n\n";
@@ -649,7 +643,7 @@ switch($mystatus)
 	      }
 	    else if ($cancelsick == 'lowtrump')
 	      {
-		$message = "The game has been canceled because ".DB_get_name('userid',$cancel).
+		$email_message = "The game has been canceled because ".DB_get_name('userid',$cancel).
 		  " has low trump and nobody is playing solo.\n\n".
 		  "To redeal either start a new game or, in case the game was part of a tournament,\n".
 		  "go to the last game and use the link at the bottom of the page to redeal.\n\n";
@@ -664,8 +658,7 @@ switch($mystatus)
 	    $userids = DB_get_all_userid_by_gameid($gameid);
 	    foreach($userids as $user)
 	      {
-		$subject = 'Game '.DB_format_gameid($gameid).' canceled';
-		mymail($user,$subject,$message);
+		mymail($user,$gameid, GAME_CANCELED, $email_message);
 	      }
 
 	    echo "</div>\n"; /* end div message */
@@ -800,10 +793,9 @@ switch($mystatus)
 		if(DB_get_email_pref_by_hash($hash)!='emailaddict')
 		  {
 		    /* email startplayer */
-		    $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
+		    $email_message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
 		      "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ;
-		    $subject = 'Ready, set, go... (game '.DB_format_gameid($gameid).')';
-		    mymail($who,$subject,$message);
+		    mymail($who,$gameid,GAME_READY,$email_message);
 		  }
 	      }
 	    else
@@ -826,16 +818,20 @@ switch($mystatus)
 		if(DB_get_email_pref_by_hash($hash)!='emailaddict')
 		  {
 		    /* email player for poverty */
-		    $message = "Poverty: It's your turn now in game ".DB_format_gameid($gameid).".\n".
+		    $email_message = "Poverty: It's your turn now in game ".DB_format_gameid($gameid).".\n".
 		      "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$whohash."\n\n" ;
-		    $subject = 'Poverty (game '.DB_format_gameid($gameid).') ';
-		    mymail($whoid,$subject,$message);
+		    mymail($whoid,$gameid,GAME_POVERTY,$email_message);
 		  }
 	      }
 	  }
 	echo "</div>\n";
-	break;
+	/* show cards */
+	echo '<div class="mycards">'._('Your cards are').": <br />\n";
+	foreach($mycards as $card)
+	  display_card($card,$PREF['cardset']);
+	echo "</div>\n";
       }
+    break;
 
   case 'poverty':
     /* user only gets here in a poverty game, several things have to be handled here:
@@ -884,7 +880,6 @@ switch($mystatus)
     if($myparty=='re' || $myparty=='contra')
       {
 	echo "\n<ul class=\"tricks\">\n";
-	echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
 
 	$mygametype =  DB_get_gametype_by_gameid($gameid);
 
@@ -926,14 +921,14 @@ switch($mystatus)
 	    if(DB_get_email_pref_by_hash($hash)!='emailaddict')
 	      {
 		/* email startplayer */
-		$message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
+		$email_message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
 		  "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ;
-		$subject = 'Ready, set, go... (game '.DB_format_gameid($gameid).') ';
-		mymail($who,$subject,$message);
+		mymail($who,$gameid,GAME_READY,$email_message);
 	      }
 	  }
 	else
 	  echo "<div class=\"message\">Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.</div>\n";
+	echo '<div class="mycards"></div>'."\n"; /* needed to make sure the message area is in the right position */
       }
 
     /* the following is part A) of what needs to be done */
@@ -1005,14 +1000,13 @@ switch($mystatus)
 	    /* no more people to ask, need to cancel the game */
 	    if($mypos+$next>4)
 	      {
-		$message = "Hello, \n\n".
+		$email_message = "Hello, \n\n".
 		  "Game ".DB_format_gameid($gameid)." has been canceled since nobody wanted to take the trump.\n\n";
 
 		$userids = DB_get_all_userid_by_gameid($gameid);
 		foreach($userids as $user)
 		  {
-		    $subject = 'Game '.DB_format_gameid($gameid).' canceled (poverty not resolved)';
-		    mymail($user,$subject,$message);
+		    mymail($user, $gameid, GAME_CANCELED_POVERTY, $email_message);
 		  }
 
 		/* update game status */
@@ -1030,10 +1024,9 @@ switch($mystatus)
 		DB_set_player_by_gameid($gameid,$userid);
 		DB_set_hand_status_by_hash($userhash,'poverty');
 
-		$message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
+		$email_message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
 		  " ".$HOST.$INDEX."?action=game&me=".$userhash."\n\n" ;
-		$subject = 'Poverty (game '.DB_format_gameid($gameid).')';
-		mymail($userid,$subject,$message);
+		mymail($userid,$gameid, GAME_POVERTY, $email_message);
 	      }
 	  }
 	else
@@ -1122,10 +1115,9 @@ switch($mystatus)
 		    DB_set_player_by_gameid($gameid,$userid);
 		    DB_set_hand_status_by_hash($userhash,'poverty');
 
-		    $message = "Two people have poverty, it's your turn to decide, if you want to take the trump. Please visit:".
+		    $email_message = "Two people have poverty, it's your turn to decide, if you want to take the trump. Please visit:".
 		      " ".$HOST.$INDEX."?action=game&me=".$userhash."\n\n" ;
-		    $subject = 'Double poverty (game '.DB_format_gameid($gameid).')';
-		    mymail($userid,$subject,$message);
+		    mymail($userid,$gameid, GAME_DPOVERTY, $email_message);
 		  }
 	      }
 	    echo "<div class=\"message\">Please, <a href=\"$INDEX?action=game&amp;me=$me\">continue</a> here.</div>\n";
@@ -1196,10 +1188,9 @@ switch($mystatus)
 	    if($hash!=$me && DB_get_email_pref_by_hash($hash)!='emailaddict')
 	      {
 		/* email startplayer) */
-		$message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
+		$email_message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
 		  "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ;
-		$subject = 'Ready, set, go... (game '.DB_format_gameid($gameid).')';
-		mymail($who,$subject,$message);
+		mymail($who,$gameid, GAME_READY, $email_message);
 	      }
 	  }
       }
@@ -1288,7 +1279,6 @@ switch($mystatus)
     $firstcard = ''; /* first card in a trick */
 
     echo "\n<ul class=\"tricks\">\n";
-    echo '  <li class="nohighlight"> '._('Game').' '.DB_format_gameid($gameid).": </li>\n";
 
     /* output vorbehalte */
     $mygametype = DB_get_gametype_by_gameid($gameid);
@@ -1647,13 +1637,12 @@ switch($mystatus)
 		$who       = DB_get_userid('hash',$next_hash);
 		DB_set_player_by_gameid($gameid,$who);
 
-		$message = "A card has been played in game ".DB_format_gameid($gameid).".\n\n".
+		$email_message = "A card has been played in game ".DB_format_gameid($gameid).".\n\n".
 		  "It's your turn  now.\n".
 		  "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$next_hash."\n\n" ;
 		if( DB_get_email_pref_by_uid($who)!='emailaddict' )
 		  {
-		    $subject = 'A card has been played in game '.DB_format_gameid($gameid);
-		    mymail($who,$subject,$message);
+		    mymail($who,$gameid, GAME_YOUR_TURN, $email_message);
 		  }
 	      }
 	    else /* send out final email */
@@ -1667,10 +1656,10 @@ switch($mystatus)
 				   " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
 				   " WHERE Hand.game_id='$gameid'".
 				   " GROUP BY User.fullname" );
-		$message  = "The game is over. Thanks for playing :)\n";
-		$message .= "Final score:\n";
+		$email_message  = "The game is over. Thanks for playing :)\n";
+		$email_message .= "Final score:\n";
 		while( $r = DB_fetch_array($result) )
-		  $message .= "   ".$r[0]."(".$r[2].") ".$r[1]."\n";
+		  $email_message .= "   ".$r[0]."(".$r[2].") ".$r[1]."\n";
 
 		$result = DB_query("SELECT  Hand.party, IFNULL(SUM(Card.points),0) FROM Hand".
 				   " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
@@ -1680,12 +1669,12 @@ switch($mystatus)
 				   " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
 				   " WHERE Hand.game_id='$gameid'".
 				   " GROUP BY Hand.party" );
-		$message .= "\nTotals:\n";
+		$email_message .= "\nTotals:\n";
 		$re     = 0;
 		$contra = 0;
 		while( $r = DB_fetch_array($result) )
 		  {
-		    $message .= "    ".$r[0]." ".$r[1]."\n";
+		    $email_message .= "    ".$r[0]." ".$r[1]."\n";
 		    if($r[0] == 're')
 		      $re = $r[1];
 		    else if($r[0] == 'contra')
@@ -1698,8 +1687,8 @@ switch($mystatus)
 		 */
 
 		/* get calls from re/contra */
-		$call_re     = NULL;
-		$call_contra = NULL;
+		$call_re     = -1;
+		$call_contra = -1;
 		foreach($userids as $user)
 		  {
 		    $hash  = DB_get_hash_from_gameid_and_userid($gameid,$user);
@@ -1712,14 +1701,14 @@ switch($mystatus)
 
 			if($party=='re')
 			  {
-			    if($call_re==NULL)
+			    if($call_re== -1)
 			      $call_re = $call;
 			    else if( $call < $call_re)
 			      $call_re = $call;
 			  }
 			else if($party=='contra')
 			  {
-			    if($call_contra==NULL)
+			    if($call_contra== -1)
 			      $call_contra = $call;
 			    else if( $call < $call_contra)
 			      $call_contra = $call;
@@ -1730,7 +1719,7 @@ switch($mystatus)
 		/* figure out who one */
 		$winning_party = NULL;
 
-		if($call_re == NULL && $call_contra==NULL)
+		if($call_re == -1 && $call_contra == -1)
 		  {
 		    /* nobody made a call, so it's easy to figure out who won */
 		    if($re>120)
@@ -1744,7 +1733,7 @@ switch($mystatus)
 		     * if only one party made a call, the other one wins,
 		     * if the first one didn't make it
 		     */
-		    if($call_re)
+		    if($call_re != -1)
 		      {
 			$offset = 120 - $call_re;
 			if($call_re == 0)
@@ -1752,11 +1741,11 @@ switch($mystatus)
 
 			if($re > 120+$offset)
 			  $winning_party='re';
-			else if ($call_contra == NULL )
+			else if ($call_contra == -1 )
 			  $winning_party='contra';
 		      }
 
-		    if($call_contra)
+		    if($call_contra != -1)
 		      {
 			$offset = 120 - $call_contra;
 			if($call_contra == 0)
@@ -1764,7 +1753,7 @@ switch($mystatus)
 
 			if($contra > 120+$offset)
 			  $winning_party='contra';
-			else if ($call_re == NULL )
+			else if ($call_re == -1 )
 			  $winning_party='re';
 		      }
 		  }
@@ -1772,7 +1761,7 @@ switch($mystatus)
 		/* one point for each call of the other party in case the other party didn't win
 		 * and one point each in case the party made more than points than one of the calls
 		 */
-		if($winning_party!='contra' && $call_contra!=NULL)
+		if($winning_party!='contra' && $call_contra!= -1)
 		  {
 		    for( $p=$call_contra;$p<=120; $p+=30 )
 		      {
@@ -1787,7 +1776,7 @@ switch($mystatus)
 				     " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'made$p')");
 			}
 		    }
-		  if($winning_party!='re' and $call_re!=NULL)
+		  if($winning_party!='re' and $call_re!= -1)
 		    {
 		      for( $p=$call_re;$p<=120; $p+=30 )
 			{
@@ -1816,7 +1805,7 @@ switch($mystatus)
 		      foreach(array(120,150,180,210,240) as $p)
 			{
 			  $offset = 0;
-			  if($p==240 || $call_contra!=NULL)
+			  if($p==240 || $call_contra != -1)
 			    $offset = 1;
 
 			  if($re>$p-$offset)
@@ -1826,7 +1815,7 @@ switch($mystatus)
 		      /* re called something and won */
 		      foreach(array(0,30,60,90,120) as $p)
 			{
-			  if($call_re!=NULL && $call_re<$p+1)
+			  if($call_re!= -1 && $call_re<$p+1)
 			    DB_query("INSERT INTO Score".
 				     " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'call$p')");
 			}
@@ -1836,7 +1825,7 @@ switch($mystatus)
 		      foreach(array(120,150,180,210,240) as $p)
 			{
 			  $offset = 0;
-			  if($p==240 || $call_re!=NULL)
+			  if($p==240 || $call_re != -1)
 			    $offset = 1;
 
 			  if($contra>$p-$offset)
@@ -1846,7 +1835,7 @@ switch($mystatus)
 		      /* re called something and won */
 		      foreach(array(0,30,60,90,120) as $p)
 			{
-			  if($call_contra!=NULL && $call_contra<$p+1)
+			  if($call_contra != -1 && $call_contra<$p+1)
 			    DB_query("INSERT INTO Score".
 				     " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'call$p')");
 			}
@@ -1854,35 +1843,35 @@ switch($mystatus)
 
 
 		  /* add score points to email */
-		  $message .= "\n";
+		  $email_message .= "\n";
 		  $Tpoint = 0;
-		  $message .= " Points Re: \n";
+		  $email_message .= " Points Re: \n";
 		  $queryresult = DB_query("SELECT score FROM Score ".
 					  "  WHERE game_id=$gameid AND party='re'".
 					  " ");
 		  while($r = DB_fetch_array($queryresult) )
 		    {
-		      $message .= "   ".$r[0]."\n";
+		      $email_message .= "   ".$r[0]."\n";
 		      $Tpoint ++;
 		    }
-		  $message .= " Points Contra: \n";
+		  $email_message .= " Points Contra: \n";
 		  $queryresult = DB_query("SELECT score FROM Score ".
 					  "  WHERE game_id=$gameid AND party='contra'".
 					  " ");
 		  while($r = DB_fetch_array($queryresult) )
 		    {
-		      $message .= "   ".$r[0]."\n";
+		      $email_message .= "   ".$r[0]."\n";
 		      $Tpoint --;
 		    }
-		  $message .= " Total Points (from the Re point of view): $Tpoint\n";
-		  $message .= "\n";
+		  $email_message .= " Total Points (from the Re point of view): $Tpoint\n";
+		  $email_message .= "\n";
 
 		  $session = DB_get_session_by_gameid($gameid);
 		  $score = generate_score_table($session);
 
-		  $message .= "Score Table:\n";
-		  $message .= format_score_table_ascii($score);
-		  $message .= "\nUse these links to have a look at game ".DB_format_gameid($gameid).": \n";
+		  $email_message .= "Score Table:\n";
+		  $email_message .= format_score_table_ascii($score);
+		  $email_message .= "\nUse these links to have a look at game ".DB_format_gameid($gameid).": \n";
 
 		  /* send out final email */
 		  foreach($userids as $user)
@@ -1892,11 +1881,10 @@ switch($mystatus)
 		      $name = DB_get_name('userid',$user);
 
 		      $link = "$name: ".$HOST.$INDEX."?action=game&me=".$hash."\n" ;
-		      $message .= $link;
+		      $email_message .= $link;
 		    }
-		  $message .= "\n\n (you can use reply all on this email to reach all the players.)\n\n";
-		  $subject = ' Game over (game '.DB_format_gameid($gameid).') ';
-		  mymail($userids,$subject,$message);
+		  $email_message .= "\n\n (you can use reply all on this email to reach all the players.)\n\n";
+		  mymail($userids,$gameid, GAME_OVER, $email_message);
 	      }
 	  }
 	else
@@ -1990,6 +1978,39 @@ switch($mystatus)
 	if(have_suit($mycards,$firstcard))
 	  $followsuit = 1;
 
+	/* count how many cards we can play, so that we can pre-select it if there is only one */
+	$howmanycards = 0;
+	foreach($mycards as $card)
+	  {
+	    if($howmanycards>1)
+	      break;
+
+	    /* display only cards that the player is allowed to play as links, the rest just display normal
+	     * also check if we have both schweinchen, in that case only display on of them as playable
+	     */
+	    if( ($followsuit && !same_type($card,$firstcard)) ||
+		( (int)($card)==19 &&
+		  !$GAME['schweinchen-first'] &&
+		  ( $RULES['schweinchen']=='second' ||
+		    ( $RULES['schweinchen']=='secondaftercall' &&
+		     (DB_get_call_by_hash($GAME['schweinchen-who']) ||
+		      DB_get_partner_call_by_hash($GAME['schweinchen-who']) )
+		    )
+		  ) &&
+		  $GAME['schweinchen-who']==$me &&
+		  in_array($gametype,array('normal','wedding','trump','silent'))
+		  )
+		)
+	      continue;
+	    else
+	      $howmanycards++;
+	  }
+
+	if($howmanycards==1)
+	  $howmanycards=1;
+	else
+	  $howmanycards=0;
+
 	foreach($mycards as $card)
 	  {
 	    /* display only cards that the player is allowed to play as links, the rest just display normal
@@ -2010,7 +2031,7 @@ switch($mystatus)
 		)
 	      display_card($card,$PREF['cardset']);
 	    else
-	      display_link_card($card,$PREF['cardset']);
+	      display_link_card($card,$PREF['cardset'],$type='card',$selected=$howmanycards);
 	  }
       }
     else if($mystatus=='play' )
@@ -2068,7 +2089,11 @@ switch($mystatus)
     break;
   default:
     myerror("error in testing the status");
-  }
+  } /*end of output: tricks, table, messages, card */
+
+/***********************************************
+ * Comments, re/contra calls, user menu
+ ***********************************************/
 
 /* output other games where it is the users turn
  * make sure that the people looking at old games don't see the wrong games here
@@ -2078,13 +2103,13 @@ if( $gamestatus != 'gameover' )
     /* game isn't over, only valid user can get here, so show menu */
     display_user_menu($myid);
   }
-else if(  $origmystatus != 'gameover' )
+else if( $origmystatus != 'gameover' )
   {
     /* user just played the very last card, game is now over, it's still ok to show the menu though */
     display_user_menu($myid);
   }
-else if(  $mystatus == 'gameover' &&
-	  isset($_SESSION['id']) )
+else if( $mystatus == 'gameover'
+	 && isset($_SESSION['id']) )
   {
     /* user is looking at someone else's game, show the menu for the correct user */
     display_user_menu($_SESSION['id']);
@@ -2143,8 +2168,21 @@ if(sizeof($other_game_ids)>0 && $mystatus=='gameover')
 
 echo "</div>\n"; /* end gameinfo */
 
+/* make sure that we don't show the notes to the wrong person
+ * (e.g. other people looking at an old game)
+ */
+if( $mystatus != 'gameover' ||
+    (  $mystatus == 'gameover' &&
+       isset($_SESSION['id'])  &&
+       $myid == $_SESSION['id']))
+  output_user_notes($myid,$gameid,$mystatus);
+
 echo "</form>\n";
 
+/*********************************
+ * suggest next game
+ *********************************/
+
 $gamestatus = DB_get_game_status_by_gameid($gameid);
 if($mystatus=='gameover' &&
    ($gamestatus =='gameover' || $gamestatus =='cancel-nines' || $gamestatus =='cancel-trump') &&