X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=index.php;h=7ca77d6947428efa631e6c73ca23cb7a60529a5c;hp=a41158e854355455776b1fafe3795fb1a80493f8;hb=a7ab5e63c5558a72d5ca56f96b406dc41108cce9;hpb=67d441a0c134060e61f840d955b370145d1ac328

diff --git a/index.php b/index.php
index a41158e..7ca77d6 100644
--- a/index.php
+++ b/index.php
@@ -6,41 +6,7 @@ include_once("output.php");      /* html output only */
 include_once("db.php");          /* database only */
 include_once("functions.php");   /* the rest */
 
-/* check if some variables are set in the config file, else set defaults */
-if(!isset($EmailName))
-     $EmailName="[DoKo] ";
-if(isset($EMAIL_REPLY))
-  {
-    ini_set("sendmail_from",$EMAIL_REPLY);
-  }
-if(!isset($ADMIN_NAME))
-  {
-    output_header();
-    echo "<h1>Setup not completed</h1>";
-    echo "You need to set \$ADMIN_NAME in config.php.";
-    output_footer(); 
-    exit(); 
-  }    
-if(!isset($ADMIN_EMAIL))
-  {
-    output_header();
-    echo "<h1>Setup not completed</h1>";
-    echo "You need to set \$ADMIN_EMAIL in config.php. ".
-      "If something goes wrong an email will send to this address.";
-    output_footer(); 
-    exit(); 
-  }
-
-/* in case work has to be done on the database or other section we can
- * shut down the server and tell people to come back later 
- */
-if(0) 
-  {
-    output_header();
-    echo "Working on the database...please check back in a few mintues"; 
-    output_footer(); 
-    exit(); 
-  }
+config_check();
 
 if(DB_open()<0)
   {
@@ -51,14 +17,31 @@ if(DB_open()<0)
     exit(); 
   }
 
+/* start a session, if it is not already running */
+session_start();
+
 /* done major error checking, output header of HTML page */
 output_header();
 
 /* check if we want to start a new game */
-if(myisset("new"))
+if(myisset("logout"))
   {
-    $names = DB_get_all_names();
-    output_form_for_new_game($names);
+    session_unset();
+    session_destroy();
+    $_SESSION = array();
+    echo "you are now logged out!";
+  }
+else if(myisset("new"))
+  {
+    if( isset($_SESSION["name"]) )
+      {
+	$names = DB_get_all_names();
+	output_form_for_new_game($names);
+      }
+    else
+      {
+	echo "Please log in.";
+      }
   }
 /*check if everything is ready to set up a new game */
  else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","call" ))
@@ -102,6 +85,23 @@ if(myisset("new"))
 	$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)");
@@ -126,9 +126,12 @@ if(myisset("new"))
 	    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',NULL ,NULL)");
+		  "'$ruleset','$max' ,NULL)");
       }
     $game_id = mysql_insert_id();
     
@@ -204,30 +207,82 @@ else if(myisset("cancle","me"))
     /* get some information from the DB */
     $gameid   = DB_get_gameid_by_hash($me);
     $myname   = DB_get_name_by_hash($me);
-    
+
     /* check if game really is old enough */
     $result = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " );
     $r = mysql_fetch_array($result,MYSQL_NUM);
     if(time()-strtotime($r[0]) > 60*60*24*30) /* = 1 month */
       {
 	$message = "Hello, \n\n".
-	  "Game $gameid has been cancled since nothing happend for a while and $myname requested it.\n";
+	  "Game ".DB_format_gameid($gameid)." has been cancled since nothing happend for a while and $myname requested it.\n";
 	
 	$userids = DB_get_all_userid_by_gameid($gameid);
 	foreach($userids as $user)
 	  {
 	    $To = DB_get_email_by_userid($user);
-	    mymail($To,$EmailName."game $gameid cancled (timed out)",$message);
+	    mymail($To,$EmailName."game ".DB_format_gameid($gameid)." cancled (timed out)",$message);
 	  }
 	
 	/* delete everything from the dB */
 	DB_cancel_game($me);
 	
-	echo "<p style=\"background-color:red\";>Game $gameid has been cancled.<br /><br /></p>";
+	echo "<p style=\"background-color:red\";>Game ".DB_format_gameid($gameid)." has been cancled.<br /><br /></p>";
       }
     else
       echo "<p>You need to wait longer before you can cancle a game...</p>\n";
   }
