BUGFIX: adding new users was broken
[e-DoKo.git] / index.php
index bae38d4c778adcc6bc72563167053b79cb9a5042..f0a8e7451d185a1a28e45021b574282073293040 100644 (file)
--- a/index.php
+++ b/index.php
 <?php
 error_reporting(E_ALL);
 
-include_once("config.php");      
+include_once("config.php");
 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(); 
-  }
+/* make sure that user has set all variables in config.php */
+config_check();
 
+/* open the database */
 if(DB_open()<0)
   {
     output_header();
     echo "Database error, can't connect... Please wait a while and try again. ".
       "If the problem doesn't go away feel free to contact $ADMIN_NAME at $ADMIN_EMAIL.";
-    output_footer(); 
-    exit(); 
+    output_footer();
+    exit();
   }
 
+/* start a session, if it is not already running.
+ * This way people don't have to log in all the times. 
+ * The session variables can also be read out from different
+ * php scripts, so that the code can be easily split up across several files
+ */
+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"))
+/* The rest of the file consists of handling user input.
+ * The user sends information via html GET and POST variables,
+ * the script checks if these are set via "myisset"
+ * which can check a list of variables.
+ */
+
+/* does the user want to log out? */
+if(myisset("logout"))
   {
-    $names = DB_get_all_names();
-    output_form_for_new_game($names);
+    /* distroy the session */
+    session_unset();
+    session_destroy();
+    $_SESSION = array();
+    
+    echo "<div class=\"message\"><span class=\"bigger\">You are now logged out!</span><br />\n".
+      "(<a href=\"$INDEX\">This will take you back to the home-page</a>)</div>";
   }
-/*check if everything is ready to set up a new game */
- else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","call" ))
+/* check if we want to start a new game */
+else if(myisset("new"))
   {
-    $PlayerA = $_REQUEST["PlayerA"];
-    $PlayerB = $_REQUEST["PlayerB"];
-    $PlayerC = $_REQUEST["PlayerC"];
-    $PlayerD = $_REQUEST["PlayerD"];
-
-    $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);
-    $EmailD  = DB_get_email_by_name($PlayerD);
-    
-    if($EmailA=="" || $EmailB=="" || $EmailC=="" || $EmailD=="")
+    output_status();
+    /* user needs to be logged in to do this */
+    if( isset($_SESSION["name"]) )
       {
-       echo "couldn't find one of the names, please start a new game";
-       output_footer();
-       DB_close();
-       exit();
+       $names = DB_get_all_names();
+       echo "<div class=\"user\">\n";
+       output_form_for_new_game($names);
+       echo "</div>\n";
+       display_user_menu();
       }
-    
-    $useridA  = DB_get_userid_by_name($PlayerA);
-    $useridB  = DB_get_userid_by_name($PlayerB);
-    $useridC  = DB_get_userid_by_name($PlayerC);
-    $useridD  = DB_get_userid_by_name($PlayerD);
-    
-    /* create random numbers */
-    $randomNR       = create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD);
-    $randomNRstring = join(":",$randomNR);
-        
-    /* create game */
-    $followup = NULL;
-    if(myisset("followup") )
+    else
       {
-       $followup= $_REQUEST["followup"];
-       $session = DB_get_session_by_gameid($followup);
-       $ruleset = DB_get_ruleset_by_gameid($followup); /* just copy ruleset from old game, 
-                                                        this way no manipulation is possible */
-       if($session)
-         mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre',".
-                     "'$ruleset','$session' ,NULL)");
-       else
-         {
-           /* get max session */
-           $max = DB_get_max_session();
-           $max++;
-           mysql_query("UPDATE Game SET session='".$max."' WHERE id=".DB_quote_smart($followup));
-           mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre',".
-                       "'$ruleset','$max' ,NULL)");
-         }
+       echo "<div class=\"message\">Please <a href=\"$INDEX\">log in</a>.</div>";
+      }
+  }
+/*check if everything is ready to set up a new game */
+else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","call" ))
+  {
+    output_status();
+    /* user needs to be logged in */
+    if( !isset($_SESSION["name"]) )
+      {
+       echo "<div class=\"message\">Please <a href=\"$INDEX\">log in</a>.</div>";
       }
     else
       {
-       /* get ruleset information or create new one */
-       $ruleset = DB_get_ruleset($dullen,$schweinchen,$call);
-       if($ruleset <0) 
+       /* get my name */
+       $name = $_SESSION["name"];
+
+       /* the names of the four players */
+       $PlayerA = $_REQUEST["PlayerA"];
+       $PlayerB = $_REQUEST["PlayerB"];
+       $PlayerC = $_REQUEST["PlayerC"];
+       $PlayerD = $_REQUEST["PlayerD"];
+
+       /* the person who sets up the game has to be one of the players */
+       if(!in_array($name,array($PlayerA,$PlayerB,$PlayerC,$PlayerD)))
          {
-           myerror("Error defining ruleset: $ruleset");
+           echo "<div class=\"message\">You need to be one of the players to start a <a href=\"$INDEX?new\">new game</a>.</div>";
            output_footer();
            DB_close();
            exit();
-         };
+         }
        
-       mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre', ".
-                 "'$ruleset',NULL ,NULL)");
+       /* what rules were selected */
+       $dullen      = $_REQUEST["dullen"];
+       $schweinchen = $_REQUEST["schweinchen"];
+       $call        = $_REQUEST["call"];
+
+       /* get the emails addresses of the players */
+       $EmailA  = DB_get_email('name',$PlayerA);
+       $EmailB  = DB_get_email('name',$PlayerB);
+       $EmailC  = DB_get_email('name',$PlayerC);
+       $EmailD  = DB_get_email('name',$PlayerD);
+
+       /* this is used to check if the player names are all ok */
+       if($EmailA=="" || $EmailB=="" || $EmailC=="" || $EmailD=="")
+         {
+           echo "couldn't find one of the names, please start a new game";
+           output_footer();
+           DB_close();
+           exit();
+         }
+
+       /* get user ids */
+       $useridA  = DB_get_userid('name',$PlayerA);
+       $useridB  = DB_get_userid('name',$PlayerB);
+       $useridC  = DB_get_userid('name',$PlayerC);
+       $useridD  = DB_get_userid('name',$PlayerD);
+
+       /* create random numbers */
+       $randomNR       = create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD);
+       $randomNRstring = join(":",$randomNR);
+
+       /* create game */
+       $followup = NULL;
+       /* is this game a follow up in an already started session? */
+       if(myisset("followup") )
+         {
+           $followup= $_REQUEST["followup"];
+           $session = DB_get_session_by_gameid($followup);
+           $ruleset = DB_get_ruleset_by_gameid($followup); /* just copy ruleset from old game,
+                                                            this way no manipulation is possible */
+
+           /* check if there is a game in pre or play mode, in that case do nothing */
+           if( DB_is_session_active($session) > 0 )
+             {
+               echo "<p class=\"message\"> There is already a game going on in session $session, you can't start a new one</p>";
+               output_footer();
+               DB_close();
+               exit();
+             }
+           else if ( DB_is_session_active($session) < 0 )
+             {
+               echo "<p class=\"message\"> ERROR: status of session $session couldn't be determined.</p>";
+               output_footer();
+               DB_close();
+               exit();
+             }
+
+           if($session)
+             mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre',".
+                         "'$ruleset','$session' ,NULL)");
+           else
+             {
+               /* get max session and start a new one */
+               $max = DB_get_max_session();
+               $max++;
+               mysql_query("UPDATE Game SET session='".$max."' WHERE id=".DB_quote_smart($followup));
+               mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre',".
+                           "'$ruleset','$max' ,NULL)");
+             }
+         }
+       else /* no follow up, start a new session */
+         {
+           /* 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 */
+       $TIME  = (string) time(); /* to avoid collisions */
+       $hashA = md5("AGameOfDoko".$game_id.$PlayerA.$EmailA.$TIME);
+       $hashB = md5("AGameOfDoko".$game_id.$PlayerB.$EmailB.$TIME);
+       $hashC = md5("AGameOfDoko".$game_id.$PlayerC.$EmailC.$TIME);
+       $hashD = md5("AGameOfDoko".$game_id.$PlayerD.$EmailD.$TIME);
+
+       /* create hands */
+       mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridA).
+                   ", ".DB_quote_smart($hashA).", 'start','1',NULL,NULL,NULL,NULL)");
+       $hand_idA = mysql_insert_id();
+       mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridB).
+                   ", ".DB_quote_smart($hashB).", 'start','2',NULL,NULL,NULL,NULL)");
+       $hand_idB = mysql_insert_id();
+       mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridC).
+                   ", ".DB_quote_smart($hashC).", 'start','3',NULL,NULL,NULL,NULL)");
+       $hand_idC = mysql_insert_id();
+       mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridD).
+                   ", ".DB_quote_smart($hashD).", 'start','4',NULL,NULL,NULL,NULL)");
+       $hand_idD = mysql_insert_id();
+
+       /* save cards */
+       for($i=0;$i<12;$i++)
+         mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idA', '".$randomNR[$i]."', 'false')");
+       for($i=12;$i<24;$i++)
+         mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idB', '".$randomNR[$i]."', 'false')");
+       for($i=24;$i<36;$i++)
+         mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idC', '".$randomNR[$i]."', 'false')");
+       for($i=36;$i<48;$i++)
+         mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idD', '".$randomNR[$i]."', 'false')");
+
+       /* send out email, TODO: check for error with email */
+       $message = "\n".
+         "you are invited to play a game of DoKo (that is to debug the program ;).\n".
+         "Place comments and bug reports here:\n".
+         "http://wiki.nubati.net/index.php?title=EmailDoko\n\n".
+         "The whole round would consist of the following players:\n".
+         "$PlayerA\n".
+         "$PlayerB\n".
+         "$PlayerC\n".
+         "$PlayerD\n\n".
+         "If you want to join this game, please follow this link:\n\n".
+         "".$HOST.$INDEX."?me=";
+
+       mymail($EmailA,"You are invited to a game of DoKo","Hello $PlayerA,\n".$message.$hashA);
+       mymail($EmailB,"You are invited to a game of DoKo","Hello $PlayerB,\n".$message.$hashB);
+       mymail($EmailC,"You are invited to a game of DoKo","Hello $PlayerC,\n".$message.$hashC);
+       mymail($EmailD,"You are invited to a game of DoKo","Hello $PlayerD,\n".$message.$hashD);
+
+       echo "<div class=\"message\">You started a new game. The emails have been sent out!</div>\n";
       }
