LAYOUT: moved more text during the setup into the middle
[e-DoKo.git] / index.php
index 4f69522c6d471e4f62c35912d831815b1959a134..2a688fd1a60b60f4725e30e6ca4410c3682e2881 100644 (file)
--- a/index.php
+++ b/index.php
@@ -33,8 +33,15 @@ if(myisset("logout"))
   }
 else if(myisset("new"))
   {
-    $names = DB_get_all_names();
-    output_form_for_new_game($names);
+    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,9 +109,12 @@ else 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();
     
@@ -187,23 +197,75 @@ else if(myisset("cancle","me"))
     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"))
@@ -275,36 +337,6 @@ else if(myisset("me"))
     /* put everyting in a form */
     echo "<form action=\"index.php?me=$me\" method=\"post\">\n";
 
-    /* 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($mystatus == 'play' )
-      {
-       output_form_calls($me);
-       
-       echo "<br />\nA short comment:<input name=\"comment\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
-       echo "<hr />";
-      }
-
-    echo "<input type=\"submit\" value=\"submit\" />\n";
-
-    echo "</div>\n";
-
     /* output game */
 
     /* output extra division in case this game is part of a session */
@@ -317,9 +349,9 @@ 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";
@@ -357,7 +389,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
@@ -372,7 +404,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 */
@@ -407,12 +439,12 @@ 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 />";
+         echo "<p class=\"message\">Processing what you selected in the last step...";
       
          /* check if this sickness needs to be handled first */
          $gametype    = DB_get_gametype_by_gameid($gameid);
@@ -458,7 +490,7 @@ else if(myisset("me"))
              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 />";
+         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');
@@ -483,13 +515,12 @@ else if(myisset("me"))
              foreach($userids as $user)
                {
                  $To       = DB_get_email_by_userid($user);
-                 $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);
-                 if($userhash != $me)
+                 $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);                  if($userhash != $me)
                    {
-                     $message = "Everyone finish the questionary in game $gameid, ".
+                     $message = "Everyone finish the questionary in game ".DB_format_gameid($gameid).", ".
                        "please visit this link now to continue: \n".
                        " ".$host."?me=".$userhash."\n\n" ;
-                     mymail($To,$EmailName." finished setup in game $gameid",$message);
+                     mymail($To,$EmailName." finished setup in game ".DB_format_gameid($gameid),$message);
                    }
                };
            };
@@ -503,7 +534,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);
@@ -583,7 +615,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 */
@@ -759,7 +791,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 */
@@ -777,11 +809,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 "<div class=\"poverty\">\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=\"submit\" class=\"submitbutton\" value=\"select cards to give back\" />\n";
-                 echo "</div>\n";
+                 echo "</div><div>\n";
                }
              else if(myisset("trump","exchange") && $_REQUEST["trump"]>0 && ($who==$mypos || $who==$mypos*10))
                {
@@ -840,7 +872,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,7 +914,7 @@ else if(myisset("me"))
                  else
                    {
                      /* else show all trump, have lowest card pre-selected, have hidden setting for */
-                     echo "<div class=\"poverty\"> you need to get rid of a few cards</div>\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);
@@ -894,12 +926,12 @@ else if(myisset("me"))
                        display_link_card($card,$PREF["cardset"],$type);
                      echo "  <input type=\"hidden\" name=\"trump\" value=\"".$trump."\" />\n";
                      echo "  <input type=\"submit\" class=\"submitbutton\" value=\"select one card to give back\" />\n";
-                     echo "</div>\n";
+                     echo "</div><div>\n";
                    }
                }
              else if($who == $mypos || $who == $mypos*10)
                {
-                 echo "<div class=\"poverty\">\n";
+                 echo "</div><div class=\"poverty\">\n";
                  foreach($userids as $user)
                    {
                      $name     = DB_get_name_by_userid($user);
@@ -917,7 +949,7 @@ else if(myisset("me"))
                        }
                    }
                  echo "<a href=\"index.php?me=$me&amp;trump=no\">No,way I take those trump...</a> <br />\n";
-                 echo "</div>\n";
+                 echo "</div><div>\n";
                  
                  echo "Your cards are: <br />\n";
                  $mycards = DB_get_hand($me);
@@ -941,19 +973,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();
@@ -983,9 +1015,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 />";      
@@ -993,6 +1025,7 @@ else if(myisset("me"))
          else
            echo "\n <br />";    
        }
+      echo "</div>\n";
       break;
     case 'play':
     case 'gameover': 
@@ -1024,8 +1057,8 @@ else if(myisset("me"))
       /* 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 */
        }
@@ -1072,7 +1105,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))
        {
@@ -1088,7 +1121,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 */
@@ -1132,15 +1165,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)
        {
@@ -1203,9 +1231,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" )
@@ -1282,13 +1310,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)
@@ -1319,10 +1354,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 */
                {
@@ -1360,15 +1395,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);
                    }
                }
            }
@@ -1381,6 +1416,36 @@ 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);
@@ -1412,18 +1477,6 @@ else if(myisset("me"))
        }
       else if($mystatus=='gameover')
        {
-         /* get time from the last action of the game */
-         $result  = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " );
-         $r       = mysql_fetch_array($result,MYSQL_NUM);
-         $gameend = time() - strtotime($r[0]);
-         
-         if( $gameend < 60*60*24*7 )
-           {
-             echo "<br />\nA short comment:<input name=\"comment\" type=\"text\" size=\"30\" maxlength=\"100\" />\n";
-             echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
-             echo "<input type=\"submit\" value=\"submit\" />\n";
-           }
-
          $oldcards = DB_get_all_hand($me);
          $oldcards = mysort($oldcards,$gametype);
          echo "Your cards were: <br />\n";
@@ -1462,23 +1515,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".
@@ -1487,37 +1523,79 @@ 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);
+           echo "  ".$r[0]." ".$r[1]."<br />\n";
+         echo "</div>\n";
          
-         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();
@@ -1543,14 +1621,14 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
        {
         $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 )
@@ -1574,7 +1652,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
                   " 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
               {
@@ -1601,13 +1679,13 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
         $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"))
             {
@@ -1617,12 +1695,12 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
                 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;
@@ -1659,7 +1737,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
                     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 */
@@ -1667,10 +1745,10 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
             }
           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);
 
@@ -1683,72 +1761,80 @@ else if( myisset("email","password") || isset($_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