+/* send out a reminder */
+else if(myisset("remind","me"))
+  {
+    $me = $_REQUEST["me"];
+    
+    /* test for valid ID */
+    $myid = DB_get_userid_by_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>.";
+	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 */
+    $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_by_userid($r[1]);
+	$To = DB_get_email_by_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."?me=".$userhash."\n\n" ;
+	
+	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"))
@@ -245,6 +300,9 @@ else if(myisset("me"))
 	exit();
       }
 
+    if(isset($_SESSION["name"]))
+      output_status($_SESSION["name"]);
+
     /* the user had done something, update the timestamp */
     DB_update_user_timestamp($myid);
     
@@ -260,7 +318,6 @@ else if(myisset("me"))
     DB_get_PREF($myid);
     /* end set pref */
       
-      
     /* get rule set for this game */
     $result = mysql_query("SELECT * FROM Rulesets".
 			  " LEFT JOIN Game ON Game.ruleset=Rulesets.id ".
@@ -271,7 +328,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);
@@ -281,18 +337,24 @@ else if(myisset("me"))
 	$gametype = DB_get_solo_by_gameid($gameid);
 	$GT  = $gametype." ".$GT;
       }
+    
+    /* does anyone have both foxes */
+    $GAME["schweinchen"]=0; 
+    for($i=1;$i<5;$i++)
+      {
+	$hash  = DB_get_hash_from_game_and_pos($gameid,$i);
+	$cards = DB_get_all_hand($hash);
+	if( in_array("19",$cards) && in_array("20",$cards) )
+	  {
+	    $GAME["schweinchen"]=1;
+	    $GAME["schweinchen-who"]=$hash;
+	  }
+      };
 
-    /* display rule set for this game */
-    echo "<div class=\"ruleset\">\n";
+    /* 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,27 +366,16 @@ else if(myisset("me"))
 	foreach($hashes as $hash)
 	  {
 	    if($hash == $me)
-	      echo "$i ";
+	      echo "$i \n";
 	    else 
-	      echo "<a href=\"".$host."?me=".$hash."\">$i</a> ";
+	      echo "<a href=\"".$host."?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
@@ -355,7 +406,7 @@ else if(myisset("me"))
 	 */
 	if( !myisset("in") )
 	  {
-	    echo "<p> You need to answer the <a href=\"$host?me=$me\">question</a>.</p>";
+	    echo "<p class=\"message\"> You need to answer the <a href=\"$host?me=$me\">question</a>.</p>";
 	    DB_set_hand_status_by_hash($me,'start');
 	  }
 	else
@@ -370,7 +421,7 @@ else if(myisset("me"))
 		foreach($userids as $user)
 		  {
 		    $To = DB_get_email_by_userid($user);
-		    mymail($To,$EmailName."game $gameid canceled",$message);
+		    mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled",$message);
 		  }
 		
 		/* delete everything from the dB */
@@ -378,17 +429,16 @@ else if(myisset("me"))
 	      }
 	    else
 	      {
-		echo "Thanks for joining the game...";
-		
 		$mycards = DB_get_hand($me);
 		sort($mycards);
-		echo "<p class=\"mycards\" style=\"margin-top:8em;\">your cards are: <br />\n";
+
+		output_check_for_sickness($me,$mycards);
+		
+		echo "<p class=\"mycards\">your cards are: <br />\n";
 		foreach($mycards as $card) 
 		  display_card($card,$PREF["cardset"]);
 		echo "</p>\n";   
 		
-		output_check_for_sickness($me,$mycards);
-		
 		/* move on to the next stage*/
 		DB_set_hand_status_by_hash($me,'check');
 	      }