-    $game_id = mysql_insert_id();
-    
-    /* create hash */
-    $TIME  = (string) time(); /* to avoid collisions */
-    $hashA = md5("AGameOfDoko".$game_id.$PlayerA.$EmailA.$TIME);
-    $hashB = md5("AGameOfDoko".$game_id.$PlayerB.$EmailB.$TIME);
-    $hashC = md5("AGameOfDoko".$game_id.$PlayerC.$EmailC.$TIME);
-    $hashD = md5("AGameOfDoko".$game_id.$PlayerD.$EmailD.$TIME);
-    
-    /* create hands */
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridA).
-               ", ".DB_quote_smart($hashA).", 'start','1',NULL,NULL,NULL,NULL)");
-    $hand_idA = mysql_insert_id();                                                            
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridB).
-               ", ".DB_quote_smart($hashB).", 'start','2',NULL,NULL,NULL,NULL)");
-    $hand_idB = mysql_insert_id();                                                            
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridC).
-               ", ".DB_quote_smart($hashC).", 'start','3',NULL,NULL,NULL,NULL)");
-    $hand_idC = mysql_insert_id();                                                            
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridD).
-               ", ".DB_quote_smart($hashD).", 'start','4',NULL,NULL,NULL,NULL)");
-    $hand_idD = mysql_insert_id();
-    
-    /* save cards */
-    for($i=0;$i<12;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idA', '".$randomNR[$i]."', 'false')");
-    for($i=12;$i<24;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idB', '".$randomNR[$i]."', 'false')");
-    for($i=24;$i<36;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idC', '".$randomNR[$i]."', 'false')");
-    for($i=36;$i<48;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idD', '".$randomNR[$i]."', 'false')");
-    
-    /* send out email, TODO: check for error with email */
-    $message = "\n".
-      "you are invited to play a game of DoKo (that is to debug the program ;).\n".
-      "Place comments and bug reports here:\n".
-      "http://wiki.nubati.net/index.php?title=EmailDoko\n\n".
-      "The whole round would consist of the following players:\n".
-      "$PlayerA\n".
-      "$PlayerB\n".
-      "$PlayerC\n".
-      "$PlayerD\n\n".
-      "If you want to join this game, please follow this link:\n\n".
-      "".$host."?me=";
-    
-    mymail($EmailA,"You are invited to a game of DoKo","Hello $PlayerA,\n".$message.$hashA);
-    mymail($EmailB,"You are invited to a game of DoKo","Hello $PlayerB,\n".$message.$hashB);
-    mymail($EmailC,"You are invited to a game of DoKo","Hello $PlayerC,\n".$message.$hashC);
-    mymail($EmailD,"You are invited to a game of DoKo","Hello $PlayerD,\n".$message.$hashD);
-    
-    echo "You started a new game. The emails have been sent out!";    
-  }    /* end set up a new game */
-/* cancle a game, if nothing has happend in the last N minutes */
-else if(myisset("cancle","me"))
+    /* end set up a new game */
+  }    
+/* cancel a game, if nothing has happend in the last N minutes */
+else if(myisset("cancel","me"))
   {
+    output_status();
+
     $me = $_REQUEST["me"];
-    
+
     /* test for valid ID */
-    $myid = DB_get_userid_by_hash($me);
+    $myid = DB_get_userid('hash',$me);
     if(!$myid)
       {
        echo "Can't find you in the database, please check the url.<br />\n";
-       echo "perhaps the game has been cancled, check by login in <a href=\"$host\">here</a>.";
+       echo "perhaps the game has been canceled, check by login in <a href=\"$INDEX\">here</a>.";
        output_footer();
        DB_close();
        exit();
       }
-    
+
     DB_update_user_timestamp($myid);
-    
+
     /* 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 */
+    $myname   = DB_get_name('hash',$me);
+
+    /* check if game really is old enough to be canceled */
     $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 canceled 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);
+           $To = DB_get_email('userid',$user);
+           mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled (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 canceled.<br /><br /></p>";
       }
     else
-      echo "<p>You need to wait longer before you can cancle a game...</p>\n";
+      echo "<p>You need to wait longer before you can cancel a game...</p>\n";
+  }
+/* send out a reminder */
+else if(myisset("remind","me"))
+  {
+    output_status();
+
+    $me = $_REQUEST["me"];
+
+    /* test for valid ID */
+    $myid = DB_get_userid('hash',$me);
+    if(!$myid)
+      {
+       echo "Can't find you in the database, please check the url.<br />\n";
+       echo "perhaps the game has been canceled, check by login in <a href=\"$INDEX\">here</a>.";
+       output_footer();
+       DB_close();
+       exit();
+      }
+
+    DB_update_user_timestamp($myid);
+
+    /* get some information from the DB */
+    $gameid   = DB_get_gameid_by_hash($me);
+    $myname   = DB_get_name('hash',$me);
+
+    /* check if player hasn't done anything in a while */
+    $result = mysql_query("SELECT mod_date,player,status from Game WHERE id='$gameid' " );
+    $r = mysql_fetch_array($result,MYSQL_NUM);
+    if( (time()-strtotime($r[0]) > 60*60*24*7)  && ($r[2]!='gameover') ) /* = 1 week */
+      {
+       $name = DB_get_name('userid',$r[1]);
+       $To   = DB_get_email('userid',$r[1]);
+       $userhash = DB_get_hash_from_gameid_and_userid($gameid,$r[1]);
+
+       $message = "Hello $name, \n\n".
+         "It's your turn in game ".DB_format_gameid($gameid)." \n".
+         "Actually everyone else is waiting for you for more than a week now ;)\n\n".
+         "Please visit this link now to continue: \n".
+         " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
+
+       /* make sure we don't send too  many reminders to one person */
+       if(DB_get_reminder($r[1],$gameid)>0)
+         {
+           echo "<p>An email has already been sent out.</p>\n";
+         }
+       else
+         {
+           DB_set_reminder($r[1],$gameid);
+           mymail($To,$EmailName."Reminder: game ".DB_format_gameid($gameid)." it's your turn",$message);
+
+           echo "<p style=\"background-color:red\";>Game ".DB_format_gameid($gameid).
+             ": an email has been sent out.<br /><br /></p>";
+         }
+      }
+    else
+      echo "<p>You need to wait longer before you can send out a reminder...</p>\n";
   }
 /* handle request from one specific player for one game,
  * (the hash is set on a per game base) */
 else if(myisset("me"))
   {
     $me = $_REQUEST["me"];
-    
+
     /* test for valid ID */
-    $myid = DB_get_userid_by_hash($me);
+    $myid = DB_get_userid('hash',$me);
     if(!$myid)
       {
        echo "Can't find you in the database, please check the url.<br />\n";
-       echo "perhaps the game has been cancled, check by login in <a href=\"$host\">here</a>.";
+       echo "perhaps the game has been canceled, check by login in <a href=\"$INDEX\">here</a>.";
        output_footer();
        DB_close();
        exit();
       }
+    
+    /* user might get here by clicking on the link in an email, so session might not be set */
+    if(isset($_SESSION["name"]))
+      output_status($_SESSION["name"]);
 
     /* the user had done something, update the timestamp */
     DB_update_user_timestamp($myid);
-    
+
     /* get some information from the DB */
     $gameid   = DB_get_gameid_by_hash($me);
-    $myname   = DB_get_name_by_hash($me);
+    $myname   = DB_get_name('hash',$me);
     $mystatus = DB_get_status_by_hash($me);
     $mypos    = DB_get_pos_by_hash($me);
-    $myhand   = DB_get_handid_by_hash($me);
+    $myhand   = DB_get_handid('hash',$me);
     $session  = DB_get_session_by_gameid($gameid);
 
     /* get prefs and save them */
     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 ".
@@ -271,7 +385,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);
@@ -282,17 +395,23 @@ else if(myisset("me"))
        $GT  = $gametype." ".$GT;
       }
 
-    /* display rule set for this game */
-    echo "<div class=\"ruleset\">\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;
+         }
+      };
+
+    /* put everyting in a form */
+    echo "<form action=\"index.php?me=$me\" method=\"post\">\n";
 
-    if($gamestatus != 'pre')
-      echo " Gametype: $GT <br />\n";
-    
-    echo "Rules: <br />\n";
-    echo "10ofhearts : ".$RULES["dullen"]      ."<br />\n";
-    echo "schweinchen: ".$RULES["schweinchen"] ."<br />\n";
-    echo "call:        ".$RULES["call"]        ."<br />\n";
-    echo "</div>\n";
+    /* output game */
 
     /* output extra division in case this game is part of a session */
     if($session)
@@ -304,32 +423,20 @@ else if(myisset("me"))
        foreach($hashes as $hash)
          {
            if($hash == $me)
-             echo "$i ";
-           else 
-             echo "<a href=\"".$host."?me=".$hash."\">$i</a> ";
+             echo "$i \n";
+           else
+             echo "<a href=\"".$INDEX."?me=".$hash."\">$i</a> \n";
            $i++;
          }
        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
-     * init:     check values from start,
-     *           check for sickness
+     * start:    does the player want to play?
+     * init:     check for sickness
      * check:    check for return values from init
      * poverty:  handle poverty, wait here until all player have reached this state
      *           display sickness and move on to game
@@ -341,58 +448,92 @@ else if(myisset("me"))
       case 'start':
        if( !myisset("in") )
          {
+           /* asks the player, if he wants to join the game */
            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>";
-           DB_set_hand_status_by_hash($me,'start');
-         }
-       else
-         {
+           /* check the result, if player wants to join, got next stage, else cancel game */
            if($_REQUEST["in"] == "no")
              {
                /* cancel the game */
                $message = "Hello, \n\n".
                  "the game has been canceled due to the request of one of the players.\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 canceled",$message);
+                   $To = DB_get_email('userid',$user);
+                   mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled",$message);
                  }
