BUGIFX: leaked silent solo information in game type
[e-DoKo.git] / include / game.php
index dcabc678220d2f65f0924ed29bce0ce0dea2381d..4fa950c6156cc327aa03eb42cf40283ac48fff1f 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -43,18 +43,23 @@ 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);
-$origmystatus = DB_get_status_by_hash($me); /* to show "it's your turn" menu when game has just finished */
 $mypos    = DB_get_pos_by_hash($me);
 $myhand   = DB_get_handid('hash',$me);
 $myparty  = DB_get_party_by_hash($me);
 $session  = DB_get_session_by_gameid($gameid);
+$playid   = DB_get_current_playid($gameid); /* might be -1 at beginning of the game */
 
 /* get prefs and save them in a variable*/
 $PREF = DB_get_PREF(isset($_SESSION['id'])?$_SESSION['id']:$myid);
+/* set language chosen in preferences, will become active on the next reload (see index.php)*/
+$_SESSION['language'] = $PREF['language'];
+
 
 /* get rule set for this game */
 $RULES = DB_get_RULES($gameid);
@@ -66,7 +71,10 @@ $GT         = $gametype;
 if($gametype=='solo')
   {
     $gametype = DB_get_solo_by_gameid($gameid);
-    $GT  = $gametype.' '.$GT;
+    if($gametype=='silent')
+      $GT = 'normal';
+    else
+      $GT = $gametype.' '.$GT;
   }
 
 /* do we need to worry about Schweinchen?
@@ -117,9 +125,6 @@ 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(myisset('note'))
@@ -130,95 +135,143 @@ if( $mystatus!='gameover' )
        DB_insert_note($note,$gameid,$myid);
     };
 
-/* handle calls, output a comment to show when the call was made */
+/*****************************************************************
+ * handle calls part1: check what was called, set everything up
+ * we only can submit it to the database at the end, since the playid
+ * might change if a player plays a card
+ *****************************************************************/
+
 /* initialize comments */
-$comment  =  '';
+$commentCall = '';
 
 /* check for calls, set comment */
-if(myisset('call')  && $_REQUEST['call']  == '120' && can_call(120,$me))
-  {
-    $result = DB_query("UPDATE Hand SET point_call='120' WHERE hash='$me' ");
-    if($myparty=='re')
-      $comment .= "Re";
-    else if($myparty=='contra')
-      $comment .= "Contra";
-  }
-if(myisset('call')  && $_REQUEST['call']  == '90' && can_call(90,$me))
+if( myisset('call') )
   {
-    $result = DB_query("UPDATE Hand SET point_call='90'  WHERE hash='$me' ");
-    $comment .= "No 90";
+    if($_REQUEST['call']  == '120' && can_call(120,$me))
+      {
+       $result = DB_query("UPDATE Hand SET point_call='120' WHERE hash='$me' ");
+       if($myparty=='re')
+         $commentCall = 'Re';
+       else if($myparty=='contra')
+         $commentCall = 'Contra';
+      }
+    else if($_REQUEST['call']  == '90' && can_call(90,$me))
+      {
+       $result = DB_query("UPDATE Hand SET point_call='90'  WHERE hash='$me' ");
+       $commentCall = 'No 90';
+      }
+    else if($_REQUEST['call']  == '60' && can_call(60,$me))
+      {
+       $result = DB_query("UPDATE Hand SET point_call='60'  WHERE hash='$me' ");
+       $commentCall = 'No 60';
+      }
+    else if($_REQUEST['call']  == '30' && can_call(30,$me))
+      {
+       $result = DB_query("UPDATE Hand SET point_call='30'  WHERE hash='$me' ");
+       $commentCall = 'No 30';
+      }
+    else if($_REQUEST['call']  == '0' && can_call(0,$me))
+      {
+       $result = DB_query("UPDATE Hand SET point_call='0'   WHERE hash='$me' ");
+       $commentCall = 'Zero';
+      }
   }
-if(myisset('call')  && $_REQUEST['call']  == '60' && can_call(60,$me))
+
+/**********************************************************
+ * handle comments unless we play a card at the same time *
+ * (if we play a card, we need to update playid)          *
+ **********************************************************/
+
+
+/* get time from the last action of the game */
+$r = DB_query_array("SELECT mod_date from Game WHERE id='$gameid' " );
+$gameend = time() - strtotime($r[0]);
+
+/* handle comments in case player didn't play a card, allow comments a week after the end of the game */
+if( (!myisset('card') && $mystatus!='gameover') || ($mystatus=='gameover' && ($gameend < 60*60*24*7)) )
+  if(myisset('comment'))
+    {
+      $comment = $_REQUEST['comment'];
+
+      if($comment != '')
+       DB_insert_comment($comment,$playid,$gameid,$myid);
+    };
+
+
+/*****************************************************************
+ * 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
+ *****************************************************************/
+
+if( $gamestatus != 'gameover'  && isset($_SESSION['id']) )
   {
-    $result = DB_query("UPDATE Hand SET point_call='60'  WHERE hash='$me' ");
-    $comment .= "No 60";
+    /* game isn't over, only valid user can get here, so show menu */
+    display_user_menu($myid, $me);
   }
-if(myisset('call')  && $_REQUEST['call']  == '30' && can_call(30,$me))
+else if( $mystatus == 'gameover' && isset($_SESSION['id']) )
   {
-    $result = DB_query("UPDATE Hand SET point_call='30'  WHERE hash='$me' ");
-    $comment .= "No 30";
+    /* user is looking at someone else's game, show the menu for the correct user */
+    display_user_menu($_SESSION['id'],$me);
   }
-if(myisset('call')  && $_REQUEST['call']  == '0' && can_call(0,$me))
+else
   {
-    $result = DB_query("UPDATE Hand SET point_call='0'   WHERE hash='$me' ");
-    $comment .= "Zero";
+    echo "<div class=\"usermenu\">\n";
+    echo "It's your turn in these games: \n";
+    echo "Please log in to see this information.\n";
+    echo "</div>\n\n";
   }
 
-/* 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 */
 
@@ -237,13 +290,13 @@ if($session)
        foreach($finalscore as $user=>$value)
          {
            $name = DB_get_name('userid',$user);
-           echo " ".substr($name,0,2).": $value ";
+           echo ' '.substr($name,0,2).": $value ";
          }
       }
     else
       {
        /* first game, no score yet */
-       echo "&nbsp;";
+       echo '&nbsp;';
       }
 
     /* output all games for the score table */
@@ -274,21 +327,119 @@ if($session)
     else
       $next = NULL;
 