@@ -406,94 +456,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=\"$host?me=$me&in=yes\">questions</a>.</p>";
 	  DB_set_hand_status_by_hash($me,'init');
 	}
       else
 	{
-	  echo "Processing what you selected in the last step...<br />";
-      
-	  /* check if this sickness needs to be handled first */
-	  $gametype    = DB_get_gametype_by_gameid($gameid);
-	  $startplayer = DB_get_startplayer_by_gameid($gameid);
-	  
-	  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=\"$host?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=\"$host?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_by_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."?me=".$userhash."\n\n" ;
+			  mymail($To,$EmailName." finished setup in game ".DB_format_gameid($gameid),$message);
+			}
+		    };
+		};
 	    };
 	};
-
       break;
 
     case 'poverty':
@@ -502,7 +567,8 @@ 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);
@@ -582,7 +648,7 @@ else if(myisset("me"))
 	      foreach($userids as $user)
 		{
 		  $To = DB_get_email_by_userid($user);
-		  mymail($To,$EmailName."game $gameid canceled",$message);
+		  mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled",$message);
 		}
 	      
 	      /* delete everything from the dB */
@@ -758,7 +824,7 @@ else if(myisset("me"))
 
 		      $message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
 			" ".$host."?me=".$userhash."\n\n" ;
-		      mymail($To,$EmailName." poverty (game $gameid)",$message);
+		      mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
 		    }
 
 		  /* this user is done */
@@ -776,12 +842,11 @@ else if(myisset("me"))
 		  $result = mysql_query("UPDATE Hand_Card SET hand_id='$myhand' WHERE hand_id='$userhand' AND card_id<'27'" );
 		  
 		  /* add hidden button with trump in it to get to the next point */
-		  echo "<form action=\"index.php\" method=\"post\">\n";
+		  echo "</div><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))
 		{
@@ -840,7 +905,7 @@ else if(myisset("me"))
 			      $message = "Someone has poverty, it's your turn to decide, ".
 				         "if you want to take the trump. Please visit:".
 				         " ".$host."?me=".$userhash."\n\n" ;
-			      mymail($To,$EmailName." poverty (game $gameid)",$message);
+			      mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
 			    }
 			}
 		      
@@ -882,24 +947,24 @@ else if(myisset("me"))
 		  else
 		    {
 		      /* else show all trump, have lowest card pre-selected, have hidden setting for */
-		      echo "you need to get rid of a few cards<br />\n";
+		      echo "</div><div class=\"poverty\"> you need to get rid of a few cards</div>\n";
 		      
 		      set_gametype($gametype); /* this sets the $CARDS variable */
 		      $mycards = DB_get_hand($me);
 		      $mycards = mysort($mycards,$gametype);
 
-		      echo "<form class=\"exchange\" action=\"index.php\" method=\"post\">\n";
 		      $type="exchange";
+		      echo "<div class=\"mycards\">Your cards are: <br />\n";
 		      foreach($mycards as $card) 
 			display_link_card($card,$PREF["cardset"],$type);
 		      echo "  <input type=\"hidden\" name=\"trump\" value=\"".$trump."\" />\n";
-		      echo "  <input type=\"hidden\" name=\"me\" value=\"".$me."\" />\n";
 		      echo "  <input type=\"submit\" class=\"submitbutton\" value=\"select one card to give back\" />\n";
-		      echo "</form>\n";
+		      echo "</div><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);
@@ -913,15 +978,16 @@ else if(myisset("me"))
 			  /* count trump */
 			  if($nrtrump<4)
 			    echo "Player $name has $nrtrump trump. Do you want to take them?".
-			      "<a href=\"index.php?me=$me&amp;trump=$user\">yes</a> <br />";
+			      "<a href=\"index.php?me=$me&amp;trump=$user\">yes</a> <br />\n";
 			}
 		    }
-		  echo "<a href=\"index.php?me=$me&amp;trump=no\">No,way I take those trump...</a> <br />";
-
+		  echo "<a href=\"index.php?me=$me&amp;trump=no\">No,way I take those trump...</a> <br />\n";
+		  echo "</div><div>\n";
+		  
 		  echo "Your cards are: <br />\n";
 		  $mycards = DB_get_hand($me);
 		  sort($mycards);