-               
+
                /* delete everything from the dB */
                DB_cancel_game($me);
+               break;
              }
            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";
-               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');
+               /* user wants to join the game */
+
+               /* move on to the next stage,
+                * no break statement to immediately go to the next stage
+                */
+
+               DB_set_hand_status_by_hash($me,'init');
+
+               /* check if everyone has reached this stage, send out email */
+               $userids = DB_get_all_userid_by_gameid($gameid);
+               $ok = 1;
+               foreach($userids as $user)
+                 {
+                   $userstat = DB_get_hand_status_by_userid_and_gameid($user,$gameid);
+                   if($userstat!='init')
+                     {
+                       /* whos turn is it? */
+                       DB_set_player_by_gameid($gameid,$user);
+                       $ok = 0;
+                     }
+                 };
+               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 */
+                       /*
+                       $email       = DB_get_email('position-gameid',$startplayer,$gameid);
+                       $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
+                       $who         = DB_get_userid('email',$email);
+                       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."?me=".$hash."\n\n" ;
+                       mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
+                       */
+                     }
+                 }
              }
          }
+      case 'init':
+
+       $mycards = DB_get_hand($me);
+       sort($mycards);
+
+       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";
+
+       /* move on to the next stage*/
+       DB_set_hand_status_by_hash($me,'check');
        break;
 
     case 'check':
@@ -406,94 +547,109 @@ else if(myisset("me"))
           * 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>";
+         echo "<p class=\"message\"> You need to answer the <a href=\"$INDEX?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);
-         
-         if( $_REQUEST["solo"]!="No")
+         /* check if someone selected more than one vorbehalt */
+         $Nvorbehalt = 0;
+         if($_REQUEST["solo"]!="No")       $Nvorbehalt++;
+         if($_REQUEST["wedding"] == "yes") $Nvorbehalt++;
+         if($_REQUEST["poverty"] == "yes") $Nvorbehalt++;
+         if($_REQUEST["nines"] == "yes")   $Nvorbehalt++;
+
+         if($Nvorbehalt>1)
+           {
+             echo "<p class=\"message\"> You selected more than one vorbehalt, please go back ".
+               "and answer the <a href=\"$INDEX?me=$me&in=yes\">question</a> again.</p>";
+             DB_set_hand_status_by_hash($me,'init');
+           }
+         else
            {
-             /* user wants to play a solo */
+             echo "<p class=\"message\">Processing what you selected in the last step...";
 
-             /* store the info in the user's hand info */
-             DB_set_solo_by_hash($me,$_REQUEST["solo"]);
-             DB_set_sickness_by_hash($me,"solo");
+             /* check if this sickness needs to be handled first */
+             $gametype    = DB_get_gametype_by_gameid($gameid);
+             $startplayer = DB_get_startplayer_by_gameid($gameid);
 
-             echo "<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 */
-             else
+             if( $_REQUEST["solo"]!="No")
                {
-                 /* this solo comes first 
-                  * store info in game table
-                  */
-                 DB_set_gametype_by_gameid($gameid,"solo");
-                 DB_set_startplayer_by_gameid($gameid,$mypos);
-                 DB_set_solo_by_gameid($gameid,$_REQUEST["solo"]);
-               };
-           }
-         else if($_REQUEST["wedding"] == "yes")
-           {
-             /* TODO: add silent solo somewhere*/
-             echo "Ok, you don't want to play a silent solo...wedding was chosen.<br />\n";
-             DB_set_sickness_by_hash($me,"wedding");
-           }
-         else if($_REQUEST["poverty"] == "yes")
-           {
-             echo "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";
-             DB_set_sickness_by_hash($me,"nines");
-           }
-         
-         echo " Ok, done with checking, please go to the <a href=\"$host?me=$me\">next step of the setup</a>.<br />";
-         
-         /* move on to the next stage*/
-         DB_set_hand_status_by_hash($me,'poverty');
-         
-         /* check if everyone has reached this stage, send out email */
-         $userids = DB_get_all_userid_by_gameid($gameid);
-         $ok = 1;
-         foreach($userids as $user)
-           {
-             $userstat = DB_get_hand_status_by_userid_and_gameid($user,$gameid);
-             if($userstat!='poverty' && $userstat!='play')
+                 /* user wants to play a solo */
+
+                 /* store the info in the user's hand info */
+                 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";
+
+                 if($gametype == "solo" && $startplayer<$mypos)
+                   {}/* do nothing, since someone else already is playing solo */
+                 else
+                   {
+                     /* this solo comes first
+                      * store info in game table
+                      */
+                     DB_set_gametype_by_gameid($gameid,"solo");
+                     DB_set_startplayer_by_gameid($gameid,$mypos);
+                     DB_set_solo_by_gameid($gameid,$_REQUEST["solo"]);
+                   };
+               }
+             else if($_REQUEST["wedding"] == "yes")
                {
-                 $ok = 0;
-                 DB_set_player_by_gameid($gameid,$user);
+                 /* TODO: add silent solo somewhere*/
+                 echo "Ok, you don't want to play a silent solo...wedding was chosen.<br />\n";
+                 DB_set_sickness_by_hash($me,"wedding");
                }
-           };
-         if($ok)
-           {
-             /* reset player = everyone has to do something now */
-             DB_set_player_by_gameid($gameid,NULL);
-             
+             else if($_REQUEST["poverty"] == "yes")
+               {
+                 echo "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";
+                 DB_set_sickness_by_hash($me,"nines");
+               }
+
+             echo " Ok, done with checking, please go to the <a href=\"$INDEX?me=$me\">next step of the setup</a>.</p>";
+
+             /* move on to the next stage*/
+             DB_set_hand_status_by_hash($me,'poverty');
+
+             /* check if everyone has reached this stage, send out email */
+             $userids = DB_get_all_userid_by_gameid($gameid);
+             $ok = 1;
              foreach($userids as $user)
                {
-                 $To       = DB_get_email_by_userid($user);
-                 $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);
-                 if($userhash != $me)
+                 $userstat = DB_get_hand_status_by_userid_and_gameid($user,$gameid);
+                 if($userstat!='poverty' && $userstat!='play')
                    {
-                     $message = "Everyone finish the questionary in game $gameid, ".
-                       "please visit this link now to continue: \n".
-                       " ".$host."?me=".$userhash."\n\n" ;
-                     mymail($To,$EmailName." finished setup in game $gameid",$message);
+                     $ok = 0;
+                     DB_set_player_by_gameid($gameid,$user);
                    }
                };
+             if($ok)
+               {
+                 /* reset player = everyone has to do something now */
+                 DB_set_player_by_gameid($gameid,NULL);
+
+                 foreach($userids as $user)
+                   {
+                     $To       = DB_get_email('userid',$user);
+                     $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);
+                     if($userhash != $me)
+                       {
+                         $message = "Everyone finish the questionary in game ".DB_format_gameid($gameid).", ".
+                           "please visit this link now to continue: \n".
+                           " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
+                         mymail($To,$EmailName." finished setup in game ".DB_format_gameid($gameid),$message);
+                       }
+                   };
+               };
            };
        };
-
       break;
 
     case 'poverty':
@@ -502,8 +658,9 @@ else if(myisset("me"))
        * set that one in the Game table
        * tell people about it.
        */
-      echo "<br /> Checking if someone else selected solo, nines, wedding or poverty.<br />";
-      
+      echo "<div class=\"message\">\n";
+      echo "<p> Checking if someone else selected solo, nines, wedding or poverty.</p>";
+
       /* check if everyone has reached this stage */
       $userids = DB_get_all_userid_by_gameid($gameid);
       $ok = 1;