+    /* check for solo, add game type to session number */
+    echo "    Game $session.$j";
+    if($gamestatus != 'pre' && $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 menu for selecting tricks
+ ******************************************************************************/
+
+switch($mystatus)
+  {
+  case 'start':
+    break;
+  case 'init':
+  case 'check':
+    /* 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 onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n";
+
+    echo "    </li>\n</ul>\n";  /* end div trick, end li trick , end tricks*/
+    /* end displaying sickness */
+    break;
+  case 'poverty':
+    /* output pre-game trick in case user reloads,
+     * only needs to be done when a team has been formed */
+    if($myparty=='re' || $myparty=='contra')
+      {
+       echo "\n<ul class=\"tricks\">\n";
+
+       $mygametype =  DB_get_gametype_by_gameid($gameid);
+
+       echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n";
+       echo "  </li>\n</ul>\n\n";  /* end div trick, end li trick , end ul tricks */
+      }
+    /* end output pre-game trick */
+    break;
+  case 'play':
+  case 'gameover':
+
+    echo "\n<ul class=\"tricks\">\n";
+
+    /* output vorbehalte */
+    $mygametype = DB_get_gametype_by_gameid($gameid);
+    $mygamesolo = DB_get_solo_by_gameid($gameid);
+    if($mygametype != 'normal') /* only show when needed */
+      if(!( $mygametype == 'solo' && $mygamesolo == 'silent') )
+       echo "  <li onclick=\"hl('0');\" class=\"old\"><a href=\"#\">Pre</a></li>\n";
+
+    $result = DB_query('SELECT Trick.id '.
+                      'FROM Trick '.
+                      "WHERE Trick.game_id='".$gameid."' ".
+                      'GROUP BY Trick.id '.
+                      'ORDER BY Trick.id ASC');
+    $trickNR   = 1;
+    $lasttrick = DB_get_max_trickid($gameid);
+
+    /* output tricks */
+    while($r = DB_fetch_array($result))
+      {
+       $trick=$r[0];
+       if($trick!=$lasttrick)
+         echo "  <li onclick=\"hl('$trickNR');\" class=\"old\"><a href=\"#\">"._('Trick')." $trickNR</a></li>\n";
+       else if($trick==$lasttrick)
+         echo "  <li onclick=\"hl('$trickNR');\" class=\"current\"><a href=\"#\">"._('Trick')." $trickNR</a></li>\n";
+       $trickNR++;
+      }
+
+    /* if game is over, also output link to Score tab */
+    if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' )
+      echo "  <li onclick=\"hl('13');\" class=\"current\"><a href=\"#\">"._('Score')."</a></li>\n";
+
+    /* output previous/next buttons */
+    echo '  <li onclick="hl_prev();" ><button>'._('prev')."</button></li>\n";
+    echo '  <li onclick="hl_next();" ><button>'._('next')."</button></li>\n";
+
+    echo "</ul>\n\n";
+
+    break;
+  default:
+  }
+
+
+/******************************************************************************
+ * 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();
+display_table_begin();
 
 /* mystatus gets the player through the different stages of a game.
  * start:    does the player want to play?
@@ -300,19 +451,27 @@ 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)
+/* Depending on the situation we set
+ *   cards_status (see functions.php for possible options)
+ *   most of the times we need to just show the cards, so we make this the default
  */
-if($mystatus!='gameover')
-  DB_update_user_timestamp($myid);
- else
-   if(isset($_SESSION['id']))
-     DB_update_user_timestamp($_SESSION['id']);
+$card_status = CARDS_SHOW;
+
+/* Also collect message that should be displayed to the user, so that we can show
+ * them after showing the table. This makes the html flow more consistent and easier
+ * tournament change layouts, especially for smaller displays, e.g. mobile phones
+ */
+$messages = array();
+
 
 switch($mystatus)
   {
   case 'start':
-    /* don't ask if user has autosetup set to yest */
+    /****************************************
+     * ask if player wants to join the game *
+     ****************************************/
+
+    /* don't ask if user has autosetup set to yes */
     $skip = 0;
     if($PREF['autosetup']=='yes') $skip = 1;
 
@@ -320,7 +479,10 @@ switch($mystatus)
       {
        /* asks the player, if he wants to join the game */
        output_check_want_to_play($me);
-       echo '<div class="mycards"></div>';
+
+       /* don't show the cards before the user joined the game */
+       $card_status = CARDS_EMPTY;
+
        break;
       }
     else
@@ -329,14 +491,14 @@ 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)
-             {
-               mymail($user,$gameid,GAME_CANCELED,$message);
-             }
+             mymail($user,$gameid,GAME_CANCELED,$email_message);
+
+           $card_status = CARDS_EMPTY;
 
            /* update game status */
            cancel_game('noplay',$gameid);
@@ -352,81 +514,29 @@ 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)
+           foreach($userids as $userid)
              {
-               $userstat = DB_get_hand_status_by_userid_and_gameid($user,$gameid);
+               $userstat = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
                if($userstat!='init')
                  {
                    /* whos turn is it? */
-                   DB_set_player_by_gameid($gameid,$user);
-                   $ok = 0;
+                   DB_set_player_by_gameid($gameid,$userid);
                    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, $gameid, GAME_READY,$message);
-                   */
-                 }
              }
          }
       }
   case 'init':
-    /* here we ask the player if he is sick */
-    $mycards = DB_get_hand($me);
-    $mycards = mysort($mycards,$gametype);
-
+    /***************************
+     * check if player is sick *
+     ***************************/
     if(!myisset('solo','wedding','poverty','nines','lowtrump') )
       {
-       /* 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";
-
-       for($pos=1;$pos<5;$pos++)
-         {
-           $usersick   = DB_get_sickness_by_pos_and_gameid($pos,$gameid);
-           $userid     = DB_get_userid('gameid-position',$gameid,$pos);
-           $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
-
-           if($userstatus=='start' || $userstatus=='init')
-             echo " <div class=\"vorbehalt".($pos-1)."\"> still needs <br/ > to decide </div>\n"; /* show this to everyone */
-           else
-             if($usersick!=NULL && $pos<=$mypos ) /* only show this for people sitting before the player */
-               echo " <div class=\"vorbehalt".($pos-1)."\"> sick </div>\n";
-             else if($usersick==NULL && $pos<=$mypos)
-               echo " <div class=\"vorbehalt".($pos-1)."\"> healthy </div>\n";
-         }
-       echo "    </div>\n  </li>\n</ul>\n";  /* end div trick, end li trick , end tricks*/
-       /* end displaying sickness */
-
+       $mycards = DB_get_hand($me);
        output_check_for_sickness($me,$mycards);
 
-       echo '<div class="mycards">'._('Your cards are').": <br />\n";
-       foreach($mycards as $card)
-         display_card($card,$PREF['cardset']);
-       echo "</div>\n";
-
        break;
       }
     else
