BUGIFX+LAYOUT: gameids where still in the player menu; show table for new game setup
[e-DoKo.git] / index.php
index 44a5d5fc233f3d8220538ecc3a1e103be6ffabfa..57145c6d978ff2669a42a2497aba474d288806a6 100644 (file)
--- a/index.php
+++ b/index.php
@@ -6,41 +6,7 @@ include_once("output.php");      /* html output only */
 include_once("db.php");          /* database only */
 include_once("functions.php");   /* the rest */
 
-/* check if some variables are set in the config file, else set defaults */
-if(!isset($EmailName))
-     $EmailName="[DoKo] ";
-if(isset($EMAIL_REPLY))
-  {
-    ini_set("sendmail_from",$EMAIL_REPLY);
-  }
-if(!isset($ADMIN_NAME))
-  {
-    output_header();
-    echo "<h1>Setup not completed</h1>";
-    echo "You need to set \$ADMIN_NAME in config.php.";
-    output_footer(); 
-    exit(); 
-  }    
-if(!isset($ADMIN_EMAIL))
-  {
-    output_header();
-    echo "<h1>Setup not completed</h1>";
-    echo "You need to set \$ADMIN_EMAIL in config.php. ".
-      "If something goes wrong an email will send to this address.";
-    output_footer(); 
-    exit(); 
-  }
-
-/* in case work has to be done on the database or other section we can
- * shut down the server and tell people to come back later 
- */
-if(0) 
-  {
-    output_header();
-    echo "Working on the database...please check back in a few mintues"; 
-    output_footer(); 
-    exit(); 
-  }
+config_check();
 
 if(DB_open()<0)
   {
@@ -51,17 +17,34 @@ if(DB_open()<0)
     exit(); 
   }
 
+/* start a session, if it is not already running */
+session_start();
+
 /* done major error checking, output header of HTML page */
 output_header();
 
 /* check if we want to start a new game */
-if(myisset("new"))
+if(myisset("logout"))
   {
-    $names = DB_get_all_names();
-    output_form_for_new_game($names);
+    session_unset();
+    session_destroy();
+    $_SESSION = array();
+    echo "you are now logged out!";
+  }
+else if(myisset("new"))
+  {
+    if( isset($_SESSION["name"]) )
+      {
+       $names = DB_get_all_names();
+       output_form_for_new_game($names);
+      }
+    else
+      {
+       echo "Please log in.";
+      }
   }
 /*check if everything is ready to set up a new game */
- else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen" ))
+ else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","call" ))
   {
     $PlayerA = $_REQUEST["PlayerA"];
     $PlayerB = $_REQUEST["PlayerB"];
@@ -70,7 +53,8 @@ if(myisset("new"))
 
     $dullen      = $_REQUEST["dullen"];
     $schweinchen = $_REQUEST["schweinchen"];
-    
+    $call        = $_REQUEST["call"];
+
     $EmailA  = DB_get_email_by_name($PlayerA);
     $EmailB  = DB_get_email_by_name($PlayerB);
     $EmailC  = DB_get_email_by_name($PlayerC);
@@ -92,17 +76,7 @@ if(myisset("new"))
     /* create random numbers */
     $randomNR       = create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD);
     $randomNRstring = join(":",$randomNR);
-    
-    /* get ruleset information or create new one */
-    $ruleset = DB_get_ruleset($dullen,$schweinchen);
-    if($ruleset <0) 
-      {
-       myerror("Error defining ruleset: $ruleset");
-       output_footer();
-       DB_close();
-       exit();
-      };
-    
+        
     /* create game */
     $followup = NULL;
     if(myisset("followup") )
@@ -125,8 +99,23 @@ if(myisset("new"))
          }
       }
     else
-      mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre', ".
-                 "'$ruleset',NULL ,NULL)");
+      {
+       /* get ruleset information or create new one */
+       $ruleset = DB_get_ruleset($dullen,$schweinchen,$call);
+       if($ruleset <0) 
+         {
+           myerror("Error defining ruleset: $ruleset");
+           output_footer();
+           DB_close();
+           exit();
+         };
+       /* get max session */
+       $max = DB_get_max_session();
+       $max++;
+       
+       mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre', ".
+                 "'$ruleset','$max' ,NULL)");
+      }
     $game_id = mysql_insert_id();
     
     /* create hash */
@@ -201,26 +190,26 @@ else if(myisset("cancle","me"))
     /* get some information from the DB */
     $gameid   = DB_get_gameid_by_hash($me);
     $myname   = DB_get_name_by_hash($me);
-    
+
     /* check if game really is old enough */
     $result = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " );
     $r = mysql_fetch_array($result,MYSQL_NUM);
     if(time()-strtotime($r[0]) > 60*60*24*30) /* = 1 month */
       {
        $message = "Hello, \n\n".
-         "Game $gameid has been cancled since nothing happend for a while and $myname requested it.\n";
+         "Game ".DB_format_gameid($gameid)." has been cancled since nothing happend for a while and $myname requested it.\n";
        
        $userids = DB_get_all_userid_by_gameid($gameid);
        foreach($userids as $user)
          {
            $To = DB_get_email_by_userid($user);
-           mymail($To,$EmailName."game $gameid cancled (timed out)",$message);
+           mymail($To,$EmailName."game ".DB_format_gameid($gameid)." cancled (timed out)",$message);
          }
        
        /* delete everything from the dB */
        DB_cancel_game($me);
        
-       echo "<p style=\"background-color:red\";>Game $gameid has been cancled.<br /><br /></p>";
+       echo "<p style=\"background-color:red\";>Game ".DB_format_gameid($gameid)." has been cancled.<br /><br /></p>";
       }
     else
       echo "<p>You need to wait longer before you can cancle a game...</p>\n";
@@ -242,6 +231,9 @@ else if(myisset("me"))
        exit();
       }
 
+    if(isset($_SESSION["name"]))
+      output_status($_SESSION["name"]);
+
     /* the user had done something, update the timestamp */
     DB_update_user_timestamp($myid);
     
@@ -257,7 +249,6 @@ else if(myisset("me"))
     DB_get_PREF($myid);
     /* end set pref */
       