@@ -525,7 +682,7 @@ else if(myisset("me"))
        {
          echo "Everyone has finished checking their cards, let's see what they said...<br />";
 
-         /* check what kind of game we are playing,  in case there are any solos this already 
+         /* check what kind of game we are playing,  in case there are any solos this already
           *will have the correct information in it */
          $gametype    = DB_get_gametype_by_gameid($gameid);
          $startplayer = DB_get_startplayer_by_gameid($gameid);
@@ -537,7 +694,7 @@ else if(myisset("me"))
          $solo    = 0;
          foreach($userids as $user)
            {
-             $name     = DB_get_name_by_userid($user);
+             $name     = DB_get_name('userid',$user);
              $usersick = DB_get_sickness_by_userid_and_gameid($user,$gameid);
              if($usersick == 'nines')
                {
@@ -573,22 +730,22 @@ else if(myisset("me"))
              /* 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).
+               " the game has been canceled because ".DB_get_name('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);
+                 $To = DB_get_email('userid',$user);
+                 mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled",$message);
                }
-             
+
              /* delete everything from the dB */
              DB_cancel_game($me);
-             
-             echo "The game has been canceled because ".DB_get_name_by_userid($nines).
+
+             echo "The game has been canceled because ".DB_get_name('userid',$nines).
                " has five or more nines and nobody is playing solo.\n";
              output_footer();
              DB_close();
@@ -639,16 +796,16 @@ else if(myisset("me"))
 
          /* now the gametype is set correctly (shouldn't matter that this is calculated for every user)
           * output what kind of game we have */
-         
+
          $poverty = 0;
          foreach($userids as $user)
            {
-             /* userids are sorted by position... 
+             /* userids are sorted by position...
               * so output whatever the first one has, then whatever the next one has
-              * stop when the sickness is the same as the gametype 
+              * stop when the sickness is the same as the gametype
               */
-             
-             $name     = DB_get_name_by_userid($user);
+
+             $name     = DB_get_name('userid',$user);
              $usersick = DB_get_sickness_by_userid_and_gameid($user,$gameid);
 
              if($usersick)
@@ -669,10 +826,10 @@ else if(myisset("me"))
          /* output Schweinchen in case the rules need it */
          if( $gametype != "solo")
            if($GAME["schweinchen"] && $RULES["schweinchen"]=="both" )
-             echo DB_get_name_by_hash($GAME["schweinchen-who"])." has Schweinchen. <br />";
-         
+             echo DB_get_name('hash',$GAME["schweinchen-who"])." has Schweinchen. <br />";
+
          echo "<br />\n";
-         
+
          /* finished the setup, set re/contra parties if possible, go to next stage unless there is a case of poverty*/
          switch($gametype)
            {
@@ -693,15 +850,15 @@ else if(myisset("me"))
                DB_set_party_by_hash($me,"re");
              else
                DB_set_party_by_hash($me,"contra");
-             
+
              echo "Whoever will make the first trick will be on the re team. <br />\n";
-             echo " Ok, the game can start now, please finish <a href=\"$host?me=$me\">the setup</a>.<br />";       
+             echo " Ok, the game can start now, please finish <a href=\"$INDEX?me=$me\">the setup</a>.<br />";
              DB_set_hand_status_by_hash($me,'play');
              break;
 
            case "normal":
              $hand = DB_get_all_hand($me);
-             
+
              if(in_array('3',$hand)||in_array('4',$hand))
                DB_set_party_by_hash($me,"re");
              else
@@ -711,7 +868,7 @@ else if(myisset("me"))
            case "poverty":
            case "dpoverty":
              /* check if poverty resolved (e.g. DB.Game who set to NULL)
-              *   yes? =>trump was taken, start game; break; 
+              *   yes? =>trump was taken, start game; break;
               */
              $who = DB_get_sickness_by_gameid($gameid);
              if($who<0)
@@ -719,14 +876,14 @@ else if(myisset("me"))
                  DB_set_hand_status_by_hash($me,'play');
                  break;
                };
-             
+
              if($who>9) /*= two people still have trump on the table*/
                $add = 10;
              else
                $add = 1;
 
              /* check if we are being asked now
-              *    no? display wait message, e.g. player X is asked at the moment 
+              *    no? display wait message, e.g. player X is asked at the moment
               */
              $usersick = DB_get_sickness_by_userid_and_gameid($myid,$gameid);
              if(myisset("trump") && $_REQUEST["trump"]=="no" && ($who==$mypos || $who==$mypos*10))
@@ -735,7 +892,7 @@ else if(myisset("me"))
                  /* set next player who needs to be asked */
                  $firstsick  = (string) DB_get_sickness_by_pos_and_gameid($mypos+1,$gameid);
                  $secondsick = (string) DB_get_sickness_by_pos_and_gameid($mypos+2,$gameid);
-                 
+
                  if($firstsick=="poverty")
                    {
                      if($secondsick=="poverty")
@@ -749,21 +906,22 @@ else if(myisset("me"))
                  /* email next player */
                  $who = DB_get_sickness_by_gameid($gameid);
                  if($who>9) $who = $who/10;
-                 
+
                  if($who<=4)
                    {
-                     $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
+                     $To       = DB_get_email('position-gameid',$who,$gameid);
                      $userhash = DB_get_hash_from_game_and_pos($gameid,$who);
-                     DB_set_player_by_gameid($gameid,$who);
+                     $userid   = DB_get_userid('email',$To);
+                     DB_set_player_by_gameid($gameid,$userid);
 
                      $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);
+                       " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
+                     mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
                    }
 
                  /* this user is done */
                  DB_set_hand_status_by_hash($me,'play');
-                 break;                
+                 break;
                }
              else if(myisset("trump") && !myisset("exchange") && $_REQUEST["trump"]>0 && ($who==$mypos || $who==$mypos*10))
                {
@@ -771,23 +929,22 @@ else if(myisset("me"))
                  $trump = $_REQUEST["trump"];
 
                  /* get hand id for user $trump */
-                 $userhand = DB_get_handid_by_gameid_and_userid($gameid,$trump);
+                 $userhand = DB_get_handid('gameid-userid',$gameid,$trump);
                  /* copy trump from player A to B */
                  $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><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><div>\n";
                }
              else if(myisset("trump","exchange") && $_REQUEST["trump"]>0 && ($who==$mypos || $who==$mypos*10))
                {
                  $trump    = $_REQUEST["trump"];
                  $exchange = $_REQUEST["exchange"];
-                 $userhand = DB_get_handid_by_gameid_and_userid($gameid,$trump);
+                 $userhand = DB_get_handid('gameid-userid',$gameid,$trump);
 
                  /* if exchange is set to a value>0, exchange that card back to user $trump */
                  if($exchange >0)
@@ -795,7 +952,7 @@ else if(myisset("me"))
                      $result = mysql_query("UPDATE Hand_Card SET hand_id='$userhand'".
                                            " WHERE hand_id='$myhand' AND card_id='$exchange'" );
                    };
-                 
+
                  /* if number of cards == 12, set status to play for both users */
                  $result = mysql_query("SELECT COUNT(*) FROM Hand_Card  WHERE hand_id='$myhand'" );
                  $r      = mysql_fetch_array($result,MYSQL_NUM);
@@ -808,7 +965,7 @@ else if(myisset("me"))
                    {
                      if($gametype=="poverty" || $who<9)
                        {
-                         DB_set_sickness_by_gameid($gameid,-1); /* done with poverty */                          
+                         DB_set_sickness_by_gameid($gameid,-1); /* done with poverty */
                        }
                      else /* reduce poverty count by one, that is go to single digits $who */
                        {
@@ -833,17 +990,18 @@ else if(myisset("me"))
                          $who = DB_get_sickness_by_gameid($gameid);
                          if($who<=4)
                            {
-                             $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
+                             $To       = DB_get_email('position-gameid',$who,$gameid);
                              $userhash = DB_get_hash_from_game_and_pos($gameid,$who);
-                             DB_set_player_by_gameid($gameid,$who);
+                             $userid   = DB_get_userid('email',$To);
+                             DB_set_player_by_gameid($gameid,$userid);
 
                              $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);
+                                        " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
+                             mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
                            }
                        }
-                     
+
                      /* this user is done */
                      DB_set_hand_status_by_hash($me,'play');
                      /* and so is his partner */
@@ -882,29 +1040,29 @@ 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><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";
-                     foreach($mycards as $card) 
+                     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><div>\n";
                    }
                }
              else if($who == $mypos || $who == $mypos*10)
                {
+                 echo "</div><div class=\"poverty\">\n";
                  foreach($userids as $user)
                    {
-                     $name     = DB_get_name_by_userid($user);
+                     $name     = DB_get_name('userid',$user);
                      $usersick = DB_get_sickness_by_userid_and_gameid($user,$gameid);
-                     
+
                      if($usersick=="poverty")
                        {
                          $hash    = DB_get_hash_from_gameid_and_userid($gameid,$user);
@@ -913,18 +1071,19 @@ 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><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";
-                 foreach($mycards as $card) 
+                 echo "<p class=\"mycards\">Your cards are: <br />\n";
+                 foreach($mycards as $card)
                    display_card($card,$PREF["cardset"]);
-                 echo "</p>\n";   
+                 echo "</p>\n";
                }
              else
                {
@@ -940,24 +1099,24 @@ 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 canceled 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);
+                 $To = DB_get_email('userid',$user);
+                 mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled (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 canceled.<br /><br /></p>";
              output_footer();
              DB_close();
              exit();
            }
-         
+
          /* check if all players are ready to play */
          $ok = 1;
          foreach($userids as $user)
@@ -966,45 +1125,46 @@ else if(myisset("me"))
                $ok = 0;
                DB_set_player_by_gameid($gameid,$user);
              }
-         
+
          if($ok)
            {
              /* only set this after all poverty, etc. are handled*/
              DB_set_game_status_by_gameid($gameid,'play');
-             
+
              /* email startplayer */
              $startplayer = DB_get_startplayer_by_gameid($gameid);
-             $email       = DB_get_email_by_pos_and_gameid($startplayer,$gameid);
+             $email       = DB_get_email('position-gameid',$startplayer,$gameid);
              $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
-             $who         = DB_get_userid_by_email($email);
+             $who         = DB_get_userid('email',$email);
              DB_set_player_by_gameid($gameid,$who);
-             
-             if($hash!=$me)
+
+             if($hash!=$me && DB_get_email_pref_by_hash($hash)!="emailaddict")
                {
                  /* email startplayer) */
-                 $message = "It's your turn now in game $gameid.\n".
-                   "Use this link to play a card: ".$host."?me=".$hash."\n\n" ;
-                 mymail($email,$EmailName."ready, set, go... (game $gameid) ",$message);
+                 $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
+                   "Use this link to play a card: ".$HOST.$INDEX."?me=".$hash."\n\n" ;
+                 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 />";      
+               echo " Please, <a href=\"$INDEX?me=$me\">start</a> the game.<br />";
            }
          else
-           echo "\n <br />";    
+           echo "\n <br />";
        }
+      echo "</div>\n";
       break;
     case 'play':
-    case 'gameover': 
+    case 'gameover':
       /* both entries here,  so that the tricks are visible for both.
        * in case of 'play' there is a break later that skips the last part
        */
-      
-      /* figure out what kind of game we are playing, 
+
+      /* figure out what kind of game we are playing,
        * set the global variables $CARDS["trump"],$CARDS["diamonds"],$CARDS["hearts"],
        * $CARDS["clubs"],$CARDS["spades"],$CARDS["foxes"]
        * accordingly
        */
-      
+
       $gametype = DB_get_gametype_by_gameid($gameid);
       $GT       = $gametype;
       if($gametype=="solo")
@@ -1014,167 +1174,20 @@ else if(myisset("me"))
        }
       else
        $gametype = "normal";
-      
+
       set_gametype($gametype); /* this sets the $CARDS variable */
-      
+
       /* 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')
        {
-         echo "You finished the setup, but not everyone else finished it... ".
-              "so you need to wait for the others. Just wait for the an email... <br />";
-         break; /* not sure this works... the idea is that you can 
+         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>";
+         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);
-
-         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/trumpsolo_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";
 
       /* get time from the last action of the game */
       $result  = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " );
@@ -1187,17 +1200,28 @@ else if(myisset("me"))
          {
            $comment = $_REQUEST["comment"];
            $playid = DB_get_current_playid($gameid);
-           
+
            if($comment != "")
              DB_insert_comment($comment,$playid,$myid);
-         };  
+         };
+
+      /* handle notes in case player didn't play a card, allow notes only during a game */
+      if( (!myisset("card") && $mystatus=='play')  )
+       if(myisset("note"))
+         {
+           $note = $_REQUEST["note"];
+
+           if($note != "")
+             DB_insert_note($note,$gameid,$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, ".
-                           "       GROUP_CONCAT(CONCAT('<span>',User.fullname,': ',Comment.comment,'</span>') SEPARATOR '\n' ), ".
+                           "       GROUP_CONCAT(CONCAT('<span>',User.fullname,': ',Comment.comment,'</span>')".
+                           "                    SEPARATOR '\n' ), ".
                            "       Play.create_date, ".
                            "       Hand.user_id ".
                            "FROM Trick ".
@@ -1211,35 +1235,55 @@ else if(myisset("me"))
                            "ORDER BY Trick.id, sequence  ASC");
       $trickNR   = 1;
       $lasttrick = DB_get_max_trickid($gameid);
-      
+
       $play = array(); /* needed to calculate winner later  */
-      $seq  = 1;          
-      $pos  = DB_get_startplayer_by_gameid($gameid)-1; 
+      $seq  = 1;
+      $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 $gameid: </li>\n";
-      
+      echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
+
+      /* output vorbehalte */
+      $mygametype =  DB_get_gametype_by_gameid($gameid);
+      if($mygametype != "normal") /* only show when needed */
+       {
+         echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
+           "    <div class=\"trick\" id=\"trick0\">\n";
+         $show = 1;
+         for($mypos=1;$mypos<5;$mypos++)
+           {
+             $usersick = DB_get_sickness_by_pos_and_gameid($mypos,$gameid);
+             if($usersick!=NULL)
+               {
+                 echo "      <div class=\"vorbehalt".($mypos-1)."\"> Vorbehalt <br />";
+                 if($show)
+                   echo " $usersick <br />";
+                 echo  " </div>\n";
+
+                 if($mygametype == $usersick)
+                   $show = 0;
+               }
+           }
+         echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+       }
+
+      /* output tricks */
       while($r = mysql_fetch_array($result,MYSQL_NUM))
        {
          $pos     = $r[1];
          $seq     = $r[2];
          $trick   = $r[3];
          $comment = $r[4];
-         $timeplayed = strtotime($r[5]);
          $user    = $r[6];
 
-         $offset = DB_get_user_timezone($user);
-         $zone   = return_timezone($offset);
-         date_default_timezone_set($zone);
-
          /* check if first schweinchen has been played */
-         if($r[0] == 19 || $r[0] == 20 )
+         if( $GAME["schweinchen"] && ($r[0] == 19 || $r[0] == 20) )
            $GAME["schweinchen"]++;
-         
+
          /* save card to be able to find the winner of the trick later */
-         $play[$seq] = array("card"=>$r[0],"pos"=>$pos); 
-         
+         $play[$seq] = array("card"=>$r[0],"pos"=>$pos);
+
          if($seq==1)
            {
              /* first card in a trick, output some html */
@@ -1257,36 +1301,31 @@ else if(myisset("me"))
                    "    <div class=\"trick\" id=\"trick".$trickNR."\">\n".
                    "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
                };
-             
+
              /* remember first card, so that we are able to check, what cards can be played */
              $firstcard = $r[0];
            };
-         
+
          /* display card */
          echo "      <div class=\"card".($pos-1)."\">\n";
-         
+
          /* display comments */
          if($comment!="")
            echo "        <span class=\"comment\">".$comment."</span>\n";
-         
+
          echo "        ";
          display_card($r[0],$PREF["cardset"]);
-         
+
          echo "      </div>\n"; /* end div card */
-         
+
          /* end of trick? */
          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)
        {
@@ -1299,7 +1338,7 @@ else if(myisset("me"))
          $next = $pos+1;
          if($next==5) $next = 1;
        }