-		  echo "<p class=\"mycards\" style=\"margin-top:8em;\">your cards are: <br />\n";
+		  echo "<p class=\"mycards\">your cards are: <br />\n";
 		  foreach($mycards as $card) 
 		    display_card($card,$PREF["cardset"]);
 		  echo "</p>\n";   
@@ -940,19 +1006,19 @@ else if(myisset("me"))
 	  if($who==5 || $who==50)
 	    {
 	      $message = "Hello, \n\n".
-		"Game $gameid has been cancled since nobody wanted to take the trump.\n";
+		"Game ".DB_format_gameid($gameid)." has been cancled since nobody wanted to take the trump.\n";
 	      
 	      $userids = DB_get_all_userid_by_gameid($gameid);
 	      foreach($userids as $user)
 		{
 		  $To = DB_get_email_by_userid($user);
-		  mymail($To,$EmailName."game $gameid cancled (poverty not resolved)",$message);
+		  mymail($To,$EmailName."game ".DB_format_gameid($gameid)." cancled (poverty not resolved)",$message);
 		}
 	      
 	      /* delete everything from the dB */
 	      DB_cancel_game($me);
 	      
-	      echo "<p style=\"background-color:red\";>Game $gameid has been cancled.<br /><br /></p>";
+	      echo "<p style=\"background-color:red\";>Game ".DB_format_gameid($gameid)." has been cancled.<br /><br /></p>";
 	      output_footer();
 	      DB_close();
 	      exit();
@@ -982,9 +1048,9 @@ else if(myisset("me"))
 	      if($hash!=$me)
 		{
 		  /* email startplayer) */
-		  $message = "It's your turn now in game $gameid.\n".
+		  $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
 		    "Use this link to play a card: ".$host."?me=".$hash."\n\n" ;
-		  mymail($email,$EmailName."ready, set, go... (game $gameid) ",$message);
+		  mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
 		}
 	      else
 		echo " Please, <a href=\"$host?me=$me\">start</a> the game.<br />";	 
@@ -992,6 +1058,7 @@ else if(myisset("me"))
 	  else
 	    echo "\n <br />";	 
 	}
+      echo "</div>\n";
       break;
     case 'play':
     case 'gameover': 
@@ -1020,161 +1087,14 @@ else if(myisset("me"))
       /* get some infos about the game */
       $gamestatus = DB_get_game_status_by_gameid($gameid);
       
-      /* display useful things in divs */
-      
-      /* display links to the users status page */
-      $result = mysql_query("SELECT email,password from User WHERE id='$myid'" );
-      $r      = mysql_fetch_array($result,MYSQL_NUM);
-      
-      display_links($r[0],$r[1]);
-      
-      /* end display useful things*/
-      
       /* has the game started? No, then just wait here...*/
       if($gamestatus == 'pre')
 	{
-	  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 />";
+	  echo "<p class=\"message\"> You finished the setup, but not everyone else finished it... ".
+	       "so you need to wait for the others. Just wait for the 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' " );
@@ -1218,7 +1138,7 @@ else if(myisset("me"))
       $firstcard = ""; /* first card in a trick */
       
       echo "\n<ul class=\"tricks\">\n";
-      echo "  <li class=\"nohighlight\"> Game $gameid: </li>\n";
+      echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
       
       while($r = mysql_fetch_array($result,MYSQL_NUM))
 	{
@@ -1234,7 +1154,7 @@ else if(myisset("me"))
 	  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 */
@@ -1278,15 +1198,10 @@ else if(myisset("me"))
 	  if($seq==4)
 	    {
 	      $trickNR++;
-	      echo "    </div>\n  </li>\n";  /* end div table, end li table */
+	      echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
 	    }
 	}