-      
     /* get rule set for this game */
     $result = mysql_query("SELECT * FROM Rulesets".
                          " LEFT JOIN Game ON Game.ruleset=Rulesets.id ".
@@ -268,7 +259,6 @@ else if(myisset("me"))
     $RULES["schweinchen"] = $r[3];
     $RULES["call"]        = $r[4];
 
-
     /* get some infos about the game */
     $gametype   = DB_get_gametype_by_gameid($gameid);
     $gamestatus = DB_get_game_status_by_gameid($gameid);
@@ -278,19 +268,82 @@ else if(myisset("me"))
        $gametype = DB_get_solo_by_gameid($gameid);
        $GT  = $gametype." ".$GT;
       }
+    
+    /* does anyone have both foxes */
+    $GAME["schweinchen"]=0; 
+    for($i=1;$i<5;$i++)
+      {
+       $hash  = DB_get_hash_from_game_and_pos($gameid,$i);
+       $cards = DB_get_all_hand($hash);
+       if( in_array("19",$cards) && in_array("20",$cards) )
+         {
+           $GAME["schweinchen"]=1;
+           $GAME["schweinchen-who"]=$hash;
+         }
+      };
+
+    /* put everyting in a form */
+    echo "<form action=\"index.php?me=$me\" method=\"post\">\n";
+
+    /* output left menu */
 
-    /* display rule set for this game */
-    echo "<div class=\"ruleset\">\n";
+    display_user_menu();
+
+    /* output right menu */
+
+      /* display rule set for this game */
+    echo "<div class=\"gameinfo\">\n";
 
     if($gamestatus != 'pre')
       echo " Gametype: $GT <br />\n";
     
     echo "Rules: <br />\n";
-    echo "10ofhearts : ".$r[2]."<br />\n";
-    echo "schweinchen: ".$r[3]."<br />\n";
-    echo "call:        ".$r[4]."<br />\n";
+    echo "10ofhearts : ".$RULES["dullen"]      ."<br />\n";
+    echo "schweinchen: ".$RULES["schweinchen"] ."<br />\n";
+    echo "call:        ".$RULES["call"]        ."<br />\n";
+
+    echo "<hr />\n";
+    if($mystatus == 'play' )
+      {
+       output_form_calls($me);
+       
+       echo "<br />\nA short comment:<input name=\"comment\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
+       echo "<hr />";
+      }
+
+    echo "<input type=\"submit\" value=\"submit\" />\n";
+
+
+    if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' )
+      {
+       echo "<hr />\n";
+       
+       $session = DB_get_session_by_gameid($gameid);
+       $result  = mysql_query("SELECT id,create_date FROM Game".
+                              " WHERE session=$session".
+                              " ORDER BY create_date DESC".
+                              " LIMIT 1");
+       $r = -1;
+       if($result)
+         $r = mysql_fetch_array($result,MYSQL_NUM);
+       
+       if(!$session || $gameid==$r[0])
+         {
+           /* suggest a new game with the same people in it, just rotated once (unless last game was solo) */
+           $names = DB_get_all_names_by_gameid($gameid);
+           $type  = DB_get_gametype_by_gameid($gameid);
+           
+           if($type=="solo")
+             output_ask_for_new_game($names[0],$names[1],$names[2],$names[3],$gameid);
+           else
+             output_ask_for_new_game($names[1],$names[2],$names[3],$names[0],$gameid);
+         }
+      }
+
     echo "</div>\n";
 
+    /* output game */
+
     /* output extra division in case this game is part of a session */
     if($session)
       {
@@ -308,20 +361,9 @@ else if(myisset("me"))
          }
        echo "</div>\n";
       }
-
-    
-    /* does anyone have both foxes */
-    $GAME["schweinchen"]=0; 
-    for($i=1;$i<5;$i++)
-      {
-       $hash  = DB_get_hash_from_game_and_pos($gameid,$i);
-       $cards = DB_get_all_hand($hash);
-       if( in_array("19",$cards) && in_array("20",$cards) )
-         {
-           $GAME["schweinchen"]=1;
-           $GAME["schweinchen-who"]=$hash;
-         }
-      };
+      
+    /* display the table and the names */
+    display_table();
 
     /* mystatus gets the player through the different stages of a game.
      * start:    yes/no
@@ -336,24 +378,30 @@ else if(myisset("me"))
     switch($mystatus)
       {
       case 'start':
-       check_want_to_play($me);
-       /* move on to the next stage*/
-       DB_set_hand_status_by_hash($me,'init');
-       break;
+       if( !myisset("in") )
+         {
+           output_check_want_to_play($me);
+           break;
+         }
+       else
+         {
+           /* move on to the next stage*/
+           DB_set_hand_status_by_hash($me,'init');
+         }
       case 'init':
        /* first check if everything went ok  in the last step
         * if not, send user back, if yes, check what he did
         */
        if( !myisset("in") )
          {
-           echo "<p> you need to answer the <a href=\"$host?me=$me\">question</a>.</p>";
+           echo "<p> You need to answer the <a href=\"$host?me=$me\">question</a>.</p>";
            DB_set_hand_status_by_hash($me,'start');
          }
        else
          {
            if($_REQUEST["in"] == "no")
              {
-               /* cancle the game */
+               /* cancel the game */
                $message = "Hello, \n\n".
                  "the game has been canceled due to the request of one of the players.\n";
                
@@ -361,7 +409,7 @@ else if(myisset("me"))
                foreach($userids as $user)
                  {
                    $To = DB_get_email_by_userid($user);
-                   mymail($To,$EmailName."game $gameid canceled",$message);
+                   mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled",$message);
                  }
                
                /* delete everything from the dB */
@@ -369,17 +417,16 @@ else if(myisset("me"))
              }
            else
              {
-               echo "thanks for joining the game...";
-               
                $mycards = DB_get_hand($me);
                sort($mycards);
-               echo "<p class=\"mycards\" style=\"margin-top:8em;\">your cards are: <br />\n";
+
+               output_check_for_sickness($me,$mycards);
+               
+               echo "<p class=\"mycards\">your cards are: <br />\n";
                foreach($mycards as $card) 
                  display_card($card,$PREF["cardset"]);
                echo "</p>\n";   
                
-               output_check_for_sickness($me,$mycards);
-               
                /* move on to the next stage*/
                DB_set_hand_status_by_hash($me,'check');
              }
@@ -390,17 +437,20 @@ else if(myisset("me"))
       /* ok, user is in the game, saw his cards and selected his vorbehalt
        * so first we check what he selected
        */
-      echo "Processing what you selected in the last step...<br />";
-
       if(!myisset("solo","wedding","poverty","nines") )
        {
          /* all these variables have a pre-selected default,
           * so we should never get here,
-          * unless a user tries to cheat ;) */
-         echo "something went wrong during the setup...please contact the $ADMIN_NAME at $ADMIN_EMAIL.";
+          * unless a user tries to cheat ;)
+          * can also happen if user reloads the page!
+          */
+         echo "<p> You need to answer the <a href=\"$host?me=$me&in=yes\">questions</a>.</p>";
+         DB_set_hand_status_by_hash($me,'init');
        }
       else
        {
+         echo "Processing what you selected in the last step...<br />";
+      
          /* check if this sickness needs to be handled first */
          $gametype    = DB_get_gametype_by_gameid($gameid);
          $startplayer = DB_get_startplayer_by_gameid($gameid);
@@ -473,10 +523,10 @@ else if(myisset("me"))
                  $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);
                  if($userhash != $me)
                    {
-                     $message = "Everyone finish the questionary in game $gameid, ".
+                     $message = "Everyone finish the questionary in game ".DB_format_gameid($gameid).", ".
                        "please visit this link now to continue: \n".
                        " ".$host."?me=".$userhash."\n\n" ;
-                     mymail($To,$EmailName." finished setup in game $gameid",$message);
+                     mymail($To,$EmailName." finished setup in game ".DB_format_gameid($gameid),$message);
                    }
                };
            };