-      
+
       /* my turn?, display cards as links, ask for comments*/
       if(DB_get_pos_by_hash($me) == $next)
        $myturn = 1;
@@ -1310,15 +1349,15 @@ else if(myisset("me"))
       if(myisset("card") && $myturn)
        {
          $card   = $_REQUEST["card"];
-         $handid = DB_get_handid_by_hash($me); 
-         
+         $handid = DB_get_handid('hash',$me);
+
          /* check if we have card and that we haven't played it yet*/
          /* set played in hand_card to true where hand_id and card_id*/
          $result = mysql_query("SELECT id FROM Hand_Card WHERE played='false' and ".
                                "hand_id='$handid' AND card_id=".DB_quote_smart($card));
          $r = mysql_fetch_array($result,MYSQL_NUM);
          $handcardid = $r[0];
-         
+
          if($handcardid) /* everything ok, play card  */
            {
              /* update Game timestamp */
@@ -1335,7 +1374,7 @@ else if(myisset("me"))
                $result = mysql_query("UPDATE Hand SET point_call='30'  WHERE hash='$me' ");
              if(myisset("call0")   && $_REQUEST["call0"]   == "yes" && can_call(0,$me))
                $result = mysql_query("UPDATE Hand SET point_call='0'   WHERE hash='$me' ");
-               
+
              /* mark card as played */
              mysql_query("UPDATE Hand_Card SET played='true' WHERE hand_id='$handid' AND card_id=".
                          DB_quote_smart($card));
@@ -1345,26 +1384,30 @@ else if(myisset("me"))
              $trickid  = $a[0];
              $sequence = $a[1];
              $tricknr  = $a[2];
-             
+
              $playid = DB_play_card($trickid,$handcardid,$sequence);
 
-             /* check for schweinchen */
-             if($card == 19 || $card == 20 )
+             /* check special output for schweinchen in case: 
+              * schweinchen is in the rules, a fox has been played and the gametype is correct
+              */
+             if( $GAME["schweinchen"] && 
+                 ($card == 19 || $card == 20) && 
+                 ($gametype == "normal" || $gametype == "silent"|| $gametype=="trump"))
                {
-                 $GAME["schweinchen"]++;
+                 $GAME["schweinchen"]++; // count how many have been played including this one
                  if($GAME["schweinchen"]==3 && $RULES["schweinchen"]=="second" )
                    DB_insert_comment("Schweinchen! ",$playid,$myid);
                  if($RULES["schweinchen"]=="both" )
                    DB_insert_comment("Schweinchen! ",$playid,$myid);
-                 if ($debug) 
+                 if ($debug)
                    echo "schweinchen = ".$GAME["schweinchen"]." ---<br />";
                }
 
              /* if sequence == 4 check who one in case of wedding */
-             if($sequence == 4 && $GT == "wedding") 
+             if($sequence == 4 && $GT == "wedding")
                {
                  /* is wedding resolve */
-                 $resolved = DB_get_sickness_by_gameid($gameid); 
+                 $resolved = DB_get_sickness_by_gameid($gameid);
                  if($resolved<0)
                    {
                      /* who has wedding */
@@ -1378,12 +1421,12 @@ else if(myisset("me"))
                      /* who won the trick */
                      $play     = DB_get_cards_by_trick($trickid);
                      $winner   = get_winner($play,$gametype); /* returns the position */
-                     $winnerid = DB_get_userid_by_gameid_and_position($gameid,$winner);
+                     $winnerid = DB_get_userid('gameid-position',$gameid,$winner);
                      /* is tricknr <=3 */
                      if($tricknr <=3 && $winnerid!=$whosick)
                        {
                          /* set resolved at tricknr*/
-                         $resolved = DB_set_sickness_by_gameid($gameid,$tricknr); 
+                         $resolved = DB_set_sickness_by_gameid($gameid,$tricknr);
                          /* set partner */
                          $whash = DB_get_hash_from_gameid_and_userid($gameid,$winnerid);
                          DB_set_party_by_hash($whash,"re");
@@ -1391,7 +1434,7 @@ else if(myisset("me"))
                      if($tricknr == 3 && $winnerid==$whosick)
                        {
                          /* set resolved at tricknr*/
-                         $resolved = DB_set_sickness_by_gameid($gameid,'3'); 
+                         $resolved = DB_set_sickness_by_gameid($gameid,'3');
                        }
                    }
                }
@@ -1402,6 +1445,79 @@ else if(myisset("me"))
                  $play   = DB_get_cards_by_trick($trickid);
                  $winner = get_winner($play,$gametype); /* returns the position */
 
+                 /* check if someone caught a fox */
+                 /* first check if we should account for solos at all, 
+                  * since it doesn't make sense in some games
+                  */
+                 $ok = 0; /* fox shouldn't be counted */
+                 if(DB_get_gametype_by_gameid($gameid)=="solo")
+                   {
+                     $solo = DB_get_solo_by_gameid($gameid);
+                     if($solo == "trump" || $solo == "silent")
+                       $ok = 1; /* for trump solos and silent solos, foxes are ok */
+                   }
+                 else
+                   $ok = 1; /* for all other games (not solos) foxes are ok too */
+                 
+                 if($ok==1)
+                   foreach($play as $played)
+                     {
+                       if ( $played['card']==19 || $played['card']==20 )
+                         if ($played['pos']!= $winner )
+                           {
+                             /* possible caught a fox, check party */
+                             $uid1 = DB_get_userid('gameid-position',$gameid,$winner);
+                             $uid2 = DB_get_userid('gameid-position',$gameid,$played['pos']);
+
+                             $party1 = DB_get_party_by_gameid_and_userid($gameid,$uid1);
+                             $party2 = DB_get_party_by_gameid_and_userid($gameid,$uid2);
+
+                             if($party1 != $party2)
+                               mysql_query("INSERT INTO Score".
+                                           " VALUES( NULL,NULL,$gameid,'$party1',$uid1,$uid2,'fox')");
+                           }
+                     }
+                 
+                 /* check for karlchen (jack of clubs in the last trick)*/
+                 /* same as for foxes, karlchen doesn't always make sense
+                  * check what kind of game it is and set karlchen accordingly */
+                 $ok = 1; /* default: karlchen should be accounted for */
+                 if($tricknr != 12 )
+                   $ok = 0; /* Karlchen works only in the last trick */
+                 if($ok && DB_get_gametype_by_gameid($gameid)=="solo" )
+                   {
+                     $solo = DB_get_solo_by_gameid($gameid);
+                     if($solo == "trumpless" || $solo == "jack" || $solo == "queen" )
+                       $ok = 0; /* no Karlchen in these solos */
+                   }
+                 
+                 if($ok)
+                   foreach($play as $played)
+                     if ( $played['card']==11 || $played['card']==12 )
+                       if ($played['pos'] == $winner )
+                         {
+                           /* possible caught a fox, check party */
+                           $uid1   = DB_get_userid('gameid-position',$gameid,$winner);
+                           $party1 = DB_get_party_by_gameid_and_userid($gameid,$uid1);
+
+                           mysql_query("INSERT INTO Score".
+                                       " VALUES( NULL,NULL,$gameid,'$party1',$uid1,NULL,'karlchen')");
+                         }
+                 /* check for doppelopf (>40 points)*/
+                 $points = 0;
+                 foreach($play as $played)
+                   {
+                     $points += DB_get_card_value_by_cardid($played['card']);
+                   }
+                 if($points > 39)
+                   {
+                     $uid1   = DB_get_userid('gameid-position',$gameid,$winner);
+                     $party1 = DB_get_party_by_gameid_and_userid($gameid,$uid1);
+
+                     mysql_query("INSERT INTO Score".
+                                 " VALUES( NULL,NULL,$gameid,'$party1',$uid1,NULL,'doko')");
+                   }
+
                  if($winner>0)
                    mysql_query("UPDATE Trick SET winner='$winner' WHERE id='$trickid'");
                  else
@@ -1425,35 +1541,51 @@ else if(myisset("me"))
                  $comment = $_REQUEST["comment"];
                  if($comment != "")
                    DB_insert_comment($comment,$playid,$myid);
-               };  
-             
+               };
+
+             /* check for note */
+             if(myisset("note"))
+               {
+                 $note = $_REQUEST["note"];
+                 if($note != "")
+                   DB_insert_note($note,$gameid,$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)."\">\n        ";
+
              /* display comments */
              display_card($card,$PREF["cardset"]);
              if($comment!="")
-               echo "       <br /> Your comment:<br /><span class=\"comment\">".$comment."</span>\n";
-             echo "</div>\n";
-             
+               echo "\n        <span class=\"comment\"> ".$comment."</span>\n";
+             echo "      </div>\n";
+
              /*check if we still have cards left, else set status to gameover */
              if(sizeof(DB_get_hand($me))==0)
                {
                  DB_set_hand_status_by_hash($me,'gameover');
-                 $mystatus='gameover';
+                 $mystatus = 'gameover';
                }
-             
-             /* if all players are done, set game status to game over, 
-              * get the points of the last trick and send out an email 
+
+             /* if all players are done, set game status to game over,
+              * get the points of the last trick and send out an email
               * to all players
               */
              $userids = DB_get_all_userid_by_gameid($gameid);
-             
+
              $done=1;
              foreach($userids as $user)
                if(DB_get_hand_status_by_userid_and_gameid($user,$gameid)!='gameover')
                  $done=0;
-             
+
              if($done)
                DB_set_game_status_by_gameid($gameid,"gameover");
 
@@ -1461,14 +1593,15 @@ else if(myisset("me"))
              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);
+                 $email     = DB_get_email('hash',$next_hash);
+                 $who       = DB_get_userid('email',$email);
                  DB_set_player_by_gameid($gameid,$who);
-                 
-                 $message = "A card has been played in game $gameid.\n\n".
+
+                 $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 $gameid",$message);
+                   "Use this link to play a card: ".$HOST.$INDEX."?me=".$next_hash."\n\n" ;
+                 if( DB_get_email_pref_by_uid($who)!="emailaddict" )
+                   mymail($email,$EmailName."a card has been played in game ".DB_format_gameid($gameid),$message);
                }
              else /* send out final email */
                {
@@ -1495,26 +1628,246 @@ else if(myisset("me"))
                                " WHERE Hand.game_id='$gameid'".
                                " GROUP BY Hand.party" );
                  $message .= "\nTotals:\n";