-      
-      if($seq!=4 && $trickNR>1) 
-	echo "    </div>\n  </li>\n";  /* end div table, end li table */
-      
-      echo "</ul>\n";
-      
+            
       /* whos turn is it? */
       if($seq==4)
 	{
@@ -1349,9 +1264,9 @@ else if(myisset("me"))
 	      $playid = DB_play_card($trickid,$handcardid,$sequence);
 
 	      /* check for schweinchen */
-	      if($card == 19 || $card == 20 )
+	      if($GAME["schweinchen"] && ($card == 19 || $card == 20) )
 		{
-		  $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" )
@@ -1428,13 +1343,20 @@ else if(myisset("me"))
 		};  
 	      
 	      /* display played card */
-	      echo "<div class=\"card\">";
-	      echo " you played  <br />";
+	      $pos = DB_get_pos_by_hash($me);
+	      if($sequence==1)
+		{
+		  echo "  <li onclick=\"hl('".($tricknr)."');\" class=\"current\"><a href=\"#\">Trick ".($tricknr)."</a>\n".
+		    "    <div class=\"trick\" id=\"trick".($tricknr)."\">\n".
+		    "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
+		}
+	      
+	      echo "<div class=\"card".($pos-1)."\">";
 	      /* display comments */
 	      display_card($card,$PREF["cardset"]);
 	      if($comment!="")
-		echo "       <br /> Your comment:<br /><span class=\"comment\">".$comment."</span>\n";
-	      echo "</div>\n";
+		echo "  <span class=\"comment\"> ".$comment."</span>\n";
+	      echo "</div></div></li>\n";
 	      
 	      /*check if we still have cards left, else set status to gameover */
 	      if(sizeof(DB_get_hand($me))==0)
@@ -1465,10 +1387,10 @@ else if(myisset("me"))
 		  $who       = DB_get_userid_by_email($email);
 		  DB_set_player_by_gameid($gameid,$who);
 		  
-		  $message = "A card has been played in game $gameid.\n\n".
+		  $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);
+		  mymail($email,$EmailName."a card has been played in game ".DB_format_gameid($gameid),$message);
 		}
 	      else /* send out final email */
 		{
@@ -1506,15 +1428,15 @@ else if(myisset("me"))
 		  $To = implode(",",$all);
 
 		  $help = "\n\n (you can use reply all on this email to reach all the players.)\n";
-		  mymail($To,$EmailName."game over (game $gameid) part 1(2)",$message.$help);
+		  mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 1(2)",$message.$help);
 
 		  foreach($userids as $user)
 		    {
 		      $To   = DB_get_email_by_userid($user);
 		      $hash = DB_get_hash_from_gameid_and_userid($gameid,$user);
 		      
-		      $link = "Use this link to have a look at game $gameid: ".$host."?me=".$hash."\n\n" ;
-		      mymail($To,$EmailName."game over (game $gameid) part 2(2)",$link);
+		      $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ".$host."?me=".$hash."\n\n" ;
+		      mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 2(2)",$link);
 		    }
 		}
 	    }
@@ -1527,16 +1449,45 @@ else if(myisset("me"))
 	{
 	  echo "please wait until it's your turn! <br />\n";
 	}
+
+      if($seq!=4 && $trickNR>1) 
+	echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+
+      /* display points in case game is over */
+      if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' )
+	{
+	  echo "  <li onclick=\"hl('13');\" class=\"current\"><a href=\"#\">Score</a>\n".
+	    "    <div class=\"trick\" id=\"trick13\">\n";
+	  /* add pic for re/contra
+	   "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";*/
+	  
+	  $result = mysql_query("SELECT User.fullname, IFNULL(SUM(Card.points),0), Hand.party,Hand.position FROM Hand".
+				" LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
+				" LEFT JOIN User ON User.id=Hand.user_id".
+				" LEFT JOIN Play ON Trick.id=Play.trick_id".
+				" LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
+				" LEFT JOIN Card ON Card.id=Hand_Card.card_id".
+				" WHERE Hand.game_id='$gameid'".
+				" GROUP BY User.fullname" );
+	  while( $r = mysql_fetch_array($result,MYSQL_NUM))
+	    echo "      <div class=\"card".($r[3]-1)."\">\n".
+	         "        <span class=\"score\">".$r[2]."<br /> ".$r[1]."</span>\n".
+	         "      </div>\n";
+	  
+	  echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+	}
+
+      
+      echo "</ul>\n"; /* end ul tricks*/
       
       $mycards = DB_get_hand($me);
       $mycards = mysort($mycards,$gametype);
       echo "<div class=\"mycards\">\n";
       