@@ -490,7 +540,7 @@ else if(myisset("me"))
        * set that one in the Game table
        * tell people about it.
        */
-      echo "<br /> Checking if someone else selected solo, nines or wedding or poverty.<br />";
+      echo "<br /> Checking if someone else selected solo, nines, wedding or poverty.<br />";
       
       /* check if everyone has reached this stage */
       $userids = DB_get_all_userid_by_gameid($gameid);
@@ -558,19 +608,19 @@ else if(myisset("me"))
            }
          else if($nines)
            {
-             /* cancle game */
+             /* cancel game */
              /* TODO: should we keep statistics of this? */
              $message = "Hello, \n\n".
-               "the game has been canceled because ".DB_get_name_by_userid($nines).
-               " has five or more nines and nobody is playing solo.\n";
-             
-             /* TODO: add info about redeal in case this is a game of a series */
+               " the game has been canceled because ".DB_get_name_by_userid($nines).
+               " 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.";
              
              $userids = DB_get_all_userid_by_gameid($gameid);
              foreach($userids as $user)
                {
                  $To = DB_get_email_by_userid($user);
-                 mymail($To,$EmailName."game $gameid canceled",$message);
+                 mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled",$message);
                }
              
              /* delete everything from the dB */
@@ -632,7 +682,7 @@ else if(myisset("me"))
          foreach($userids as $user)
            {
              /* userids are sorted by position... 
-              * so output whatever the firstone has, then whatever the next one has
+              * so output whatever the first one has, then whatever the next one has
               * stop when the sickness is the same as the gametype 
               */
              
@@ -746,7 +796,7 @@ else if(myisset("me"))
 
                      $message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
                        " ".$host."?me=".$userhash."\n\n" ;
-                     mymail($To,$EmailName." poverty (game $gameid)",$message);
+                     mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
                    }
 
                  /* this user is done */
@@ -764,12 +814,11 @@ else if(myisset("me"))
                  $result = mysql_query("UPDATE Hand_Card SET hand_id='$myhand' WHERE hand_id='$userhand' AND card_id<'27'" );
                  
                  /* add hidden button with trump in it to get to the next point */
-                 echo "<form action=\"index.php\" method=\"post\">\n";
+                 echo "<div class=\"poverty\">\n";
                  echo "  <input type=\"hidden\" name=\"exchange\" value=\"-1\" />\n";
                  echo "  <input type=\"hidden\" name=\"trump\" value=\"".$trump."\" />\n";
-                 echo "  <input type=\"hidden\" name=\"me\" value=\"".$me."\" />\n";
                  echo "  <input type=\"submit\" class=\"submitbutton\" value=\"select cards to give back\" />\n";
-                 echo "</form>\n";
+                 echo "</div>\n";
                }
              else if(myisset("trump","exchange") && $_REQUEST["trump"]>0 && ($who==$mypos || $who==$mypos*10))
                {
@@ -828,7 +877,7 @@ else if(myisset("me"))
                              $message = "Someone has poverty, it's your turn to decide, ".
                                         "if you want to take the trump. Please visit:".
                                         " ".$host."?me=".$userhash."\n\n" ;
-                             mymail($To,$EmailName." poverty (game $gameid)",$message);
+                             mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
                            }
                        }
                      
@@ -870,24 +919,24 @@ else if(myisset("me"))
                  else
                    {
                      /* else show all trump, have lowest card pre-selected, have hidden setting for */
-                     echo "you need to get rid of a few cards<br />\n";
+                     echo "<div class=\"poverty\"> you need to get rid of a few cards</div>\n";
                      
                      set_gametype($gametype); /* this sets the $CARDS variable */
                      $mycards = DB_get_hand($me);
                      $mycards = mysort($mycards,$gametype);
 
-                     echo "<form class=\"exchange\" action=\"index.php\" method=\"post\">\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=\"hidden\" name=\"trump\" value=\"".$trump."\" />\n";
-                     echo "  <input type=\"hidden\" name=\"me\" value=\"".$me."\" />\n";
                      echo "  <input type=\"submit\" class=\"submitbutton\" value=\"select one card to give back\" />\n";
-                     echo "</form>\n";
+                     echo "</div>\n";
                    }
                }
              else if($who == $mypos || $who == $mypos*10)
                {
+                 echo "<div class=\"poverty\">\n";
                  foreach($userids as $user)
                    {
                      $name     = DB_get_name_by_userid($user);
@@ -901,15 +950,16 @@ else if(myisset("me"))
                          /* count trump */
                          if($nrtrump<4)
                            echo "Player $name has $nrtrump trump. Do you want to take them?".
-                             "<a href=\"index.php?me=$me&amp;trump=$user\">yes</a> <br />";
+                             "<a href=\"index.php?me=$me&amp;trump=$user\">yes</a> <br />\n";
                        }
                    }