+                 $re     = 0;
+                 $contra = 0;
                  while( $r = mysql_fetch_array($result,MYSQL_NUM))
-                   $message .= "    ".$r[0]." ".$r[1]."\n";
+                   {
+                     $message .= "    ".$r[0]." ".$r[1]."\n";
+                     if($r[0] == "re")
+                       $re = $r[1];
+                     else if($r[0] == "contra")
+                       $contra = $r[1];
+                   }
+
+                 /*
+                  * save score in database
+                  *
+                  */
+
+                 /* get calls from re/contra */
+                 $call_re     = NULL;
+                 $call_contra = NULL;
+                 foreach($userids as $user)
+                   {
+                     $hash  = DB_get_hash_from_gameid_and_userid($gameid,$user);
+                     $call  = DB_get_call_by_hash($hash);
+                     $party = DB_get_party_by_hash($hash);
+
+                     if($call!=NULL)
+                       {
+                         $call = (int) $call;
+
+                         if($party=="re")
+                           {
+                             if($call_re==NULL)
+                               $call_re = $call;
+                             else if( $call < $call_re)
+                               $call_re = $call;
+                           }
+                         else if($party=="contra")
+                           {
+                             if($call_contra==NULL)
+                               $call_contra = $call;
+                             else if( $call < $call_re)
+                               $call_contra = $call;
+                           }
+                       }
+                   }
+
+                 /* figure out who one */
+                 $winning_party = NULL;
+
+                 if($call_re == NULL && $call_contra==NULL)
+                   if($re>120)
+                     $winning_party="re";
+                   else
+                     $winning_party="contra";
+                 else
+                   {
+                     if($call_re)
+                       {
+                         $offset = 120 - $call_re;
+                         if($call_re == 0)
+                           $offset--; /* since we use a > in the next equation */
+
+                         if($re > 120+$offset)
+                           $winning_party="re";
+                         else if ( $call_contra == NULL )
+                           $winning_party="contra";
+                       }
+
+                     if($call_contra)
+                       {
+                         $offset = 120 - $call_contra;
+                         if($call_contra == 0)
+                           $offset--; /* since we use a > in the next equation */
+
+                         if($contra > 120+$offset)
+                           $winning_party="contra";
+                         else if ( $call_contra == NULL )
+                           $winning_party="re";
+                       }
+                   }
+
+                 /* one point for each call of the other party in case the other party didn't win
+                  * and one point each in case the party made more than points than one of the calls
+                  */
+                 if($winning_party!="contra" && $call_contra!=NULL)
+                   {
+                     for( $p=$call_contra;$p<=120; $p+=30 )
+                       {
+                         mysql_query("INSERT INTO Score".
+                                     " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'against$p')");
+                       }
+
+                     for( $p=$call_contra; $p<120; $p+=30)
+                       {
+                         if( $re >= $p )
+                           mysql_query("INSERT INTO Score".
+                                       " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'made$p')");
+                       }
+                   }
+                 if($winning_party!="re" and $call_re!=NULL)
+                   {
+                     for( $p=$call_re;$p<=120; $p+=30 )
+                       {
+                         mysql_query("INSERT INTO Score".
+                                     " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'against$p')");
+                       }
+
+                     for( $p=$call_re; $p<120; $p+=30)
+                       {
+                         if( $contra>=$p )
+                           mysql_query("INSERT INTO Score".
+                                       " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'made$p')");
+                       }
+                   }
+
+                 /* point in case contra won */
+                 if($winning_party=="contra")
+                   {
+                     mysql_query("INSERT INTO Score".
+                                 " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'againstqueens')");
+                   }
+
+                 /* one point each for winning and each 30 points + calls */
+                 if($winning_party=="re")
+                   {
+                     foreach(array(120,150,180,210,240) as $p)
+                       {
+                         $offset = 0;
+                         if($p==240 || $call_contra!=NULL)
+                           $offset = 1;
+
+                         if($re>$p-$offset)
+                           mysql_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!=NULL && $call_re<$p+1)
+                           mysql_query("INSERT INTO Score".
+                                       " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'call$p')");
+                       }
+                   }
+                 else if( $winning_party=="contra")
+                   {
+                     foreach(array(120,150,180,210,240) as $p)
+                       {
+                         $offset = 0;
+                         if($p==240 || $call_re!=NULL)
+                           $offset = 1;
+
+                         if($contra>$p-$offset)
+                           mysql_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!=NULL && $call_contra<$p+1)
+                           mysql_query("INSERT INTO Score".
+                                       " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'call$p')");
+                       }
+                   }
+
+
+                 /* add score points to email */
+                 $message .= "\n";
+                 $Tpoint = 0;
+                 $message .= " Points Re: \n";
+                 $queryresult = mysql_query("SELECT score FROM Score ".
+                                            "  WHERE game_id=$gameid AND party='re'".
+                                            " ");
+                 while($r = mysql_fetch_array($queryresult,MYSQL_NUM) )
+                   {
+                     $message .= "   ".$r[0]."\n";
+                     $Tpoint ++;
+                   }
+                 $message .= " Points Contra: \n";
+                 $queryresult = mysql_query("SELECT score FROM Score ".
+                                            "  WHERE game_id=$gameid AND party='contra'".
+                                            " ");
+                 while($r = mysql_fetch_array($queryresult,MYSQL_NUM) )
+                   {
+                     $message .= "   ".$r[0]."\n";
+                     $Tpoint --;
+                   }
+                 $message .= " Total Points (from the Re point of view): $Tpoint\n";
+                 $message .= "\n";
+
+                 $session = DB_get_session_by_gameid($gameid);
+                 $score = generate_score_table($session);
+                 /* convert html to ascii */
+                 $score = str_replace("<div class=\"scoretable\">\n<table class=\"score\">\n <tr>\n","",$score);
+                 $score = str_replace("</table></div>\n","",$score);
+                 $score = str_replace("\n","",$score);
+                 $score = str_replace(array("<tr>","</tr>","<td>","</td>"),array("","\n","","|"),$score);
+                 $score = explode("\n",$score);
+
+                 $header = array_slice($score,0,1);
+                 $header = explode("|",$header[0]);
+                 for($i=0;$i<sizeof($header);$i++)
+                   $header[$i]=str_pad($header[$i],6," ",STR_PAD_BOTH);
+                 $header = implode("|",$header);
+                 $header.= "\n------+------+------+------+------+\n";
+                 if(sizeof($score)>5) $header.=   "                ...   \n";
+
+                 if(sizeof($score)>5) $score = array_slice($score,-5,5);
+                 for($i=0;$i<sizeof($score);$i++)
+                   {
+                     $line = explode("|",$score[$i]);
+                     for($j=0;$j<sizeof($line);$j++)
+                       $line[$j]=str_pad($line[$j],6," ",STR_PAD_LEFT);
+                     $score[$i] = implode("|",$line);
+                   }
+
+                 $score = implode("\n",$score);
+                 $score = $header.$score;
                  