-      if($myturn && !myisset("card"))
+      if($myturn && !myisset("card") && $mystatus=='play' )
 	{
 	  echo "Hello ".$myname.", it's your turn!  <br />\n";
 	  echo "Your cards are: <br />\n";
-	  echo "<form  action=\"index.php?me=$me\" method=\"post\">\n";
 	  
 	  /* do we have to follow suite? */
 	  $followsuit = 0;
@@ -1550,59 +1501,15 @@ else if(myisset("me"))
 	      else
 		display_link_card($card,$PREF["cardset"]);
 	    }
-	  
-	  if( can_call(120,$me) )
-	      echo " re/contra (120):".
-		" <input type=\"radio\" name=\"call120\" value=\"yes\" /> ";
-	  if( can_call(90,$me) )
-	      echo " 90:".
-		" <input type=\"radio\" name=\"call90\" value=\"yes\" /> ";
-	  if( can_call(60,$me) )
-	      echo " 60:".
-		" <input type=\"radio\" name=\"call60\" value=\"yes\" /> ";
-	  if( can_call(30,$me) )
-	      echo " 30:".
-		" <input type=\"radio\" name=\"call30\" value=\"yes\" /> ";
-	  if( can_call(0,$me) )
-	      echo " 0:".
-		" <input type=\"radio\" name=\"call0\" value=\"yes\" /> ".
-		" no call:".
-		" <input type=\"radio\" name=\"call0\" value=\"no\" /> ";
-
-	  echo "<br />\nA short 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) 
 	    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";
@@ -1641,23 +1548,6 @@ else if(myisset("me"))
 	}
       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,61 +1556,112 @@ 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";
+	    echo "  ".$r[0]." ".$r[1]."<br />\n";
+	  echo "</div>\n";
 	  