-                 echo "<a href=\"index.php?me=$me&amp;trump=no\">No,way I take those trump...</a> <br />";
-
+                 echo "<a href=\"index.php?me=$me&amp;trump=no\">No,way I take those trump...</a> <br />\n";
+                 echo "</div>\n";
+                 
                  echo "Your cards are: <br />\n";
                  $mycards = DB_get_hand($me);
                  sort($mycards);
-                 echo "<p class=\"mycards\" style=\"margin-top:8em;\">your cards are: <br />\n";
+                 echo "<p class=\"mycards\">your cards are: <br />\n";
                  foreach($mycards as $card) 
                    display_card($card,$PREF["cardset"]);
                  echo "</p>\n";   
@@ -928,19 +978,19 @@ else if(myisset("me"))
          if($who==5 || $who==50)
            {
              $message = "Hello, \n\n".
-               "Game $gameid has been cancled since nobody wanted to take the trump.\n";
+               "Game ".DB_format_gameid($gameid)." has been cancled since nobody wanted to take the trump.\n";
              
              $userids = DB_get_all_userid_by_gameid($gameid);
              foreach($userids as $user)
                {
                  $To = DB_get_email_by_userid($user);
-                 mymail($To,$EmailName."game $gameid cancled (poverty not resolved)",$message);
+                 mymail($To,$EmailName."game ".DB_format_gameid($gameid)." cancled (poverty not resolved)",$message);
                }
              
              /* delete everything from the dB */
              DB_cancel_game($me);
              
-             echo "<p style=\"background-color:red\";>Game $gameid has been cancled.<br /><br /></p>";
+             echo "<p style=\"background-color:red\";>Game ".DB_format_gameid($gameid)." has been cancled.<br /><br /></p>";
              output_footer();
              DB_close();
              exit();
@@ -970,9 +1020,9 @@ else if(myisset("me"))
              if($hash!=$me)
                {
                  /* email startplayer) */
-                 $message = "It's your turn now in game $gameid.\n".
+                 $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
                    "Use this link to play a card: ".$host."?me=".$hash."\n\n" ;
-                 mymail($email,$EmailName."ready, set, go... (game $gameid) ",$message);
+                 mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
                }
              else
                echo " Please, <a href=\"$host?me=$me\">start</a> the game.<br />";      
@@ -1008,16 +1058,6 @@ else if(myisset("me"))
       /* get some infos about the game */
       $gamestatus = DB_get_game_status_by_gameid($gameid);
       
-      /* display useful things in divs */
-      
-      /* display links to the users status page */
-      $result = mysql_query("SELECT email,password from User WHERE id='$myid'" );
-      $r      = mysql_fetch_array($result,MYSQL_NUM);
-      
-      display_links($r[0],$r[1]);
-      
-      /* end display useful things*/
-      
       /* has the game started? No, then just wait here...*/
       if($gamestatus == 'pre')
        {
@@ -1026,150 +1066,29 @@ else if(myisset("me"))
          break; /* not sure this works... the idea is that you can 
                  * only  play a card after everyone is ready to play */
        }
-      
-      /* display the table and the names */
-      $result = mysql_query("SELECT  User.fullname as name,".
-                           "        Hand.position as position, ".
-                           "        User.id, ".
-                           "        Hand.party as party, ".
-                           "        Hand.sickness as sickness, ".
-                           "        Hand.point_call, ".
-                           "        User.last_login, ".
-                           "        Hand.hash        ".
-                           "FROM Hand ".
-                           "LEFT JOIN User ON User.id=Hand.user_id ".
-                           "WHERE Hand.game_id='".$gameid."' ".
-                           "ORDER BY position ASC");
-      
-      echo "<div class=\"table\">\n".
-       "  <img src=\"pics/table.png\" alt=\"table\" />\n";
-      while($r = mysql_fetch_array($result,MYSQL_NUM))
-       {
-         $name  = $r[0];
-         $pos   = $r[1];
-         $user  = $r[2];
-         $party = $r[3];
-         $sickness  = $r[4];
-         $call      = $r[5];
-         $lastlogin = strtotime($r[6]);
-         $hash      = $r[7];
 
-         $offset = DB_get_user_timezone($user);
-         $zone   = return_timezone($offset);
-         date_default_timezone_set($zone);
+      /* get time from the last action of the game */
+      $result  = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " );
+      $r       = mysql_fetch_array($result,MYSQL_NUM);
+      $gameend = time() - strtotime($r[0]);
 
-         echo " <span class=\"table".($pos-1)."\">\n";
-         if(!$debug)
-           echo " $name \n";
-         else
-           {
-             echo "<a href=\"".$host."?me=".$hash."\">$name</a>\n";
-           }
-         /* add hints for poverty, wedding, solo, etc */
-         if($GT=="poverty" && $party=="re")
-           if($sickness=="poverty")
-             {
-               $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);
-               $cards    = DB_get_all_hand($userhash);
-               $trumpNR  = count_trump($cards);
-               if($trumpNR)
-                 echo "<img src=\"pics/button/poverty_trump_button.png\" class=\"button\" alt=\"poverty < trump back\" />";
-               else
-                 echo "<img src=\"pics/button/poverty_notrump_button.png\" class=\"button\" alt=\"poverty <\" />";
-             }
-           else
-             echo "<img src=\"pics/button/poverty_partner_button.png\" class=\"button\" alt=\"poverty >\" />";
-
-         if($GT=="dpoverty")
-           if($party=="re")
-             if($sickness=="poverty")
-               {
-               $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);
-               $cards    = DB_get_all_hand($userhash);
-               $trumpNR  = count_trump($cards);
-               if($trumpNR)
-                 echo "<img src=\"pics/button/poverty_trump_button.png\" class=\"button\" alt=\"poverty < trump back\" />";
-               else
-                 echo "<img src=\"pics/button/poverty_notrump_button.png\" class=\"button\" alt=\"poverty <\" />";
-               }
-             else
-               echo "<img src=\"pics/button/poverty_partner_button.png\" class=\"button\" alt=\"poverty >\" />";
-           else
-             if($sickness=="poverty")
-               {
-               $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);
-               $cards    = DB_get_all_hand($userhash);
-               $trumpNR  = count_trump($cards);
-               if($trumpNR)
-                 echo "<img src=\"pics/button/poverty2_trump_button.png\" class=\"button\" alt=\"poverty2 < trump back\" />";
-               else
-                 echo "<img src=\"pics/button/poverty2_notrump_button.png\" class=\"button\" alt=\"poverty2 <\" />";
-               }
-             else
-               echo "<img src=\"pics/button/poverty2_partner_button.png\" class=\"button\" alt=\"poverty2 >\" />";
-             
-         if($GT=="wedding" && $party=="re")
-             if($sickness=="wedding")
-               echo "<img src=\"pics/button/wedding_button.png\" class=\"button\" alt=\"wedding\" />";
-             else
-               echo "<img src=\"pics/button/wedding_partner_button.png\" class=\"button\" alt=\"wedding partner\" />";
-         
-         if(ereg("solo",$GT) && $party=="re")
-           {
-             if(ereg("queen",$GT))
-               echo "<img src=\"pics/button/queensolo_button.png\" class=\"button\" alt=\"$GT\" />";
-             else if(ereg("jack",$GT))
-               echo "<img src=\"pics/button/jacksolo_button.png\" class=\"button\" alt=\"$GT\" />";
-             else if(ereg("club",$GT))
-               echo "<img src=\"pics/button/clubsolo_button.png\" class=\"button\" alt=\"$GT\" />";
-             else if(ereg("spade",$GT))
-               echo "<img src=\"pics/button/spadesolo_button.png\" class=\"button\" alt=\"$GT\" />";
-             else if(ereg("heart",$GT))
-               echo "<img src=\"pics/button/heartsolo_button.png\" class=\"button\" alt=\"$GT\" />";
-             else if(ereg("trumpless",$GT))
-               echo "<img src=\"pics/button/notrumpsolo_button.png\" class=\"button\" alt=\"$GT\" />";
-             else if(ereg("trump",$GT))
-               echo "<img src=\"pics/button/diamandsolo_button.png\" class=\"button\" alt=\"$GT\" />";
-           }
-
-         /* add point calls */
-         if($call!=NULL)
-           {
-             if($party=="re")
-               echo "<img src=\"pics/button/re_button.png\" class=\"button\" alt=\"re\" />";
-             else
-               echo "<img src=\"pics/button/contra_button.png\" class=\"button\" alt=\"contra\" />";
-             switch($call)
-               {
-               case "0":
-                 echo "<img src=\"pics/button/0_button.png\" class=\"button\" alt=\"0\" />";
-                 break;
-               case "30":
-                 echo "<img src=\"pics/button/30_button.png\" class=\"button\" alt=\"30\" />";
-                 break;
-               case "60":
-                 echo "<img src=\"pics/button/60_button.png\" class=\"button\" alt=\"60\" />";
-                 break;
-               case "90":
-                 echo "<img src=\"pics/button/90_button.png\" class=\"button\" alt=\"90\" />";
-                 break;
-               }
-           }
-
-         echo "<br />\n";
-         echo " local time: ".date("Y-m-d H:i:s")."<br />\n";
-         echo " last login: ".date("Y-m-d H:i:s",$lastlogin)."<br />\n";
-         echo " </span>\n";
-
-       }
-      echo  "</div>\n";
+      /* handel 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 = mysql_query("SELECT Hand_Card.card_id as card,".
                            "       Hand.position as position,".
                            "       Play.sequence as sequence, ".
                            "       Trick.id, ".
-                           "       Comment.comment, ".
+                           "       GROUP_CONCAT(CONCAT('<span>',User.fullname,': ',Comment.comment,'</span>') SEPARATOR '\n' ), ".
                            "       Play.create_date, ".
                            "       Hand.user_id ".
                            "FROM Trick ".
@@ -1177,8 +1096,10 @@ else if(myisset("me"))
                            "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."' ".
-                           "ORDER BY Trick.id,sequence ASC");
+                           "GROUP BY Trick.id, sequence ".
+                           "ORDER BY Trick.id, sequence  ASC");
       $trickNR   = 1;
       $lasttrick = DB_get_max_trickid($gameid);
       
@@ -1188,7 +1109,7 @@ else if(myisset("me"))
       $firstcard = ""; /* first card in a trick */
       
       echo "\n<ul class=\"tricks\">\n";
-      echo "  <li class=\"nohighlight\"> Game $gameid: </li>\n";
+      echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
       
       while($r = mysql_fetch_array($result,MYSQL_NUM))
        {
@@ -1248,15 +1169,10 @@ else if(myisset("me"))
          if($seq==4)
            {
              $trickNR++;
-             echo "    </div>\n  </li>\n";  /* end div table, end li table */
+             echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
            }
        }
-      
-      if($seq!=4 && $trickNR>1) 
-       echo "    </div>\n  </li>\n";  /* end div table, end li table */
-      
-      echo "</ul>\n";
-      
+            
       /* whos turn is it? */
       if($seq==4)
        {
@@ -1275,7 +1191,7 @@ else if(myisset("me"))
        $myturn = 1;
       else
        $myturn = 0;
-      
+
       /* do we want to play a card? */
       if(myisset("card") && $myturn)
        {
@@ -1291,8 +1207,6 @@ else if(myisset("me"))
          
          if($handcardid) /* everything ok, play card  */
            {
-             $comment = "";
-
              /* update Game timestamp */
              DB_update_game_timestamp($gameid);
 
@@ -1312,26 +1226,26 @@ else if(myisset("me"))
              mysql_query("UPDATE Hand_Card SET played='true' WHERE hand_id='$handid' AND card_id=".
                          DB_quote_smart($card));
 
+             /* get trick id or start new trick */
+             $a = DB_get_current_trickid($gameid);
+             $trickid  = $a[0];
+             $sequence = $a[1];
+             $tricknr  = $a[2];
+             
+             $playid = DB_play_card($trickid,$handcardid,$sequence);
+
              /* check for schweinchen */
-             //echo "schweinchen = ".$GAME["schweinchen"]." --$card-<br />";
              if($card == 19 || $card == 20 )
                {
                  $GAME["schweinchen"]++;
                  if($GAME["schweinchen"]==3 && $RULES["schweinchen"]=="second" )
-                   $comment="Schweinchen! ";
+                   DB_insert_comment("Schweinchen! ",$playid,$myid);
                  if($RULES["schweinchen"]=="both" )
-                   $comment="Schweinchen! ";
-                 if ($debug) echo "schweinchen = ".$GAME["schweinchen"]." ---<br />";
+                   DB_insert_comment("Schweinchen! ",$playid,$myid);
+                 if ($debug) 
+                   echo "schweinchen = ".$GAME["schweinchen"]." ---<br />";
                }
 
-             /* get trick id or start new trick */
-             $a = DB_get_current_trickid($gameid);
-             $trickid  = $a[0];
-             $sequence = $a[1];
-             $tricknr  = $a[2];
-             
-             $playid = DB_play_card($trickid,$handcardid,$sequence);
-             
              /* if sequence == 4 check who one in case of wedding */
              if($sequence == 4 && $GT == "wedding") 
                {
@@ -1367,20 +1281,53 @@ else if(myisset("me"))
                        }
                    }
                }
-             
+
+             /* if sequence == 4, set winner of the trick, count points and set the next player */
+             if($sequence==4)
+               {
+                 $play   = DB_get_cards_by_trick($trickid);
+                 $winner = get_winner($play,$gametype); /* returns the position */
+
+                 if($winner>0)
+                   mysql_query("UPDATE Trick SET winner='$winner' WHERE id='$trickid'");
+                 else
+                   echo "ERROR during scoring";
+
+                 if($debug)
+                   echo "DEBUG: position $winner won the trick <br />";
+
+                 /* who is the next player? */
+                 $next = $winner;
+               }
+             else
+               {
+                 $next = DB_get_pos_by_hash($me)+1;
+               }
+             if($next==5) $next=1;
+
              /* check for coment */
              if(myisset("comment"))
                {
-                 $comment.=$_REQUEST["comment"];
+                 $comment = $_REQUEST["comment"];
+                 if($comment != "")
+                   DB_insert_comment($comment,$playid,$myid);
                };  
-             if($comment != "")
-               DB_insert_comment($comment,$playid,$myid);
-
+             
              /* display played card */
-             echo "<div class=\"card\">";
-             echo " you played  <br />";
+             $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=\"card".($pos-1)."\">";
+             /* display comments */
              display_card($card,$PREF["cardset"]);
-             echo "</div>\n";
+             if($comment!="")
+               echo "  <span class=\"comment\"> ".$comment."</span>\n";
+             echo "</div></div></li>\n";
              
              /*check if we still have cards left, else set status to gameover */
              if(sizeof(DB_get_hand($me))==0)
@@ -1401,40 +1348,45 @@ else if(myisset("me"))
                  $done=0;
              
              if($done)
+               DB_set_game_status_by_gameid($gameid,"gameover");
+
+             /* email next player, if game is still running */
+             if(DB_get_game_status_by_gameid($gameid)=='play')
+               {
+                 $next_hash = DB_get_hash_from_game_and_pos($gameid,$next);
+                 $email     = DB_get_email_by_hash($next_hash);
+                 $who       = DB_get_userid_by_email($email);
+                 DB_set_player_by_gameid($gameid,$who);
+                 
+                 $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."?me=".$next_hash."\n\n" ;
+                 mymail($email,$EmailName."a card has been played in game ".DB_format_gameid($gameid),$message);
+               }
+             else /* send out final email */
                {
-                 DB_set_game_status_by_gameid($gameid,"gameover");
-                 /* get score for last trick 
-                  * all other tricks are handled a few lines further down*/
-                 $play   = DB_get_cards_by_trick($trickid);
-                 $winner = get_winner($play,$gametype); /* returns the position */
-                 /* get points of last trick and save it */
-                 $points = 0;
-                 foreach($play as $card)
-                   $points = $points + card_value($card["card"]);
-                 $winnerid = DB_get_handid_by_gameid_and_position($gameid,$winner);
-                 if($winnerid>0)
-                   mysql_query("INSERT INTO Score VALUES (NULL, '$gameid', '$winnerid', '$points')");
-                 else
-                   {
-                     myerror("ERROR during scoring");
-                   }             
-                 /* email all players */
                  /* individual score */
-                 $result = mysql_query("SELECT fullname, IFNULL(SUM(score),0), Hand.party FROM Hand".
-                                       " LEFT JOIN Score ON Hand.id=Score.hand_id".
-                                       " LEFT JOIN User ON Hand.user_id=User.id".
-                                       " WHERE Hand.game_id=$gameid".
-                                       " GROUP BY fullname" );
+                 $result = mysql_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";
                  while( $r = mysql_fetch_array($result,MYSQL_NUM))
                    $message .= "   ".$r[0]."(".$r[2].") ".$r[1]."\n";
 
-                 $result = mysql_query("SELECT Hand.party, IFNULL(SUM(score),0) FROM Hand".
-                                       " LEFT JOIN Score ON Hand.id=Score.hand_id".
-                                       " LEFT JOIN User ON Hand.user_id=User.id".
-                                       " WHERE Hand.game_id=$gameid".
-                                       " GROUP BY Hand.party" );
+                 $result = mysql_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";
                  while( $r = mysql_fetch_array($result,MYSQL_NUM))
                    $message .= "    ".$r[0]." ".$r[1]."\n";
@@ -1447,62 +1399,16 @@ else if(myisset("me"))
                  $To = implode(",",$all);
 
                  $help = "\n\n (you can use reply all on this email to reach all the players.)\n";
-                 mymail($To,$EmailName."game over (game $gameid) part 1(2)",$message.$help);
+                 mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 1(2)",$message.$help);
 
                  foreach($userids as $user)
                    {
                      $To   = DB_get_email_by_userid($user);
                      $hash = DB_get_hash_from_gameid_and_userid($gameid,$user);
                      
-                     $link = "Use this link to have a look at game $gameid: ".$host."?me=".$hash."\n\n" ;
-                     mymail($To,$EmailName."game over (game $gameid) part 2(2)",$link);
-                   }
-               }
-             
-             
-             /* email next player */
-             if(DB_get_game_status_by_gameid($gameid)=='play')
-               {
-                 if($sequence==4)
-                   {
-                     $play   = DB_get_cards_by_trick($trickid);
-                     $winner = get_winner($play,$gametype); /* returns the position */
-                     
-                     /* get points of last trick and save it, last trick is handled 
-                      * a few lines further up  */
-                     $points = 0;
-                     foreach($play as $card)
-                       $points = $points + card_value($card["card"]);
-                     
-                     $winnerid = DB_get_handid_by_gameid_and_position($gameid,$winner);
-                     if($winnerid>0)
-                       mysql_query("INSERT INTO Score VALUES (NULL, '$gameid', '$winnerid', '$points')");
-                     else
-                       {
-                         myerror("ERROR during scoring");
-                       };
-                     if($debug)
-                       echo "DEBUG: $winner got $points <br />";
-                     
-                     /* who is the next player? */
-                     $next = $winner;
-                   }
-                 else
-                   {
-                     $next = DB_get_pos_by_hash($me)+1;
+                     $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ".$host."?me=".$hash."\n\n" ;
+                     mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 2(2)",$link);
                    }
-                 if($next==5) $next=1;
-                 
-                 /* email next player */
-                 $next_hash = DB_get_hash_from_game_and_pos($gameid,$next);
-                 $email     = DB_get_email_by_hash($next_hash);
-                 $who       = DB_get_userid_by_email($email);
-                 DB_set_player_by_gameid($gameid,$who);
-
-                 $message = "A card has been played in game $gameid.\n\n".
-                   "It's your turn  now.\n".
-                   "Use this link to play a card: ".$host."?me=".$next_hash."\n\n" ;
-                 mymail($email,$EmailName."a card has been played in game $gameid",$message);            
                }
            }
          else
@@ -1514,16 +1420,45 @@ else if(myisset("me"))
        {
          echo "please wait until it's your turn! <br />\n";
        }
+
+      if($seq!=4 && $trickNR>1) 
+       echo "    </div>\n  </li>\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";
+         /* add pic for re/contra
+          "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";*/
+         
+         $result = mysql_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" );
+         while( $r = mysql_fetch_array($result,MYSQL_NUM))
+           echo "      <div class=\"card".($r[3]-1)."\">\n".
+                "        <span class=\"score\">".$r[2]."<br /> ".$r[1]."</span>\n".
+                "      </div>\n";
+         
+         echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+       }
+
+      
+      echo "</ul>\n"; /* end ul tricks*/
       
       $mycards = DB_get_hand($me);
       $mycards = mysort($mycards,$gametype);
       echo "<div class=\"mycards\">\n";
       
-      if($myturn && !myisset("card"))
+      if($myturn && !myisset("card") && $mystatus=='play' )
        {
          echo "Hello ".$myname.", it's your turn!  <br />\n";
          echo "Your cards are: <br />\n";
-         echo "<form  action=\"index.php?me=$me\" method=\"post\">\n";
          
          /* do we have to follow suite? */
          $followsuit = 0;
@@ -1537,38 +1472,27 @@ else if(myisset("me"))
              else
                display_link_card($card,$PREF["cardset"]);
            }
-         
-         if( can_call(120,$me) )
-             echo " re/contra (120):".
-               " <input type=\"radio\" name=\"call120\" value=\"yes\" /> ";
-         if( can_call(90,$me) )
-             echo " 90:".
-               " <input type=\"radio\" name=\"call90\" value=\"yes\" /> ";
-         if( can_call(60,$me) )
-             echo " 60:".
-               " <input type=\"radio\" name=\"call60\" value=\"yes\" /> ";
-         if( can_call(30,$me) )
-             echo " 30:".
-               " <input type=\"radio\" name=\"call30\" value=\"yes\" /> ";
-         if( can_call(0,$me) )
-             echo " 0:".
-               " <input type=\"radio\" name=\"call0\" value=\"yes\" /> ".
-               " no call:".
-               " <input type=\"radio\" name=\"call0\" value=\"no\" /> ";
-
-         echo "<br />\nA short comments:<input name=\"comment\" type=\"text\" size=\"30\" maxlength=\"50\" />\n";
-         echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
-         echo "<input type=\"submit\" value=\"move\" />\n";
-         echo "</form>\n";
        }
-      else if($mystatus=='play')
-       {
+      else if($mystatus=='play' )
+       {         
          echo "Your cards are: <br />\n";
          foreach($mycards as $card) 
            display_card($card,$PREF["cardset"]);
        }
       else if($mystatus=='gameover')
        {
+         /* get time from the last action of the game */
+         $result  = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " );
+         $r       = mysql_fetch_array($result,MYSQL_NUM);
+         $gameend = time() - strtotime($r[0]);
+         
+         if( $gameend < 60*60*24*7 )
+           {
+             echo "<br />\nA short comment:<input name=\"comment\" type=\"text\" size=\"30\" maxlength=\"100\" />\n";
+             echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
+             echo "<input type=\"submit\" value=\"submit\" />\n";
+           }
+
          $oldcards = DB_get_all_hand($me);
          $oldcards = mysort($oldcards,$gametype);
          echo "Your cards were: <br />\n";
@@ -1591,13 +1515,14 @@ else if(myisset("me"))
                   foreach($oldcards as $card)
                     display_card($card,$PREF["cardset"]);
                 }
-            }
+            };
        }
       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')
        break;
+
       /* the following happens only when the gamestatus is 'gameover' */
       /* check if game is over, display results */
       if(DB_get_game_status_by_gameid($gameid)=='play')
@@ -1606,62 +1531,45 @@ else if(myisset("me"))
        }
       else
        {
-         echo "the game is over now...<br />\n";
-         
-         $result = mysql_query("SELECT fullname, IFNULL(SUM(score),0), Hand.party FROM Hand".
-                               " LEFT JOIN Score ON Hand.id=Score.hand_id".
-                               " LEFT JOIN User ON Hand.user_id=User.id".
-                               " WHERE Hand.game_id=$gameid".
-                               " GROUP BY fullname" );
-         echo "Final Score:<br />\n".
-           " <table>\n";;
-         while( $r = mysql_fetch_array($result,MYSQL_NUM))
-           echo "  <tr><td>  ".$r[0]."</td><td>(".$r[2].")</td><td> ".$r[1]."</td></tr>";
-         echo "</table>\n";
-
-         $result = mysql_query("SELECT Hand.party, IFNULL(SUM(score),0) FROM Hand".
-                               " LEFT JOIN Score ON Hand.id=Score.hand_id".
-                               " LEFT JOIN User ON Hand.user_id=User.id".
-                               " WHERE Hand.game_id=$gameid".
+         $result = mysql_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 "Totals:<br />\n".
-           " <table> \n";
+         echo "<div class=\"total\"> Totals:<br />\n";
          while( $r = mysql_fetch_array($result,MYSQL_NUM))
-           echo "  <tr><td>".$r[0]."</td><td> ".$r[1]."</td></tr>\n";
-         echo "</table>\n";
+           echo "  ".$r[0]." ".$r[1]."<br />\n";
+         echo "</div>\n";
          
-         $session = DB_get_session_by_gameid($gameid);
-         $result  = mysql_query("SELECT id,create_date FROM Game".
-                                " WHERE session=$session".
-                                " ORDER BY create_date DESC".
-                                " LIMIT 1");
-         $r = -1;
-         if($result)
-           $r = mysql_fetch_array($result,MYSQL_NUM);
-         
-         if(!$session || $gameid==$r[0])
-           {
-             /* suggest a new game with the same people in it, just rotated once */
-             $names = DB_get_all_names_by_gameid($gameid);
-             output_ask_for_new_game($names[1],$names[2],$names[3],$names[0],$gameid);
-           }
        }
       break;
     default:
       myerror("error in testing the status");
     }
+    echo "</form>\n";
     output_footer();
     DB_close();
     exit();
  } 
 /* user status page */ 
- else if(myisset("email","password"))
+else if( myisset("email","password") || isset($_SESSION["name"]) )
    {
      /* test id and password, should really be done in one step */
-     $email     = $_REQUEST["email"];
-     $password  = $_REQUEST["password"];
+     if(!isset($_SESSION["name"]))
+       {
+        $email     = $_REQUEST["email"];
+        $password  = $_REQUEST["password"];
+       }
+     else
+       {
+        $name = $_SESSION["name"];
+        $email     = DB_get_email_by_name($name);
+        $password  = DB_get_passwd_by_name($name);
+       };
      
-
      if(myisset("forgot"))
        {
         $ok = 1;
@@ -1764,7 +1672,8 @@ else if(myisset("me"))
                   $ok = 1;
 
                   /* check if old password matches */
-                  if($password != md5($_REQUEST["password0"]))
+                  $oldpasswd = md5($_REQUEST["password0"]);
+                  if(!( ($password == $oldpasswd) || DB_check_recovery_passwords($oldpasswd,$email) ))
                     $ok = -1;
                   /* check if new passwords are types the same twice */
                   if($_REQUEST["password1"] != $_REQUEST["password2"] )
@@ -1789,12 +1698,18 @@ else if(myisset("me"))
             }
           else /* output default user page */
             {
-              $time = DB_get_user_timestamp($uid);
-              $unixtime =strtotime($time);
+              $time     = DB_get_user_timestamp($uid);
+              $unixtime = strtotime($time);
               
-              $offset = DB_get_user_timezone($uid);
-              $zone = return_timezone($offset);
+              $offset   = DB_get_user_timezone($uid);
+              $zone     = return_timezone($offset);
               date_default_timezone_set($zone);
+
+              $myname = DB_get_name_by_email($email);
+              $_SESSION["name"] = $myname;
+
+              if(isset($_SESSION["name"]))
+                output_status($_SESSION["name"]);
               
               /* display links to settings */
               output_user_settings($email,$password);
@@ -1809,7 +1724,7 @@ else if(myisset("me"))
                                     " WHERE Hand.user_id='$uid' AND Game.status='pre'" );
               while( $r = mysql_fetch_array($result,MYSQL_NUM))
                 {
-                  echo "<a href=\"".$host."?me=".$r[0]."\">game #".$r[1]." </a>";
+                  echo "<a href=\"".$host."?me=".$r[0]."\">game".DB_format_gameid($r[1])." </a>";
                   if($r[3]==$uid || $r[3]==NULL)
                     echo "(it's <strong>your</strong> turn)\n";
                   else
@@ -1832,7 +1747,7 @@ else if(myisset("me"))
                                     " WHERE Hand.user_id='$uid' AND Game.status='play'" );
               while( $r = mysql_fetch_array($result,MYSQL_NUM))
                 {
-                  echo "<a href=\"".$host."?me=".$r[0]."\">game #".$r[1]." </a>";
+                  echo "<a href=\"".$host."?me=".$r[0]."\">game ".DB_format_gameid($r[1])." </a>";
                   if($r[3])
                     {
                       if($r[3]==$uid)
@@ -1856,7 +1771,7 @@ else if(myisset("me"))
               $output = array();
               $result = mysql_query("SELECT hash,game_id from Hand WHERE user_id='$uid' AND status='gameover'" );
               while( $r = mysql_fetch_array($result,MYSQL_NUM))
-                $output[] = "<a href=\"".$host."?me=".$r[0]."\">#".$r[1]." </a>";
+                $output[] = "<a href=\"".$host."?me=".$r[0]."\">".DB_format_gameid($r[1])." </a>";
               echo implode(", ",$output)."</p>\n";
               
               $names = DB_get_all_names();
@@ -1869,45 +1784,13 @@ else if(myisset("me"))
         }
        else
         {
-          echo "Sorry email and password don't match <br />";
+          echo "Sorry email and password don't match. Please <a href=\"$host\">try again</a>. <br />";
         }
      };
      output_footer();
      DB_close();
      exit();
    }
-/* page for registration */
- else if(myisset("register") )
-   {
-     output_register();
-   }
-/* new user wants to register */
- else if(myisset("Rfullname","Remail","Rpassword","Rtimezone") )
-   {
-     $ok=1;
-     if(DB_get_userid_by_name($_REQUEST["Rfullname"]))
-       {
-        echo "please chose another name<br />";
-        $ok=0;
-       }
-     if(DB_get_userid_by_email($_REQUEST["Remail"]))
-       {
-        echo "this email address is already used ?!<br />";
-        $ok=0;
-       }
-     if($ok)
-       {
-        $r=mysql_query("INSERT INTO User VALUES(NULL,".DB_quote_smart($_REQUEST["Rfullname"]).
-                       ",".DB_quote_smart($_REQUEST["Remail"]).
-                       ",".DB_quote_smart(md5($_REQUEST["Rpassword"])).
-                       ",".DB_quote_smart($_REQUEST["Rtimezone"]).",NULL)"); 
-        
-        if($r)
-          echo " added you to the database";
-        else
-          echo " something went wrong";
-       }
-   }
 /* default login page */
  else
    {