+                 $message .= "Score Table:\n";
+                 $message .= $score;
+
                  /* send out final email */
                  $all = array();
 
                  foreach($userids as $user)
-                   $all[] = DB_get_email_by_userid($user);
+                   $all[] = DB_get_email('userid',$user);
                  $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);
+                     $To   = DB_get_email('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);
+
+                     $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ".
+                       $HOST.$INDEX."?me=".$hash."\n\n" ;
+                     if( DB_get_email_pref_by_uid($user) != "emailaddict" )
+                       mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 2(2)",$link);
                    }
                }
            }
@@ -1527,98 +1880,90 @@ 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".
+                "        <div class=\"score\">".$r[2]."<br /> ".$r[1]."</div>\n".
+                "      </div>\n";
+
+         echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+       }
+
+
+      echo "</ul>\n"; /* end ul tricks*/
+
+      echo "<div class=\"notes\"> Personal notes: <br />\n";
+      $notes = DB_get_notes_by_userid_and_gameid($myid,$gameid);
+      foreach($notes as $note)
+       echo "$note <hr \>\n";
+      echo "Insert note:<input name=\"note\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
+      echo "</div> \n";
       
       $mycards = DB_get_hand($me);
       $mycards = mysort($mycards,$gametype);
       echo "<div class=\"mycards\">\n";
-      
+
       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;
          if(have_suit($mycards,$firstcard))
            $followsuit = 1;
-         
-         foreach($mycards as $card) 
+
+         foreach($mycards as $card)
            {
              if($followsuit && !same_type($card,$firstcard))
                display_card($card,$PREF["cardset"]);
              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 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";
-         echo "</form>\n";
        }
       else if($mystatus=='play' )
-       {         
+       {
          echo "Your cards are: <br />\n";
-         foreach($mycards as $card) 
+         foreach($mycards as $card)
            display_card($card,$PREF["cardset"]);
-
-         echo "<form  action=\"index.php?me=$me\" method=\"post\">\n";
-         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";
-         echo "</form>\n";
-
        }
       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 "<form  action=\"index.php?me=$me\" method=\"post\">\n";
-             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";
-             echo "</form>\n";
-           }
-
          $oldcards = DB_get_all_hand($me);
          $oldcards = mysort($oldcards,$gametype);
          echo "Your cards were: <br />\n";
-         foreach($oldcards as $card) 
+         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_by_userid($user);
+
+                  $name = DB_get_name('userid',$user);
                   $oldcards = DB_get_all_hand($userhash);
                   $oldcards = mysort($oldcards,$gametype);
                   echo "$name's cards were: <br />\n";
@@ -1628,7 +1973,7 @@ else if(myisset("me"))
             };
        }
       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;
@@ -1637,27 +1982,10 @@ else if(myisset("me"))
       /* 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";
+         echo "The game is over for you.. other people still need to play though";
        }
       else
        {
-         echo "the game is over now...<br />\n";
-         
-         $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" );
-         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(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".
@@ -1666,62 +1994,143 @@ else if(myisset("me"))
                                " 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";
-         
-         $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 "  ".$r[0]." ".$r[1]."<br />\n";
+
+         $queryresult = mysql_query("SELECT timediff(mod_date,create_date) ".
+                                    " FROM Game WHERE id='$gameid'");
+         $r = mysql_fetch_array($queryresult,MYSQL_NUM);
+         echo "<p>This game took ".$r[0]." hours.</p>";
+
+         echo "<div class=\"re\">\n Points Re: <br />\n";
+         $queryresult = mysql_query("SELECT score FROM Score ".
+                                    "  WHERE game_id=$gameid AND party='re'".
+                                    " ");
+         while($r = mysql_fetch_array($queryresult,MYSQL_NUM) )
+           echo "   ".$r[0]."<br />\n";
+         echo "</div>\n";
+
+         echo "<div class=\"contra\">\n Points Contra: <br />\n";
+         $queryresult = mysql_query("SELECT score FROM Score ".
+                                    "  WHERE game_id=$gameid AND party='contra'".
+                                    " ");
+         while($r = mysql_fetch_array($queryresult,MYSQL_NUM) )
+           echo "   ".$r[0]."<br />\n";
+         echo "</div>\n";
+
+         echo "</div>\n";
+
+
        }
       break;
     default:
       myerror("error in testing the status");
     }
+    /* output left menu */
+    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 : ".$RULES["dullen"]      ."<br />\n";
+    echo "schweinchen: ".$RULES["schweinchen"] ."<br />\n";
+    echo "call:        ".$RULES["call"]        ."<br />\n";
+
+    echo "<hr />\n";
+    if($gamestatus == 'play' )
+      output_form_calls($me);
+
+    /* 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($gamestatus == 'play' || $gameend < 60*60*24*7)
+      {
+       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);
+         }
+      }
+
+    $session = DB_get_session_by_gameid($gameid);
+    $score = generate_score_table($session);
+
+    //  if(size_of($score)>30)
+      echo $score;
+
+    echo "</div>\n";
+
+    echo "</form>\n";
     output_footer();
     DB_close();
     exit();
- } 
-/* user status page */ 
- else if(myisset("email","password"))
+ }
+/* user status page */
+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('name',$name);
+        $password  = DB_get_passwd_by_name($name);
+       };
 
+     /* user has forgotten his password */
      if(myisset("forgot"))
        {
+        /* check if player is in the database */
         $ok = 1;
 
-        $uid = DB_get_userid_by_email($email);
-        if(!$uid)
+        $myid = DB_get_userid('email',$email);
+        if(!$myid)
           $ok = 0;
-        
+
         if($ok)
           {
             /* check how many entries in recovery table */
-            $number = DB_get_number_of_passwords_recovery($uid);
-            
+            $number = DB_get_number_of_passwords_recovery($myid);
+
             /* if less than N recent ones, add a new one and send out email */
             if( $number < 5 )
               {
@@ -1730,12 +2139,13 @@ else if(myisset("me"))
                   echo "N.B. You tried this already $number times during the last day and it will only work ".
                     " 5 times during a day.<br />";
                 echo "The new password will be valid for one day, make sure you reset it to something else.<br />";
-                echo "Back to the  <a href=\"$host\">main page</a>.";
-                
+                echo "Back to the  <a href=\"$INDEX\">main page</a>.";
+
+                /* create temporary password, use the fist 8 letters of a md5 hash */
                 $TIME  = (string) time(); /* to avoid collisions */
                 $hash  = md5("Anewpassword".$email.$TIME);
                 $newpw = substr($hash,1,8);
-                
+
                 $message = "Someone (hopefully you) requested a new password. \n".
                   "You can use this email and the following password: \n".
                   "   $newpw    \n".
@@ -1743,42 +2153,53 @@ else if(myisset("me"))
                   "sure you reset your password to something new. Your old password will\n".
                   " also still be valid until you set a new one\n";
                 mymail($email,$EmailName."recovery ",$message);
-                
-                DB_set_recovery_password($uid,md5($newpw));
+
+                /* we save these in the database */
+                DB_set_recovery_password($myid,md5($newpw));
               }
             else
               {
+                /* make it so that people (or a robot) can request thousands of passwords within a short time
+                 * and spam a user this way */
                 echo "Sorry you already tried 5 times during the last 24h.<br />".
                   "You need to use one of those passwords or wait to get a new one.<br />";
-                echo "Back to the <a href=\"$host\">main page</a>.";
+                echo "Back to the <a href=\"$INDEX\">main page</a>.";
               }
           }
         else
-          {
+          {/* can't find user id in the database */
+            
+            /* no email given? */
             if($email=="")
               echo "You need to give me an email address! <br />".
-                "Please try <a href=\"$host\">again</a>.";
-            else
+                "Please try <a href=\"$INDEX\">again</a>.";
+            else /* default error message */
               echo "Couldn't find a player with this email! <br />".
                 "Please contact Arun, if you think this is a mistake <br />".
-                "or else try <a href=\"$host\">again</a>.";
-          } 
+                "or else try <a href=\"$INDEX\">again</a>.";
+          }
        }