-	  $session = DB_get_session_by_gameid($gameid);
-	  $result  = mysql_query("SELECT id,create_date FROM Game".
-				 " WHERE session=$session".
-				 " ORDER BY create_date DESC".
-				 " LIMIT 1");
-	  $r = -1;
-	  if($result)
-	    $r = mysql_fetch_array($result,MYSQL_NUM);
-	  
-	  if(!$session || $gameid==$r[0])
-	    {
-	      /* suggest a new game with the same people in it, just rotated once (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);
-	    }
 	}
       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);
+	  }
+      }
+
+    echo "</div>\n";
+
+
+    echo "</form>\n";
     output_footer();
     DB_close();
     exit();
  } 
 /* user status page */ 
- else if(myisset("email","password"))
+else if( myisset("email","password") || isset($_SESSION["name"]) )
    {
      /* test id and password, should really be done in one step */
-     $email     = $_REQUEST["email"];
-     $password  = $_REQUEST["password"];
+     if(!isset($_SESSION["name"]))
+       {
+	 $email     = $_REQUEST["email"];
+	 $password  = $_REQUEST["password"];
+       }
+     else
+       {
+	 $name = $_SESSION["name"];
+	 $email     = DB_get_email_by_name($name);
+	 $password  = DB_get_passwd_by_name($name);
+       };
      
-
      if(myisset("forgot"))
        {
 	 $ok = 1;
 
-	 $uid = DB_get_userid_by_email($email);
-	 if(!$uid)
+	 $myid = DB_get_userid_by_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 )
@@ -1744,7 +1685,7 @@ else if(myisset("me"))
 		   " also still be valid until you set a new one\n";
 		 mymail($email,$EmailName."recovery ",$message);
 		 
-		 DB_set_recovery_password($uid,md5($newpw));
+		 DB_set_recovery_password($myid,md5($newpw));
 	       }
 	     else
 	       {
@@ -1771,13 +1712,13 @@ else if(myisset("me"))
 	 $password = md5($password);
        
        $ok  = 1;
-       $uid = DB_get_userid_by_email_and_password($email,$password);
-       if(!$uid)
+       $myid = DB_get_userid_by_email_and_password($email,$password);
+       if(!$myid)
 	 $ok = 0;
        
        if($ok)
 	 {
-	   DB_get_PREF($uid);
+	   DB_get_PREF($myid);
 
 	   if(myisset("setpref"))
 	     {
@@ -1787,12 +1728,12 @@ 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;
@@ -1811,7 +1752,8 @@ else if(myisset("me"))
 		   $ok = 1;
 
 		   /* check if old password matches */
-		   if($password != md5($_REQUEST["password0"]))
+		   $oldpasswd = md5($_REQUEST["password0"]);
+		   if(!( ($password == $oldpasswd) || DB_check_recovery_passwords($oldpasswd,$email) ))
 		     $ok = -1;
 		   /* check if new passwords are types the same twice */
 		   if($_REQUEST["password1"] != $_REQUEST["password2"] )
@@ -1828,7 +1770,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,82 +1778,96 @@ else if(myisset("me"))
 	     }
 	   else /* output default user page */
 	     {
-	       $time     = DB_get_user_timestamp($uid);
+	       $time     = DB_get_user_timestamp($myid);
 	       $unixtime = strtotime($time);
 	       
-	       $offset   = DB_get_user_timezone($uid);
+	       $offset   = DB_get_user_timezone($myid);
 	       $zone     = return_timezone($offset);
 	       date_default_timezone_set($zone);
+
+	       $myname = DB_get_name_by_email($email);
+	       $_SESSION["name"] = $myname;
+
+	       if(isset($_SESSION["name"]))
+		 output_status($_SESSION["name"]);
 	       
 	       /* display links to settings */
 	       output_user_settings($email,$password);
 	       
-	       echo "last login: ".date("r",$unixtime)."<br />";
+	       echo "<div style=\"position:absolute; font-size:smaller; top:0; left:0; \">last login: ".date("r",$unixtime)."</div>";
 	       
-	       DB_update_user_timestamp($uid);
+	       DB_update_user_timestamp($myid);
+	     
+	       display_user_menu();
+  
+	       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 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'" );
+	       $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]==$uid || $r[3]==NULL)
-		     echo "(it's <strong>your</strong> turn)\n";
-		   else
+		   $game = DB_format_gameid($r[1]);
+		   $gamenr = (int) $game;
+		   if($gamenrold < $gamenr)
 		     {
-		       $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 />";
-		 }
-	       echo "</p>\n";
+		       if($gamenrold!=-1)
+			 echo "</td></tr>\n <tr> <td>$gamenr:</td><td> ";
+		       else
+			 echo "$gamenr:</td><td> ";
+		       $gamenrold = $gamenr;
+		     }
+		   if($r[4]=='pre')
+		     {
+		       echo "\n   <span class=\"gamestatuspre\"><a href=\"".$host."?me=".$r[0]."\">p </a></span> ";
 
-	       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'" );
-	       while( $r = mysql_fetch_array($result,MYSQL_NUM))
-		 {
-		   echo "<a href=\"".$host."?me=".$r[0]."\">game #".$r[1]." </a>";
-		   if($r[3])
+		     }
+		   else if ($r[4]=='gameover')
+		     echo "\n   <span class=\"gamestatusover\"><a href=\"".$host."?me=".$r[0]."\">F </a></span> ";
+		   else
 		     {
-		       if($r[3]==$uid)
-			 echo "(it's <strong>your</strong> turn)\n";
-		       else
+		       echo "\n   <span class=\"gamestatusplay\"><a href=\"".$host."?me=".$r[0]."\">P </a></span> ";
+		     }
+		   if($r[4] != 'gameover')
+		     {
+		       echo "</td><td>\n    ";
+		       if($r[3])
 			 {
-			   $name = DB_get_name_by_userid($r[3]);
-			   echo "(it's $name's turn)\n";
-			 };
+			   if($r[3]==$myid)
+			     echo "(it's <strong>your</strong> turn)\n";
+			   else
+			     {
+			       $name = DB_get_name_by_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=\"$host?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=\"$host?cancle=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 "</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";
-	       
+	       echo "</td></tr>\n</table>\n";
 	       $names = DB_get_all_names();
-	       echo "<p>Registered players:<br />\n";
+	       echo "<h4>Registered players:</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 "</p>\n</div>";
 	     }
 	 }
        else
@@ -1923,38 +1879,6 @@ else if(myisset("me"))
      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
    {