@@ -441,20 +551,15 @@ switch($mystatus)
 
        if($Nsickness>1)
          {
-           echo "<p class=\"message\"> You selected more than one sickness, please go back ".
-             "and answer the <a href=\"$INDEX?action=game&amp;me=$me&amp;in=yes\">question</a> again.</p>";
-
-           echo '<div class="mycards">'._('Your cards are').": <br />\n";
-           foreach($mycards as $card)
-             display_card($card,$PREF['cardset']);
-           echo "</div>\n";
+           $messages[] = 'You selected more than one sickness, please go back '.
+             "and answer the <a href=\"$INDEX?action=game&amp;me=$me&amp;in=yes\">question</a> again.";
 
            break;
          }
        else
          {
            /* everything is ok, save what user said and proceed */
-           echo "<p class=\"message\">Processing what you selected in the last step...";
+           $messages[] = 'Processing what you selected in the last step...';
 
            /* check if this sickness needs to be handled first */
            $gametype    = DB_get_gametype_by_gameid($gameid);
@@ -468,7 +573,7 @@ switch($mystatus)
                DB_set_solo_by_hash($me,$_REQUEST['solo']);
                DB_set_sickness_by_hash($me,'solo');
 
-               echo "<br />Seems like you want to play a {$_REQUEST['solo']} solo. Got it.<br />\n";
+               $messages[] = "<br />Seems like you want to play a {$_REQUEST['solo']} solo. Got it.<br />\n";
 
                if($gametype == 'solo' && $startplayer<$mypos)
                  {}/* do nothing, since someone else already is playing solo */
@@ -485,33 +590,31 @@ switch($mystatus)
            else if($_REQUEST['wedding'] == 'yes')
              {
                /* silent solo is set further down */
-               echo _("Ok, you don't want to play a silent solo...wedding was chosen.")."<br />\n";
+               $messages[] = _("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 _("Don't think you can win with just a few trump...? Ok, poverty chosen.")." <br />\n";
+               $messages[] = _("Don't think you can win with just a few trump...? Ok, poverty chosen.")." <br />\n";
                DB_set_sickness_by_hash($me,'poverty');
              }
            else if($_REQUEST['nines'] == 'yes')
              {
-               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";
+               $messages[] = _("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');
              }
            else if($_REQUEST['lowtrump'] == 'yes')
              {
                if($RULES['lowtrump']=='cancel')
-                 echo _("What? You just don't want to play a game because you have low trump? Well, if no one".
-                        " is playing solo, this game will be canceled.")."<br />\n";
+                 $messages[] = _("What? You just don't want to play a game because you have low trump? Well, if no one".
+                        ' is playing solo, this game will be canceled.')."<br />\n";
                else
-                 echo _("Don't think you can win with low trumps...? Ok, poverty chosen.")." <br />.<br />\n";
+                 $messages[] = _("Don't think you can win with low trumps...? Ok, poverty chosen.")." <br />.<br />\n";
 
                DB_set_sickness_by_hash($me,'lowtrump');
              }
 
-           echo "</p>\n";
-
            /* move on to the next stage*/
            DB_set_hand_status_by_hash($me,'check');
            $mystatus='check';
@@ -523,69 +626,28 @@ switch($mystatus)
      * this can therefore only be handled once all players finished the last stage
      */
 
-    $mycards = DB_get_hand($me);
-    $mycards = mysort($mycards,$gametype);
-
-    /* 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";
-
-    for($pos=1;$pos<5;$pos++)
-      {
-       $usersick   = DB_get_sickness_by_pos_and_gameid($pos,$gameid);
-       $userid     = DB_get_userid('gameid-position',$gameid,$pos);
-       $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
-
-       if($userstatus=='start' || $userstatus=='init')
-         echo " <div class=\"vorbehalt".($pos-1)."\"> still needs <br />to decide </div>\n"; /* show this to everyone */
-       else
-         if($usersick!=NULL) /* in the init-phase we only showed players with $pos<$mypos, now we can show all */
-           echo " <div class=\"vorbehalt".($pos-1)."\"> sick </div>\n";
-         else
-           echo " <div class=\"vorbehalt".($pos-1)."\"> healthy </div>\n";
-      }
-    echo "    </div>\n  </li>\n</ul>\n";  /* end div trick, end li trick , end tricks*/
-    /* end displaying sickness */
-
-    echo "<div class=\"message\">\n";
-    echo '<p> '._('Checking if someone else selected solo, nines, wedding or poverty.').'</p>';
+    $messages[] = _('Checking if someone else selected solo, nines, wedding or poverty.');
 
     /* check if everyone has reached this stage */
     $userids = DB_get_all_userid_by_gameid($gameid);
     $ok = 1;
-    foreach($userids as $user)
+    foreach($userids as $userid)
       {
-       $userstat = DB_get_hand_status_by_userid_and_gameid($user,$gameid);
+       $userstat = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
        if($userstat!='check')
          {
            $ok = 0;
-           DB_set_player_by_gameid($gameid,$user);
+           DB_set_player_by_gameid($gameid,$userid);
            break;
          }
       };
 
     if(!$ok)
       {
-       echo '<p>'._('This step can only be handled after everyone finished the last step. '.
+       $messages[] = _('This step can only be handled after everyone finished the last step. '.
          'Seems like this is not the case, so you need to wait a bit... '.
          'you will get an email once that is the case, please use the link in '.
-         'that email to continue the game.').'</p></div>';
-
-       /* display cards, if player was just at the init-phase he will still see the cards from there
-        * we can put this one here, since the last player to finish the init state won't get here and
-        * will still see his card anyway from the init-phase
-        */
-       if($mystatus=='check')
-         {
-           /* show cards */
-           echo '<div class="mycards">'._('Your cards are').": <br />\n";
-           foreach($mycards as $card)
-             display_card($card,$PREF['cardset']);
-           echo "</div>\n";
-         }
-       break;
+         'that email to continue the game.');
       }
     else
       {
@@ -593,7 +655,7 @@ switch($mystatus)
         * are playing, in case there are any solos this already
         * will have the correct information in it */
 
-       echo '<p>'._('Ok, everyone is done... figuring out what kind of game we are playing.').'</p>';
+       $messages[] = _('Ok, everyone is done... figuring out what kind of game we are playing.');
 
        $gametype    = DB_get_gametype_by_gameid($gameid);
        $startplayer = DB_get_startplayer_by_gameid($gameid);
@@ -631,7 +693,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";
@@ -639,12 +701,12 @@ switch($mystatus)
                /* update game status */
                cancel_game('nines',$gameid);
 
-               echo "<p>The game has been canceled because ".DB_get_name('userid',$cancel).
-                 " has five or more nines and nobody is playing solo.</p>\n";
+               $messages[] = 'The game has been canceled because '.DB_get_name('userid',$cancel).
+                 " has five or more nines and nobody is playing solo.";
              }
            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";
@@ -652,17 +714,16 @@ switch($mystatus)
                /* update game status */
                cancel_game('lowtrump',$gameid);
 
-               echo "<p>The game has been canceled because ".DB_get_name('userid',$cancel).
-                 " has low trump and nobody is playing solo.</p>\n";
+               $messages[] = 'The game has been canceled because '.DB_get_name('userid',$cancel).
+                 ' has low trump and nobody is playing solo.';
              };
 
            $userids = DB_get_all_userid_by_gameid($gameid);
            foreach($userids as $user)
              {
-               mymail($user,$gameid, GAME_CANCELED, $message);
+               mymail($user,$gameid, GAME_CANCELED, $email_message);
              }
 
-           echo "</div>\n"; /* end div message */
            break;
          }
        else if($poverty==1) /* one person has poverty */
@@ -706,7 +767,7 @@ switch($mystatus)
            $gametype = 'wedding';
          };
        /* now the gametype is set correctly in the database */
-       echo '<p>'._('Got it').' :)</p>';
+       $messages[] = _('Got it').' :)';
 
        /* loop over all players, set re/contra if possible and start the game if possible */
        $userids = DB_get_all_userid_by_gameid($gameid);
@@ -786,21 +847,21 @@ switch($mystatus)
          {
            $startplayer = DB_get_startplayer_by_gameid($gameid);
            $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
-           $who         = DB_get_userid('hash',$hash);
-           DB_set_player_by_gameid($gameid,$who);
+           $userid      = DB_get_userid('hash',$hash);
+           DB_set_player_by_gameid($gameid,$userid);
 
            if($hash!=$me)
              {
                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" ;
-                   mymail($who,$gameid,GAME_READY,$message);
+                   mymail($userid,$gameid,GAME_READY,$email_message);
                  }
              }
            else
-             echo "Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.<br />\n";
+             $messages[] = "Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.<br />\n";
          }
        else
          {
@@ -810,7 +871,7 @@ switch($mystatus)
 
            $whoid = DB_get_userid('gameid-position',$gameid,$who);
            if($whoid==$myid)
-             echo "Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.<br /\n";
+             $messages[] =  "Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.<br /\n";
            else
              {
                $whohash = DB_get_hash_from_game_and_pos($gameid,$who);
@@ -819,21 +880,14 @@ 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".
-                     "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$whohash."\n\n" ;
-                   mymail($whoid,$gameid,GAME_POVERTY,$message);
+                   $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" ;
+                   mymail($whoid,$gameid,GAME_POVERTY,$email_message);
                  }
              }
          }
-       echo "</div>\n";
-       /* show cards */
-       echo '<div class="mycards">'._('Your cards are').": <br />\n";
-       foreach($mycards as $card)
-         display_card($card,$PREF['cardset']);
-       echo "</div>\n";
-
-       break;
       }
+    break;
 
   case 'poverty':
     /* user only gets here in a poverty game, several things have to be handled here:
@@ -873,40 +927,13 @@ switch($mystatus)
          };
       }
 
-    /* update hand */
+    /* get hand */
     $mycards = DB_get_hand($me);
-    $mycards = mysort($mycards,$gametype);
-
-    /* output pre-game trick in case user reloads,
-     * only needs to be done when a team has been formed */
-    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);
-
-       echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
-         "    <div class=\"trick\" id=\"trick0\">\n";
-
-       /* get information so show the cards that have been handed over in a poverty game */
-       output_exchanged_cards();
-
-       echo "    </div>\n  </li>\n</ul>\n\n";  /* end div trick, end li trick , end ul tricks */
-      }
-    /* end output pre-game trick */
 
     /* check if user need to give more cards back */
     if( ($myparty=='re' || $myparty=='contra') && count($mycards)>12)
       {
-       echo '<div class="poverty"> '._('You need to get rid of a few cards')."</div>\n";
-
-       $type='exchange';
-       echo '<div class="mycards">'._('Your cards are').": <br />\n";
-       foreach($mycards as $card)
-         display_link_card($card,$PREF['cardset'],$type);
-       echo "  <input type=\"submit\" class=\"submitbutton\" value=\"select card to give back\" />\n";
-       echo "</div>\n";
+       $card_status = CARDS_EXCHANGE;
       }
     else if( ($myparty=='re' || $myparty=='contra') && count($mycards)==12)
       {
@@ -916,22 +943,21 @@ switch($mystatus)
        /* email start player */
        $startplayer = DB_get_startplayer_by_gameid($gameid);
        $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
-       $who         = DB_get_userid('hash',$hash);
-       DB_set_player_by_gameid($gameid,$who);
+       $userid      = DB_get_userid('hash',$hash);
+       DB_set_player_by_gameid($gameid,$userid);
 
        if($hash!=$me)
          {
            if(DB_get_email_pref_by_hash($hash)!='emailaddict')
              {
                /* email startplayer */
-               $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" ;
-               mymail($who,$gameid,GAME_READY,$message);
+               $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" ;
+               mymail($userid,$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 */
+         $messages[]= "Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.";
       }
 
     /* the following is part A) of what needs to be done */
@@ -964,12 +990,7 @@ switch($mystatus)
                  }
              }
            echo "<a href=\"index.php?action=game&amp;me=$me&amp;trump=no\">No way</a> <br />\n";
-           echo "</div><div>\n";
-
-           echo '<div class="mycards">'._('Your cards are').": <br />\n";
-           foreach($mycards as $card)
-             display_card($card,$PREF['cardset']);
-           echo "</div></div>\n";
+           echo "</div>\n";
          }
        break;
       }
@@ -1003,19 +1024,19 @@ switch($mystatus)
            /* no more people to ask, need to cancel the game */
            if($mypos+$next>4)
              {
-               $message = "Hello, \n\n".
-                 "Game ".DB_format_gameid($gameid)." has been canceled since nobody wanted to take the trump.\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)
                  {
-                   mymail($user, $gameid, GAME_CANCELED_POVERTY, $message);
+                   mymail($user, $gameid, GAME_CANCELED_POVERTY, $email_message);
                  }
 
                /* update game status */
                cancel_game('trump',$gameid);
 
-               echo "<p class=\"message\";>Game ".DB_format_gameid($gameid)." has been canceled.<br /><br /></p>";
+               $messages[] = 'Game '.DB_format_gameid($gameid).' has been canceled.';
                break;
              }
            else
@@ -1027,10 +1048,12 @@ 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" ;
-               mymail($userid,$gameid, GAME_POVERTY, $message);
+               mymail($userid,$gameid, GAME_POVERTY, $email_message);
              }
+
+           $cards_status = CARDS_SHOW;
          }
        else
          {
@@ -1110,7 +1133,7 @@ switch($mystatus)
                        $next=2;
 
                    if($mypos+$next>4)
-                     echo "<div class=\"message\">Error in poverty, please contact the Admin</div>\n";
+                     $messages[] = "Error in poverty, please contact the Admin ($ADMIN_NAME at $ADMIN_EMAIL)";
 
                    $userhash = DB_get_hash_from_game_and_pos($gameid,$mypos+$next);
                    $userid   = DB_get_userid('hash',$userhash);
@@ -1118,15 +1141,14 @@ 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" ;
-                   mymail($userid,$gameid, GAME_DPOVERTY, $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";
+           $messages[] = "Please, <a href=\"$INDEX?action=game&amp;me=$me\">continue</a> here";
          }
       }
-    echo "</div>\n";
     break;
 
   case 'play':
@@ -1139,19 +1161,19 @@ switch($mystatus)
     switch($gamestatus)
       {
       case 'cancel-noplay':
-       echo "<div class=\"message\"><p>The game has been canceled due to the request of one player.</p><p>If this was a mistake all 4 players need to send an Email to $ADMIN_NAME at $ADMIN_EMAIL requesting that the game should be restarted.</p></div>";
+       $messages[] = "The game has been canceled due to the request of one player.</p><p>If this was a mistake all 4 players need to send an Email to $ADMIN_NAME at $ADMIN_EMAIL requesting that the game should be restarted.";
        break;
       case 'cancel-timedout':
-       echo "<div class=\"message\"><p>The game has been canceled because one player wasn't responding.</p><p>If this was a mistake all 4 players need to send an Email to $ADMIN_NAME at $ADMIN_EMAIL requesting that the game should be restarted.</p></div>";
+       $messages[] = "The game has been canceled because one player wasn't responding.<br />If this was a mistake all 4 players need to send an Email to $ADMIN_NAME at $ADMIN_EMAIL requesting that the game should be restarted.";
        break;
       case 'cancel-nines':
-       echo "<div class=\"message\"><p>The game has been canceled because one player had too many nines.</p></div>";
+       $messages[] = 'The game has been canceled because one player had too many nines.';
        break;
       case 'cancel-lowtrump':
-       echo "<div class=\"message\"><p>The game has been canceled because one player had low trump.</p></div>";
+       $messages[] = 'The game has been canceled because one player had low trump.';
        break;
       case 'cancel-trump':
-       echo "<div class=\"message\"><p>The game has been canceled because nobody wanted to take the trump.</p></div>";
+       $messages[] = 'The game has been canceled because nobody wanted to take the trump.';
        break;
       }
     /* for these two types, we shouldn't show the cards, since we might want to restart the game */
@@ -1167,13 +1189,13 @@ switch($mystatus)
       {
        $ok = 1;
        $userids = DB_get_all_userid_by_gameid($gameid);
-       foreach($userids as $user)
+       foreach($userids as $userid)
          {
-           $userstatus = DB_get_hand_status_by_userid_and_gameid($user,$gameid);
+           $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
            if($userstatus !='play' && $userstatus!='gameover')
              {
                $ok = 0;
-               DB_set_player_by_gameid($gameid,$user);
+               DB_set_player_by_gameid($gameid,$userid);
                break;
              }
          }
@@ -1185,15 +1207,15 @@ switch($mystatus)
            /* email startplayer */
            $startplayer = DB_get_startplayer_by_gameid($gameid);
            $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
-           $who         = DB_get_userid('hash',$hash);
-           DB_set_player_by_gameid($gameid,$who);
+           $userid      = DB_get_userid('hash',$hash);
+           DB_set_player_by_gameid($gameid,$userid);
 
            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".
-                 "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ;
-               mymail($who,$gameid, GAME_READY, $message);
+               $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" ;
+               mymail($userid,$gameid, GAME_READY, $email_message);
              }
          }
       }
@@ -1224,55 +1246,31 @@ switch($mystatus)
     /* has the game started? No, then just wait here...*/
     if($gamestatus == 'pre')
       {
-       echo '<p class="message"> '._('You finished the setup, but not everyone else finished it... '.
-         'You need to wait for the others. Just wait for an email.').' </p>';
-
-       $mycards = DB_get_hand($me);
-       $mycards = mysort($mycards,$gametype);
-
-       echo '<div class="mycards">'._('Your cards are').": <br />\n";
-       foreach($mycards as $card)
-         display_card($card,$PREF['cardset']);
-       echo "</div>\n";
+       $messages[] = _('You finished the setup, but not everyone else finished it... '.
+         'You need to wait for the others. Just wait for an email.');
 
        break; /* not sure this works... the idea is that you can
                * only  play a card after everyone is ready to play */
       }
 
-
-    /* get time from the last action of the game */
-    $r = DB_query_array("SELECT mod_date from Game WHERE id='$gameid' " );
-    $gameend = time() - strtotime($r[0]);
-
-    /* handle comments in case player didn't play a card, allow comments a week after the end of the game */
-    if( (!myisset('card') && $mystatus=='play') || ($mystatus=='gameover' && ($gameend < 60*60*24*7)) )
-      if(myisset('comment'))
-       {
-         $comment = $_REQUEST['comment'];
-         $playid = DB_get_current_playid($gameid);
-
-         if($comment != '')
-           DB_insert_comment($comment,$playid,$myid);
-       };
-
     /* get everything relevant to display the tricks */
-    $result = DB_query("SELECT Hand_Card.card_id as card,".
-                      "       Hand.position as position,".
-                      "       Play.sequence as sequence, ".
-                      "       Trick.id, ".
+    $result = DB_query('SELECT Hand_Card.card_id as card,'.
+                      '       Hand.position as position,'.
+                      '       Play.sequence as sequence, '.
+                      '       Trick.id, '.
                       "       GROUP_CONCAT(CONCAT('<span>',User.fullname,': ',Comment.comment,'</span>')".
                       "                    SEPARATOR '\n' ), ".
-                      "       Play.create_date, ".
-                      "       Hand.user_id ".
-                      "FROM Trick ".
-                      "LEFT JOIN Play ON Trick.id=Play.trick_id ".
-                      "LEFT JOIN Hand_Card ON Play.hand_card_id=Hand_Card.id ".
-                      "LEFT JOIN Hand ON Hand_Card.hand_id=Hand.id ".
-                      "LEFT JOIN Comment ON Play.id=Comment.play_id ".
-                      "LEFT JOIN User On User.id=Comment.user_id ".
+                      '       Play.create_date, '.
+                      '       Hand.user_id '.
+                      'FROM Trick '.
+                      'LEFT JOIN Play ON Trick.id=Play.trick_id '.
+                      'LEFT JOIN Hand_Card ON Play.hand_card_id=Hand_Card.id '.
+                      'LEFT JOIN Hand ON Hand_Card.hand_id=Hand.id '.
+                      'LEFT JOIN Comment ON Play.id=Comment.play_id '.
+                      'LEFT JOIN User On User.id=Comment.user_id '.
                       "WHERE Trick.game_id='".$gameid."' ".
-                      "GROUP BY Trick.id, sequence ".
-                      "ORDER BY Trick.id, sequence  ASC");
+                      'GROUP BY Trick.id, sequence '.
+                      'ORDER BY Trick.id, sequence ASC');
     $trickNR   = 0;
     $lasttrick = DB_get_max_trickid($gameid);
 
@@ -1281,23 +1279,41 @@ switch($mystatus)
     $pos  = DB_get_startplayer_by_gameid($gameid)-1;
     $firstcard = ''; /* first card in a trick */
 
-    echo "\n<ul class=\"tricks\">\n";
-    echo '  <li class="nohighlight"> '._('Game').' '.DB_format_gameid($gameid).": </li>\n";
+    echo "\n<div class=\"tricks\">\n";
 
     /* output vorbehalte */
     $mygametype = DB_get_gametype_by_gameid($gameid);
     $mygamesolo = DB_get_solo_by_gameid($gameid);
+    $show_pre_game_comments=1;
     if($mygametype != 'normal') /* only show when needed */
       if(!( $mygametype == 'solo' && $mygamesolo == 'silent') )
        {
-         echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
-           "    <div class=\"trick\" id=\"trick0\">\n";
+         echo "    <div class=\"trick\" id=\"trick0\">\n";
 
          /* get information so show the cards that have been handed over in a poverty game */
          output_exchanged_cards();
+         $show_pre_game_comments=0;
 
-         echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+         echo "    </div>\n";  /* end div trick, end li trick */
        }
+    if($show_pre_game_comments==1)
+      {
+       /* display all comments on the top right (card1)*/
+       $comments = DB_get_pre_comment($gameid);
+
+       if(sizeof($comments))
+         {
+           echo "    <div class=\"trick\" id=\"trick0\">\n";
+           /* display card */
+           echo "      <div class=\"card1\">\n";
+           /* display comments */
+           foreach( $comments as $comment )
+             echo "        <span class=\"comment\">".$comment[1].": ".$comment[0]."</span>\n";
+           echo "      </div>\n"; /* end div card */
+
+           echo "    </div>\n";  /* end div trick, end li trick */
+         }
+      }
 
     /* output tricks */
     while($r = DB_fetch_array($result))
@@ -1328,15 +1344,13 @@ switch($mystatus)
            if($trick!=$lasttrick)
              {
                /* start of an old trick? */
-               echo "  <li onclick=\"hl('$trickNR');\" class=\"old\"><a href=\"#\">"._('Trick')." $trickNR</a>\n".
-                 "    <div class=\"trick\" id=\"trick".$trickNR."\">\n".
+               echo  "    <div class=\"trick\" id=\"trick".$trickNR."\">\n".
                  "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
              }
            else if($trick==$lasttrick)
              {
                /* start of a last trick? */
-               echo "  <li onclick=\"hl('$trickNR');\" class=\"current\"><a href=\"#\">"._('Trick')." $trickNR</a>\n".
-                 "    <div class=\"trick\" id=\"trick".$trickNR."\">\n".
+               echo "    <div class=\"trick\" id=\"trick".$trickNR."\">\n".
                  "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
              };
 
@@ -1347,6 +1361,14 @@ switch($mystatus)
        /* display card */
        echo "      <div class=\"card".($pos-1)."\">\n";
 
+       /* for the first card, we also need to display calls from other players */
+       if($seq==1 && $trickNR==1)
+         {
+           $commentPreCalls=DB_get_pre_comment_call($gameid);
+           foreach ($commentPreCalls as $pre )
+             $comment .= $pre[1].": ".$pre[0]."<br/>";
+         }
+
        /* display comments */
        if($comment!='')
          echo "        <span class=\"comment\">".$comment."</span>\n";
@@ -1360,7 +1382,7 @@ switch($mystatus)
        if($seq==4)
          {
            $winner    = get_winner($play,$gametype); /* returns the position */
-           echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+           echo "    </div>\n";  /* end div trick, end li trick */
          }
       }
 
@@ -1429,7 +1451,7 @@ switch($mystatus)
                     (DB_get_call_by_hash($GAME['schweinchen-who']) || DB_get_partner_call_by_hash($GAME['schweinchen-who']) ))
                  )
                  {
-                   DB_insert_comment('Schweinchen! ',$playid,$myid);
+                   DB_insert_comment('Schweinchen! ',$playid,$gameid,$myid);
                    $commentSchweinchen = 'Schweinchen! ';
                  }
                if ($debug)
@@ -1570,13 +1592,14 @@ switch($mystatus)
                if($winner>0)
                  DB_query("UPDATE Trick SET winner='$winner' WHERE id='$trickid'");
                else
-                 echo "ERROR during scoring";
+                 $messages[] = "ERROR during scoring";
 
                if($debug)
                  echo "DEBUG: position $winner won the trick <br />";
 
                /* who is the next player? */
                $next = $winner;
+               $firstcard = ''; /* unset firstcard, so followsuit doesn't trigger with the last trick */
              }
            else
              {
@@ -1589,21 +1612,22 @@ switch($mystatus)
              {
                $comment = $_REQUEST['comment'];
                if($comment != '')
-                 DB_insert_comment($comment,$playid,$myid);
+                 DB_insert_comment($comment,$playid,$gameid,$myid);
                if($commentSchweinchen)
                  $comment = $commentSchweinchen . $comment;
+               if($commentCall != '')
+                 $comment = $commentCall . $comment;
              };
 
            /* display played card */
            $pos = DB_get_pos_by_hash($me);
            if($sequence==1)
              {
-               echo "  <li onclick=\"hl('".($tricknr)."');\" class=\"current\"><a href=\"#\">"._('Trick').' '.($tricknr)."</a>\n".
-                 "    <div class=\"trick\" id=\"trick".($tricknr)."\">\n".
-                 "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
+               echo '    <div class="trick" id="trick'.($tricknr)."\">\n".
+                 '      <img class="arrow" src="pics/arrow'.($pos-1).".png\" alt=\"table\" />\n";
              }
 
-           echo "      <div class=\"card".($pos-1)."\">\n        ";
+           echo '      <div class="card'.($pos-1)."\">\n        ";
 
            /* display comments */
            display_card($card,$PREF['cardset']);
@@ -1611,7 +1635,7 @@ switch($mystatus)
              echo "\n        <span class=\"comment\"> ".$comment."</span>\n";
            echo "      </div>\n";
 
-           echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+           echo "    </div>\n";  /* end div trick, end li trick */
 
            /*check if we still have cards left, else set status to gameover */
            if(sizeof(DB_get_hand($me))==0)
@@ -1638,47 +1662,47 @@ switch($mystatus)
            if(DB_get_game_status_by_gameid($gameid)=='play')
              {
                $next_hash = DB_get_hash_from_game_and_pos($gameid,$next);
-               $who       = DB_get_userid('hash',$next_hash);
-               DB_set_player_by_gameid($gameid,$who);
+               $userid    = DB_get_userid('hash',$next_hash);
+               DB_set_player_by_gameid($gameid,$userid);
 
-               $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' )
+                 'Use this link to play a card: '.$HOST.$INDEX.'?action=game&me='.$next_hash."\n\n" ;
+               if( DB_get_email_pref_by_uid($userid)!='emailaddict' )
                  {
-                   mymail($who,$gameid, GAME_YOUR_TURN, $message);
+                   mymail($userid,$gameid, GAME_YOUR_TURN, $email_message);
                  }
              }
            else /* send out final email */
              {
                /* individual score */
-               $result = DB_query("SELECT User.fullname, IFNULL(SUM(Card.points),0), Hand.party FROM Hand".
-                                  " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
-                                  " LEFT JOIN User ON User.id=Hand.user_id".
-                                  " LEFT JOIN Play ON Trick.id=Play.trick_id".
-                                  " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
-                                  " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
+               $result = DB_query('SELECT User.fullname, IFNULL(SUM(Card.points),0), Hand.party FROM Hand'.
+                                  ' LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id'.
+                                  ' LEFT JOIN User ON User.id=Hand.user_id'.
+                                  ' LEFT JOIN Play ON Trick.id=Play.trick_id'.
+                                  ' LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id'.
+                                  ' 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";
+                                  ' GROUP BY User.fullname' );
+               $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";
-
-               $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".
-                                  " LEFT JOIN User ON User.id=Hand.user_id".
-                                  " LEFT JOIN Play ON Trick.id=Play.trick_id".
-                                  " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
-                                  " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
+                 $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'.
+                                  ' LEFT JOIN User ON User.id=Hand.user_id'.
+                                  ' LEFT JOIN Play ON Trick.id=Play.trick_id'.
+                                  ' LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id'.
+                                  ' LEFT JOIN Card ON Card.id=Hand_Card.card_id'.
                                   " WHERE Hand.game_id='$gameid'".
-                                  " GROUP BY Hand.party" );
-               $message .= "\nTotals:\n";
+                                  ' GROUP BY Hand.party' );
+               $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')
@@ -1769,14 +1793,14 @@ switch($mystatus)
                  {
                    for( $p=$call_contra;$p<=120; $p+=30 )
                      {
-                         DB_query("INSERT INTO Score".
+                         DB_query('INSERT INTO Score'.
                                   " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'against$p')");
                        }
 
                      for( $p=$call_contra; $p<120; $p+=30)
                        {
                          if( $re >= $p )
-                           DB_query("INSERT INTO Score".
+                           DB_query('INSERT INTO Score'.
                                     " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'made$p')");
                        }
                    }
@@ -1784,14 +1808,14 @@ switch($mystatus)
                    {
                      for( $p=$call_re;$p<=120; $p+=30 )
                        {
-                         DB_query("INSERT INTO Score".
+                         DB_query('INSERT INTO Score'.
                                   " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'against$p')");
                        }
 
                      for( $p=$call_re; $p<120; $p+=30)
                        {
                          if( $contra>=$p )
-                           DB_query("INSERT INTO Score".
+                           DB_query('INSERT INTO Score'.
                                     " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'made$p')");
                        }
                    }
@@ -1799,7 +1823,7 @@ switch($mystatus)
                  /* point in case contra won */
                  if($winning_party=='contra')
                    {
-                     DB_query("INSERT INTO Score".
+                     DB_query('INSERT INTO Score'.
                               " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'againstqueens')");
                    }
 
@@ -1813,14 +1837,14 @@ switch($mystatus)
                            $offset = 1;
 
                          if($re>$p-$offset)
-                           DB_query("INSERT INTO Score".
+                           DB_query('INSERT INTO Score'.
                                     " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'".(240-$p)."')");
                        }
                      /* re called something and won */
                      foreach(array(0,30,60,90,120) as $p)
                        {
                          if($call_re!= -1 && $call_re<$p+1)
-                           DB_query("INSERT INTO Score".
+                           DB_query('INSERT INTO Score'.
                                     " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'call$p')");
                        }
                    }
@@ -1833,49 +1857,47 @@ switch($mystatus)
                            $offset = 1;
 
                          if($contra>$p-$offset)
-                           DB_query("INSERT INTO Score".
+                           DB_query('INSERT INTO Score'.
                                     " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'".(240-$p)."')");
                        }
                      /* re called something and won */
                      foreach(array(0,30,60,90,120) as $p)
                        {
                          if($call_contra != -1 && $call_contra<$p+1)
-                           DB_query("INSERT INTO Score".
+                           DB_query('INSERT INTO Score'.
                                     " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'call$p')");
                        }
                    }
 
 
                  /* add score points to email */
-                 $message .= "\n";
+                 $email_message .= "\n";
                  $Tpoint = 0;
-                 $message .= " Points Re: \n";
-                 $queryresult = DB_query("SELECT score FROM Score ".
-                                         "  WHERE game_id=$gameid AND party='re'".
-                                         " ");
+                 $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";
-                 $queryresult = DB_query("SELECT score FROM Score ".
-                                         "  WHERE game_id=$gameid AND party='contra'".
-                                         " ");
+                 $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)
@@ -1885,200 +1907,100 @@ 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";
-                 mymail($userids,$gameid, GAME_OVER, $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
          {
-           echo "can't find that card?! <br />\n";
+           $messages[] = "can't find that card?!";
          }
       }
     else if(myisset('card') && !$myturn )
       {
-       echo _("please wait until it's your turn!")."<br />\n";
+       $messages[] = _("please wait until it's your turn!");
       }
 
     if($seq!=4 && $trickNR>=1 && !(myisset('card') && $myturn) )
-      echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+      echo "    </div>\n";  /* end div trick, end li trick */
 
     /* display points in case game is over */
     if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' )
       {
-       echo "  <li onclick=\"hl('13');\" class=\"current\"><a href=\"#\">"._('Score')."</a>\n".
-         "    <div class=\"trick\" id=\"trick13\">\n";
+       echo "    <div class=\"trick\" id=\"trick13\">\n";
        /* add pic for re/contra
         "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";*/
 
-       $result = DB_query("SELECT User.fullname, IFNULL(SUM(Card.points),0), Hand.party,Hand.position FROM Hand".
-                          " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
-                          " LEFT JOIN User ON User.id=Hand.user_id".
-                          " LEFT JOIN Play ON Trick.id=Play.trick_id".
-                          " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
-                          " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
+       $result = DB_query('SELECT User.fullname, IFNULL(SUM(Card.points),0), Hand.party,Hand.position FROM Hand'.
+                          ' LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id'.
+                          ' LEFT JOIN User ON User.id=Hand.user_id'.
+                          ' LEFT JOIN Play ON Trick.id=Play.trick_id'.
+                          ' LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id'.
+                          ' LEFT JOIN Card ON Card.id=Hand_Card.card_id'.
                           " WHERE Hand.game_id='$gameid'".
-                          " GROUP BY User.fullname" );
+                          ' GROUP BY User.fullname' );
        while( $r = DB_fetch_array($result))
-         echo "      <div class=\"card".($r[3]-1)."\">\n".
-           "        <div class=\"score\">".$r[2]."<br /> ".$r[1]."</div>\n".
+         echo '      <div class="card'.($r[3]-1)."\">\n".
+           '        <div class="score">'.$r[2].'<br /> '.$r[1]."</div>\n".
            "      </div>\n";
 
        /* display totals */
-       $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".
-                          " LEFT JOIN User ON User.id=Hand.user_id".
-                          " LEFT JOIN Play ON Trick.id=Play.trick_id".
-                          " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
-                          " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
+       $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'.
+                          ' LEFT JOIN User ON User.id=Hand.user_id'.
+                          ' LEFT JOIN Play ON Trick.id=Play.trick_id'.
+                          ' LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id'.
+                          ' LEFT JOIN Card ON Card.id=Hand_Card.card_id'.
                           " WHERE Hand.game_id='$gameid'".
-                          " GROUP BY Hand.party" );
-       echo "<div class=\"total\">\n  Totals:<br />\n";
+                          ' GROUP BY Hand.party' );
+       echo "    <div class=\"total\">\n  Totals:<br />\n";
        while( $r = DB_fetch_array($result))
-         echo "  ".$r[0]." ".$r[1]."<br />\n";
+         echo '      '.$r[0].' '.$r[1]."<br />\n";
 
-       $queryresult = DB_query("SELECT timediff(mod_date,create_date) ".
+       $queryresult = DB_query('SELECT timediff(mod_date,create_date) '.
                                " FROM Game WHERE id='$gameid'");
        $r = DB_fetch_array($queryresult);
-       echo "  <p>This game took ".$r[0]." hours.</p>\n";
+       echo '      <p>This game took '.$r[0]." hours.</p>\n";
 
-       echo "  <div class=\"re\">\n   Points Re: <br />\n";
-       $queryresult = DB_query("SELECT score FROM Score ".
-                               "  WHERE game_id=$gameid AND party='re'".
-                               " ");
+       echo "      <div class=\"re\">\n   Points Re: <br />\n";
+       $queryresult = DB_query('SELECT score FROM Score '.
+                               "  WHERE game_id=$gameid AND party='re'");
        while($r = DB_fetch_array($queryresult) )
-         echo "   ".$r[0]."<br />\n";
-       echo "  </div>\n";
+         echo '       '.$r[0]."<br />\n";
+       echo "      </div>\n";
 
-       echo "  <div class=\"contra\">\n   Points Contra: <br />\n";
-       $queryresult = DB_query("SELECT score FROM Score ".
-                               "  WHERE game_id=$gameid AND party='contra'".
-                               " ");
+       echo "      <div class=\"contra\">\n   Points Contra: <br />\n";
+       $queryresult = DB_query('SELECT score FROM Score '.
+                               "  WHERE game_id=$gameid AND party='contra'");
        while($r = DB_fetch_array($queryresult) )
-         echo "   ".$r[0]."<br />\n";
-       echo "  </div>\n";
+         echo '       '.$r[0]."<br />\n";
+       echo "      </div>\n";
 
-       echo "</div>\n";
+       echo "    </div>\n";
 
-       echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+       echo "    </div>\n";  /* end div trick, end li trick */
       }
 
-    echo "  <li onclick=\"hl_prev();\" class=\"old\"><a href=\"#\">"._('prev')."</a></li>\n";
-    echo "  <li onclick=\"hl_next();\" class=\"old\"><a href=\"#\">"._('next')."</a></li>\n";
-    echo "</ul>\n"; /* end ul tricks*/
-
-    $mycards = DB_get_hand($me);
-    $mycards = mysort($mycards,$gametype);
-    echo "<div class=\"mycards\">\n";
+    echo "</div>\n"; /* end ul tricks*/
 
-    if($myturn && !myisset('card') && $mystatus=='play' )
+    if(   ($myturn && !myisset('card') && $mystatus=='play') /* it's my turn*/
+         || ($myturn && myisset('card') && $next==$mypos && $mystatus=='play')  /* a card has been played and player won the trick*/)
       {
-       echo "Hello ".$myname.", it's your turn!  <br />\n";
-       echo _('Your cards are').": <br />\n";
-
-       /* do we have to follow suite? */
-       $followsuit = 0;
-       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
-            * 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'))
-                 )
-               )
-             display_card($card,$PREF['cardset']);
-           else
-             display_link_card($card,$PREF['cardset'],$type='card',$selected=$howmanycards);
-         }
+       $card_status = CARDS_MYTURN;
       }
     else if($mystatus=='play' )
       {
-       echo _('Your cards are').": <br />\n";
-       foreach($mycards as $card)
-         display_card($card,$PREF['cardset']);
+       $card_status = CARDS_SHOW;
       }
     else if($mystatus=='gameover')
       {
-       $oldcards = DB_get_all_hand($me);
-       $oldcards = mysort($oldcards,$gametype);
-
        if(isset($_SESSION['id']) && $myid==$_SESSION['id'])
-         echo _('Your cards were').": <br />\n";
+         $card_status = CARDS_GAMEOVER_ME;
        else
-         {
-           $name = DB_get_name('userid',$myid);
-           echo "$name's were: <br />\n";
-         }
-
-       foreach($oldcards as $card)
-         display_card($card,$PREF['cardset']);
-
-       $userids = DB_get_all_userid_by_gameid($gameid);
-       foreach($userids as $user)
-         {
-           $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);
-
-           if($userhash!=$me)
-             {
-               echo "<br />";
-
-               $name = DB_get_name('userid',$user);
-               $oldcards = DB_get_all_hand($userhash);
-               $oldcards = mysort($oldcards,$gametype);
-               echo "$name's cards were: <br />\n";
-               foreach($oldcards as $card)
-                 display_card($card,$PREF['cardset']);
-             }
-         };
+         $card_status = CARDS_GAMEOVER;
       }
-    echo "</div>\n";
 
     /* if the game is over do some extra stuff, therefore exit the swtich statement if we are still playing*/
     if($mystatus=='play')
@@ -2088,39 +2010,244 @@ switch($mystatus)
     /* check if game is over, display results */
     if(DB_get_game_status_by_gameid($gameid)=='play')
       {
-       echo _('The game is over for you... other people still need to play though');
+       $messages[] = _('The game is over for you... other people still need to play though');
       }
     break;
   default:
-    myerror("error in testing the status");
-  }
+    myerror('error in testing the status');
+  } /*end of output: tricks, table, messages, card */
 
-/* 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
- */
-if( $gamestatus != 'gameover' )
-  {
-    /* game isn't over, only valid user can get here, so show menu */
-    display_user_menu($myid);
-  }
-else if(  $origmystatus != 'gameover' )
+/* display the 2nd half of table and the names */
+
+/***********************************
+ * Output pre-trick if needed      *
+ * this outputs status of healthy, *
+ * sick, etc during pre-game phase *
+ **********************************/
+switch($mystatus)
   {
-    /* user just played the very last card, game is now over, it's still ok to show the menu though */
-    display_user_menu($myid);
+  case 'start':
+    break;
+  case 'init':
+  case 'check':
+    /* output sickness of other playes, in case they already selected and are sitting in front of the current player */
+    echo "\n".'<div class="tricks">'."\n";
+    echo '    <div class="trick" id="trick0">'."\n";
+
+    for($pos=1;$pos<5;$pos++)
+      {
+       $usersick   = DB_get_sickness_by_pos_and_gameid($pos,$gameid);
+       $userid     = DB_get_userid('gameid-position',$gameid,$pos);
+       $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
+
+       if($userstatus=='start' || $userstatus=='init')
+         echo ' <div class="vorbehalt'.($pos-1).'">'._('still needs <br />to decide')."</div>\n"; /* show this to everyone */
+       else
+         if($usersick!=NULL) /* in the init-phase we only showed players with $pos<$mypos, now we can show all */
+           echo ' <div class="vorbehalt'.($pos-1).'">'._('sick')."</div>\n";
+         else
+           echo ' <div class="vorbehalt'.($pos-1).'">'._('healthy')."</div>\n";
+      }
+
+    /* display all comments on the top right (card1)*/
+    $comments = DB_get_pre_comment($gameid);
+    /* display card */
+    echo '      <div class="card1">'."\n";
+    /* display comments */
+    foreach( $comments as $comment )
+      echo '        <span class="comment">'.$comment[1].': '.$comment[0]."</span>\n";
+    echo "      </div>\n"; /* end div card */
+
+
+    echo "    </div>\n  </div>\n";  /* end div trick, end li trick , end tricks*/
+    /* end displaying sickness */
+
+    break;
+  case 'poverty':
+    /* output pre-game trick in case user reloads,
+     * only needs to be done when a team has been formed */
+    if($myparty=='re' || $myparty=='contra')
+      {
+       echo "\n<div class=\"tricks\">\n";
+
+       $mygametype =  DB_get_gametype_by_gameid($gameid);
+
+       echo "    <div class=\"trick\" id=\"trick0\">\n";
+
+       /* get information so show the cards that have been handed over in a poverty game */
+       output_exchanged_cards();
+
+       echo "    </div>\n </div>\n\n";  /* end div trick, end li trick , end ul tricks */
+      }
+    /* end output pre-game trick */
+    break;
+  case 'play':
+  case 'gameover':
+
+    /* already taken care of */
+    break;
+  default:
   }
-else if(  $mystatus == 'gameover' &&
-         isset($_SESSION['id']) )
+
+display_table_end();
+
+/**************
+ * show cards *
+ **************/
+
+$mycards = DB_get_hand($me);
+$mycards = mysort($mycards,$gametype);
+
+echo "\n";
+echo '<div class="mycards">';
+switch ($card_status) {
+ case CARDS_SHOW:
+   echo _('Your cards are').": <br />\n";
+   foreach($mycards as $card)
+     display_card($card,$PREF['cardset']);
+   break;
+ case CARDS_EXCHANGE:
+   echo '<div class="poverty"> '._('You need to get rid of a few cards')."</div>\n";
+
+   echo _('Your cards are').": <br />\n";
+   $type='exchange';
+   foreach($mycards as $card)
+     display_link_card($card,$PREF['cardset'],$type);
+   echo '  <input type="submit" class="submitbutton" value="select card to give back" />'."\n";
+   break;
+ case CARDS_MYTURN:
+   echo 'Hello '.$myname.", it's your turn!  <br />\n";
+   echo _('Your cards are').": <br />\n";
+
+   /* do we have to follow suite? */
+   $followsuit = 0;
+   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++;
+     }
+
+   /* make it boolean, so that we can pass it later to display_link_card */
+   if($howmanycards!=1)
+     $howmanycards=0;
+
+   foreach($mycards as $card)
+     {
+       /* 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'))
+            )
+          )
+        display_card($card,$PREF['cardset']);
+       else
+        display_link_card($card,$PREF['cardset'],$type='card',$selected=$howmanycards);
+     }
+   break;
+ case CARDS_GAMEOVER_ME:
+ case CARDS_GAMEOVER:
+   if($card_status == CARDS_GAMEOVER_ME)
+     echo _('Your cards were').": <br />\n";
+   else
+     {
+       $name = DB_get_name('userid',$myid);
+       echo "$name's were: <br />\n";
+     }
+   $oldcards = DB_get_all_hand($me);
+   $oldcards = mysort($oldcards,$gametype);
+
+   foreach($oldcards as $card)
+     display_card($card,$PREF['cardset']);
+
+   /* display hands of everyone else */
+   $userids = DB_get_all_userid_by_gameid($gameid);
+   foreach($userids as $user)
+     {
+       $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);
+
+       if($userhash!=$me)
+        {
+          echo "<br />";
+
+          $name = DB_get_name('userid',$user);
+          $oldcards = DB_get_all_hand($userhash);
+          $oldcards = mysort($oldcards,$gametype);
+          echo "$name's cards were: <br />\n";
+          foreach($oldcards as $card)
+            display_card($card,$PREF['cardset']);
+        }
+     };
+   break;
+ case CARDS_EMPTY:
+ default:
+   break;
+ }
+echo "</div>\n";
+
+/*****************
+ * show messages *
+ *****************/
+
+if( sizeof($messages) )
   {
-    /* user is looking at someone else's game, show the menu for the correct user */
-    display_user_menu($_SESSION['id']);
+    echo "\n<div class=\"message\">\n";
+    foreach($messages as $message)
+      {
+       echo "  <div>$message <div>close</div> </div>\n";
+      }
+    echo "</div>\n\n";
   }
-else
+
+/****************************
+ * commit commentCall to DB *
+ ****************************/
+
+if($commentCall != '')
   {
-    echo "<div class=\"usermenu\">\n";
-    echo "It's your turn in these games:<br />\n";
-    echo "Please log in to see this information.\n";
-    echo "</div>\n";
+    /* treat before game calls special, so that we can show them on the first trick and not the pre-phase */
+    if($playid == -1)
+      $playid = -2;
+
+    DB_insert_comment($commentCall,$playid,$gameid,$myid);
   }
+/***********************************************
+ * Comments, re/contra calls, user menu
+ ***********************************************/
 
 /*
  * display gameinfo: re/contra, comment-box, play-card button, games played by others
@@ -2133,7 +2260,7 @@ $r = DB_query_array("SELECT mod_date from Game WHERE id='$gameid' " );
 $gameend = time() - strtotime($r[0]);
 
 /* comment box */
-if($gamestatus == 'play' || $gameend < 60*60*24*7)
+if($gamestatus == 'play' || $gamestatus == 'pre' || $gameend < 60*60*24*7)
   {
     echo '  '._('A short comment').":<input name=\"comment\" type=\"text\" size=\"20\" maxlength=\"100\" />\n";
   }
@@ -2146,9 +2273,9 @@ if($gamestatus == 'play' )
   }
 
 /* play-card button */
-if($gamestatus == 'play' || $gameend < 60*60*24*7)
+if($gamestatus == 'play' || $gamestatus == 'pre' || $gameend < 60*60*24*7)
   {
-    echo "  <input type=\"submit\" value=\""._('submit')."\" />\n";
+    echo '  <input type="submit" value="'._('submit')."\" />\n";
   }
 
 /* has this hand been played by others? */
@@ -2166,7 +2293,7 @@ if(sizeof($other_game_ids)>0 && $mystatus=='gameover')
     echo "  </p>\n";
   }
 
-echo "</div>\n"; /* end gameinfo */
+echo "</div>\n\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)
@@ -2179,16 +2306,20 @@ if( $mystatus != 'gameover' ||
 
 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') &&
    isset($_SESSION['id']) && $_SESSION['id']==$myid)
   {
     $session = DB_get_session_by_gameid($gameid);
-    $result  = DB_query("SELECT id,create_date FROM Game".
+    $result  = DB_query('SELECT id,create_date FROM Game'.
                        " WHERE session=$session".
-                       " ORDER BY create_date DESC".
-                       " LIMIT 1");
+                       ' ORDER BY create_date DESC'.
+                       ' LIMIT 1');
     $r = -1;
     if($result)
       $r = DB_fetch_array($result);