-     else 
-     {
+   else 
+     { /* normal user page */
        /* verify password and email */
        if(strlen($password)!=32)
         $password = md5($password);
-       
+
        $ok  = 1;
-       $uid = DB_get_userid_by_email_and_password($email,$password);
-       if(!$uid)
+       $myid = DB_get_userid('email-password',$email,$password);
+       if(!$myid)
         $ok = 0;
-       
+
        if($ok)
         {
-          DB_get_PREF($uid);
+          /* user information is ok */
+          $myname = DB_get_name('email',$email);
+          $_SESSION["name"] = $myname;
+          output_status();
+
+          DB_get_PREF($myid);
 
+          /* does the user want to change some preferences? */
           if(myisset("setpref"))
             {
               $setpref=$_REQUEST["setpref"];
@@ -1787,23 +2208,36 @@ else if(myisset("me"))
                 case "germancards":
                 case "englishcards":
                   $result = mysql_query("SELECT * from User_Prefs".
-                                        " WHERE user_id='$uid' AND pref_key='cardset'" );
+                                        " WHERE user_id='$myid' AND pref_key='cardset'" );
                   if( mysql_fetch_array($result,MYSQL_NUM))
                     $result = mysql_query("UPDATE User_Prefs SET value=".DB_quote_smart($setpref).
-                                          " WHERE user_id='$uid' AND pref_key='cardset'" );
+                                          " WHERE user_id='$myid' AND pref_key='cardset'" );
                   else
-                    $result = mysql_query("INSERT INTO User_Prefs VALUES(NULL,'$uid','cardset',".
+                    $result = mysql_query("INSERT INTO User_Prefs VALUES(NULL,'$myid','cardset',".
                                           DB_quote_smart($setpref).")");
                   echo "Ok, changed you preferences for the cards.\n";
                   break;
+                case "emailaddict":
+                case "emailnonaddict":
+                  $result = mysql_query("SELECT * from User_Prefs".
+                                        " WHERE user_id='$myid' AND pref_key='email'" );
+                  if( mysql_fetch_array($result,MYSQL_NUM))
+                    $result = mysql_query("UPDATE User_Prefs SET value=".DB_quote_smart($setpref).
+                                          " WHERE user_id='$myid' AND pref_key='email'" );
+                  else
+                    $result = mysql_query("INSERT INTO User_Prefs VALUES(NULL,'$myid','email',".
+                                          DB_quote_smart($setpref).")");
+                  echo "Ok, changed you preferences for sending out emails.\n";
+                  break;
                 }
             }
+          /* user wants to change his password or request a temporary one */
           else if(myisset("passwd"))
             {
               if( $_REQUEST["passwd"]=="ask" )
                 {
                   /* reset password form*/
-                  output_password_recovery($email,$password);         
+                  output_password_recovery($email,$password);
                 }
               else if($_REQUEST["passwd"]=="set")
                 {
@@ -1811,12 +2245,13 @@ 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"] )
                     $ok = -2;
-                  
+
                   switch($ok)
                     {
                     case '-2':
@@ -1828,7 +2263,7 @@ else if(myisset("me"))
                     case '1':
                       echo "Changed the password.<br />";
                       mysql_query("UPDATE User SET password='".md5($_REQUEST["password1"]).
-                                  "' WHERE id=".DB_quote_smart($uid));
+                                  "' WHERE id=".DB_quote_smart($myid));
                       break;
                     }
                   /* set password */
@@ -1836,139 +2271,116 @@ else if(myisset("me"))
             }
           else /* output default user page */
             {
-              $time     = DB_get_user_timestamp($uid);
-              $unixtime = strtotime($time);
-              
-              $offset   = DB_get_user_timezone($uid);
-              $zone     = return_timezone($offset);
-              date_default_timezone_set($zone);
-              
               /* display links to settings */
-              output_user_settings($email,$password);
-              
-              echo "last login: ".date("r",$unixtime)."<br />";
-              
-              DB_update_user_timestamp($uid);
-              
-              echo "<p>These are your games that haven't started yet:<br />\n";
-              $result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player from Hand".
-                                    " LEFT JOIN Game On Hand.game_id=Game.id".
-                                    " 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>";
-                  if($r[3]==$uid || $r[3]==NULL)
-                    echo "(it's <strong>your</strong> turn)\n";
-                  else
-                    {
-                      $name = DB_get_name_by_userid($r[3]);
-                      echo "(it's $name's turn)\n";
-                    };
-                    
-                  if(time()-strtotime($r[2]) > 60*60*24*30)
-                    echo " The game has been running for over a month.".
-                      " Do you want to cancel it? <a href=\"$host?cancle=1&amp;me=".$r[0]."\">yes</a>".
-                      " (clicking here is final and can't be restored)";
-                  echo "<br />";
-                }
+              output_user_settings();
+
+              DB_update_user_timestamp($myid);
+
+              display_user_menu();
+
+              /* display all games the user has played */
+              echo "<div class=\"user\">";
+              echo "<h4>These are all your games:</h4>\n";
+              echo "<p>Session: <br />\n";
+              echo "<span class=\"gamestatuspre\"> p </span> =  pre-game phase ";
+              echo "<span class=\"gamestatusplay\">P </span> =  game in progess ";
+              echo "<span class=\"gamestatusover\">F </span> =  game finished <br />";
               echo "</p>\n";
 
-              echo "<p>These are the games you are playing in:<br />\n";
-              $result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player from Hand".
-                                    " LEFT JOIN Game On Hand.game_id=Game.id".
-                                    " WHERE Hand.user_id='$uid' AND Game.status='play'" );
+              $output = array();
+              $result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player,Game.status from Hand".
+                                    " LEFT JOIN Game ON Game.id=Hand.game_id".
+                                    " WHERE user_id='$myid'".
+                                    " ORDER BY Game.session,Game.create_date" );
+              $gamenrold = -1;
+              echo "<table>\n <tr><td>\n";
               while( $r = mysql_fetch_array($result,MYSQL_NUM))
                 {
-                  echo "<a href=\"".$host."?me=".$r[0]."\">game #".$r[1]." </a>";
-                  if($r[3])
+                  $game = DB_format_gameid($r[1]);
+                  $gamenr = (int) $game;
+                  if($gamenrold < $gamenr)
+                    {
+                      if($gamenrold!=-1)
+                        echo "</td></tr>\n <tr> <td>$gamenr:</td><td> ";
+                      else
+                        echo "$gamenr:</td><td> ";
+                      $gamenrold = $gamenr;
+                    }
+                  if($r[4]=='pre')
                     {
-                      if($r[3]==$uid)
+                      echo "\n   <span class=\"gamestatuspre\"><a href=\"".$INDEX."?me=".$r[0]."\">p </a></span> ";
+
+                    }
+                  else if ($r[4]=='gameover')
+                    echo "\n   <span class=\"gamestatusover\"><a href=\"".$INDEX."?me=".$r[0]."\">F </a></span> ";
+                  else
+                    {
+                      echo "\n   <span class=\"gamestatusplay\"><a href=\"".$INDEX."?me=".$r[0]."\">P </a></span> ";
+                    }
+                  if($r[4] != 'gameover')
+                    {
+                      echo "</td><td>\n    ";
+                      if($r[3]==$myid || !$r[3])
                         echo "(it's <strong>your</strong> turn)\n";
                       else
                         {
-                          $name = DB_get_name_by_userid($r[3]);
+                          $name = DB_get_name('userid',$r[3]);
+                          $gameid = $r[1];
+                          if(DB_get_reminder($r[3],$gameid)==0)
+                            if(time()-strtotime($r[2]) > 60*60*24*7)
+                              echo "".
+                                "<a href=\"$INDEX?remind=1&amp;me=".$r[0]."\">Send a reminder.</a>";
                           echo "(it's $name's turn)\n";
                         };
+                      if(time()-strtotime($r[2]) > 60*60*24*30)
+                        echo "".
+                          "<a href=\"$INDEX?cancel=1&amp;me=".$r[0]."\">Cancel?</a>".
+                          " (clicking here is final and can't be restored)";
+
                     }
-                  if(time()-strtotime($r[2]) > 60*60*24*30)
-                    echo " The game has been running for over a month.".
-                      " Do you want to cancel it? <a href=\"$host?cancle=1&amp;me=".$r[0]."\">yes</a>".
-                      " (clicking here is final and can't be restored)";
-                  echo "<br />";
                 }
+              echo "</td></tr>\n</table>\n";
+
+              /* display last 5 users that have signed up to e-DoKo */
+              $names = DB_get_names_of_new_logins(5);
+              echo "<h4>New Players:</h4>\n<p>\n";
+              echo implode(", ",$names).",...\n";
               echo "</p>\n";
-              
-              
-              echo "<p>And these are your games that are already done:<br />Game: \n";
-              $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>";
-              echo implode(", ",$output)."</p>\n";
-              
-              $names = DB_get_all_names();
-              echo "<p>Registered players:<br />\n";
-              echo implode(", ",$names)."\n";
+
+              /* display last 5 users that logged on */
+              $names = DB_get_names_of_last_logins(5);
+              echo "<h4>Players last logged in:</h4>\n<p>\n";
+              echo implode(", ",$names).",...\n";
               echo "</p>\n";
               
-              echo "<p>Want to start a new game? Visit <a href=\"".$host."?new\">this page.</a></p>";
+              echo "</div>\n";
             }
         }
        else
         {
-          echo "Sorry email and password don't match. Please <a href=\"$host\">try again</a>. <br />";
+          echo "<div class=\"message\">Sorry email and password don't match. Please <a href=\"$INDEX\">try again</a>. </div>";
         }
      };
      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, couldn't add you to the database, please contact $ADMIN_NAME at $ADMIN_EMAIL.";
-       }
-   }
 /* default login page */
  else
-   { 
+   {
+     /* this outputs the default home page with some extra statistics on it */
+
      $pre[0]=0;$game[0]=0;$done[0]=0;
      $r=mysql_query("SELECT COUNT(id) FROM Game GROUP BY status");
      if($r) {
-       $pre  = mysql_fetch_array($r,MYSQL_NUM);     
-       $game = mysql_fetch_array($r,MYSQL_NUM);     
-       $done = mysql_fetch_array($r,MYSQL_NUM);     
+       $pre  = mysql_fetch_array($r,MYSQL_NUM);
+       $game = mysql_fetch_array($r,MYSQL_NUM);
+       $done = mysql_fetch_array($r,MYSQL_NUM);
      }
 
      $r=mysql_query("SELECT AVG(datediff(mod_date,create_date)) FROM Game where status='gameover' ");
      if($r)
-       $avgage= mysql_fetch_array($r,MYSQL_NUM);     
+       $avgage= mysql_fetch_array($r,MYSQL_NUM);
      else
        $avgage[0]=0;
 
@@ -1980,7 +2392,7 @@ output_footer();
 DB_close();
 
 /*
- *Local Variables: 
+ *Local Variables:
  *mode: php
  *mode: hs-minor
  *End: