BUGFIX: some stats should really be displayed as an average per game...fixed
[e-DoKo.git] / index.php
index 20fc5734688d49c42f5bb6407e32e319162e6be5..80a732fa111e85d5ded99f1e8404ad4610335df7 100644 (file)
--- a/index.php
+++ b/index.php
@@ -49,148 +49,167 @@ else if(myisset("new"))
       }
   }
 /*check if everything is ready to set up a new game */
- else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","call" ))
+else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","call" ))
   {
-    $PlayerA = $_REQUEST["PlayerA"];
-    $PlayerB = $_REQUEST["PlayerB"];
-    $PlayerC = $_REQUEST["PlayerC"];
-    $PlayerD = $_REQUEST["PlayerD"];
-
-    $dullen      = $_REQUEST["dullen"];
-    $schweinchen = $_REQUEST["schweinchen"];
-    $call        = $_REQUEST["call"];
-
-    $EmailA  = DB_get_email_by_name($PlayerA);
-    $EmailB  = DB_get_email_by_name($PlayerB);
-    $EmailC  = DB_get_email_by_name($PlayerC);
-    $EmailD  = DB_get_email_by_name($PlayerD);
-
-    if($EmailA=="" || $EmailB=="" || $EmailC=="" || $EmailD=="")
+    output_status();
+    if( !isset($_SESSION["name"]) )
       {
-       echo "couldn't find one of the names, please start a new game";
-       output_footer();
-       DB_close();
-       exit();
+       echo "<div class=\"message\">Please <a href=\"$INDEX\">log in</a>.</div>";
       }
-
-    $useridA  = DB_get_userid_by_name($PlayerA);
-    $useridB  = DB_get_userid_by_name($PlayerB);
-    $useridC  = DB_get_userid_by_name($PlayerC);
-    $useridD  = DB_get_userid_by_name($PlayerD);
-
-    /* create random numbers */
-    $randomNR       = create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD);
-    $randomNRstring = join(":",$randomNR);
-
-    /* create game */
-    $followup = NULL;
-    if(myisset("followup") )
+    else
       {
-       $followup= $_REQUEST["followup"];
-       $session = DB_get_session_by_gameid($followup);
-       $ruleset = DB_get_ruleset_by_gameid($followup); /* just copy ruleset from old game,
-                                                        this way no manipulation is possible */
+       /* get my name */
+       $name = $_SESSION["name"];
 
-       /* check if there is a game in pre or play mode, in that case do nothing */
-       if( DB_is_session_active($session) > 0 )
+       $PlayerA = $_REQUEST["PlayerA"];
+       $PlayerB = $_REQUEST["PlayerB"];
+       $PlayerC = $_REQUEST["PlayerC"];
+       $PlayerD = $_REQUEST["PlayerD"];
+
+       /* check if user is in the game */
+       if(!in_array($name,array($PlayerA,$PlayerB,$PlayerC,$PlayerD)))
          {
-           echo "<p class=\"message\"> There is already a game going on in session $session, you can't start a new one</p>";
+           echo "<div class=\"message\">You need to be one of the players to start a <a href=\"$INDEX?new\">new game</a>.</div>";
            output_footer();
            DB_close();
            exit();
          }
-       else if ( DB_is_session_active($session) < 0 )
+
+       $dullen      = $_REQUEST["dullen"];
+       $schweinchen = $_REQUEST["schweinchen"];
+       $call        = $_REQUEST["call"];
+
+       $EmailA  = DB_get_email_by_name($PlayerA);
+       $EmailB  = DB_get_email_by_name($PlayerB);
+       $EmailC  = DB_get_email_by_name($PlayerC);
+       $EmailD  = DB_get_email_by_name($PlayerD);
+
+       if($EmailA=="" || $EmailB=="" || $EmailC=="" || $EmailD=="")
          {
-           echo "<p class=\"message\"> ERROR: status of session $session couldn't be determined.</p>";
+           echo "couldn't find one of the names, please start a new game";
            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)");
+       $useridA  = DB_get_userid_by_name($PlayerA);
+       $useridB  = DB_get_userid_by_name($PlayerB);
+       $useridC  = DB_get_userid_by_name($PlayerC);
+       $useridD  = DB_get_userid_by_name($PlayerD);
+
+       /* create random numbers */
+       $randomNR       = create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD);
+       $randomNRstring = join(":",$randomNR);
+
+       /* create game */
+       $followup = NULL;
+       if(myisset("followup") )
+         {
+           $followup= $_REQUEST["followup"];
+           $session = DB_get_session_by_gameid($followup);
+           $ruleset = DB_get_ruleset_by_gameid($followup); /* just copy ruleset from old game,
+                                                            this way no manipulation is possible */
+
+           /* check if there is a game in pre or play mode, in that case do nothing */
+           if( DB_is_session_active($session) > 0 )
+             {
+               echo "<p class=\"message\"> There is already a game going on in session $session, you can't start a new one</p>";
+               output_footer();
+               DB_close();
+               exit();
+             }
+           else if ( DB_is_session_active($session) < 0 )
+             {
+               echo "<p class=\"message\"> ERROR: status of session $session couldn't be determined.</p>";
+               output_footer();
+               DB_close();
+               exit();
+             }
+
+           if($session)
+             mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre',".
+                         "'$ruleset','$session' ,NULL)");
+           else
+             {
+               /* get max session */
+               $max = DB_get_max_session();
+               $max++;
+               mysql_query("UPDATE Game SET session='".$max."' WHERE id=".DB_quote_smart($followup));
+               mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre',".
+                           "'$ruleset','$max' ,NULL)");
+             }
+         }
        else
          {
+           /* get ruleset information or create new one */
+           $ruleset = DB_get_ruleset($dullen,$schweinchen,$call);
+           if($ruleset <0)
+             {
+               myerror("Error defining ruleset: $ruleset");
+               output_footer();
+               DB_close();
+               exit();
+             };
            /* get max session */
            $max = DB_get_max_session();
            $max++;
-           mysql_query("UPDATE Game SET session='".$max."' WHERE id=".DB_quote_smart($followup));
-           mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre',".
+
+           mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre', ".
                        "'$ruleset','$max' ,NULL)");
          }
+       $game_id = mysql_insert_id();
+
+       /* create hash */
+       $TIME  = (string) time(); /* to avoid collisions */
+       $hashA = md5("AGameOfDoko".$game_id.$PlayerA.$EmailA.$TIME);
+       $hashB = md5("AGameOfDoko".$game_id.$PlayerB.$EmailB.$TIME);
+       $hashC = md5("AGameOfDoko".$game_id.$PlayerC.$EmailC.$TIME);
+       $hashD = md5("AGameOfDoko".$game_id.$PlayerD.$EmailD.$TIME);
+
+       /* create hands */
+       mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridA).
+                   ", ".DB_quote_smart($hashA).", 'start','1',NULL,NULL,NULL,NULL)");
+       $hand_idA = mysql_insert_id();
+       mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridB).
+                   ", ".DB_quote_smart($hashB).", 'start','2',NULL,NULL,NULL,NULL)");
+       $hand_idB = mysql_insert_id();
+       mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridC).
+                   ", ".DB_quote_smart($hashC).", 'start','3',NULL,NULL,NULL,NULL)");
+       $hand_idC = mysql_insert_id();
+       mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridD).
+                   ", ".DB_quote_smart($hashD).", 'start','4',NULL,NULL,NULL,NULL)");
+       $hand_idD = mysql_insert_id();
+
+       /* save cards */
+       for($i=0;$i<12;$i++)
+         mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idA', '".$randomNR[$i]."', 'false')");
+       for($i=12;$i<24;$i++)
+         mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idB', '".$randomNR[$i]."', 'false')");
+       for($i=24;$i<36;$i++)
+         mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idC', '".$randomNR[$i]."', 'false')");
+       for($i=36;$i<48;$i++)
+         mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idD', '".$randomNR[$i]."', 'false')");
+
+       /* send out email, TODO: check for error with email */
+       $message = "\n".
+         "you are invited to play a game of DoKo (that is to debug the program ;).\n".
+         "Place comments and bug reports here:\n".
+         "http://wiki.nubati.net/index.php?title=EmailDoko\n\n".
+         "The whole round would consist of the following players:\n".
+         "$PlayerA\n".
+         "$PlayerB\n".
+         "$PlayerC\n".
+         "$PlayerD\n\n".
+         "If you want to join this game, please follow this link:\n\n".
+         "".$HOST.$INDEX."?me=";
+
+       mymail($EmailA,"You are invited to a game of DoKo","Hello $PlayerA,\n".$message.$hashA);
+       mymail($EmailB,"You are invited to a game of DoKo","Hello $PlayerB,\n".$message.$hashB);
+       mymail($EmailC,"You are invited to a game of DoKo","Hello $PlayerC,\n".$message.$hashC);
+       mymail($EmailD,"You are invited to a game of DoKo","Hello $PlayerD,\n".$message.$hashD);
+
+       echo "<div class=\"message\">You started a new game. The emails have been sent out!</div>\n";
       }
-    else
-      {
-       /* get ruleset information or create new one */
-       $ruleset = DB_get_ruleset($dullen,$schweinchen,$call);
-       if($ruleset <0)
-         {
-           myerror("Error defining ruleset: $ruleset");
-           output_footer();
-           DB_close();
-           exit();
-         };
-       /* get max session */
-       $max = DB_get_max_session();
-       $max++;
-
-       mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre', ".
-                 "'$ruleset','$max' ,NULL)");
-      }
-    $game_id = mysql_insert_id();
-
-    /* create hash */
-    $TIME  = (string) time(); /* to avoid collisions */
-    $hashA = md5("AGameOfDoko".$game_id.$PlayerA.$EmailA.$TIME);
-    $hashB = md5("AGameOfDoko".$game_id.$PlayerB.$EmailB.$TIME);
-    $hashC = md5("AGameOfDoko".$game_id.$PlayerC.$EmailC.$TIME);
-    $hashD = md5("AGameOfDoko".$game_id.$PlayerD.$EmailD.$TIME);
-
-    /* create hands */
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridA).
-               ", ".DB_quote_smart($hashA).", 'start','1',NULL,NULL,NULL,NULL)");
-    $hand_idA = mysql_insert_id();
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridB).
-               ", ".DB_quote_smart($hashB).", 'start','2',NULL,NULL,NULL,NULL)");
-    $hand_idB = mysql_insert_id();
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridC).
-               ", ".DB_quote_smart($hashC).", 'start','3',NULL,NULL,NULL,NULL)");
-    $hand_idC = mysql_insert_id();
-    mysql_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridD).
-               ", ".DB_quote_smart($hashD).", 'start','4',NULL,NULL,NULL,NULL)");
-    $hand_idD = mysql_insert_id();
-
-    /* save cards */
-    for($i=0;$i<12;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idA', '".$randomNR[$i]."', 'false')");
-    for($i=12;$i<24;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idB', '".$randomNR[$i]."', 'false')");
-    for($i=24;$i<36;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idC', '".$randomNR[$i]."', 'false')");
-    for($i=36;$i<48;$i++)
-      mysql_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idD', '".$randomNR[$i]."', 'false')");
-
-    /* send out email, TODO: check for error with email */
-    $message = "\n".
-      "you are invited to play a game of DoKo (that is to debug the program ;).\n".
-      "Place comments and bug reports here:\n".
-      "http://wiki.nubati.net/index.php?title=EmailDoko\n\n".
-      "The whole round would consist of the following players:\n".
-      "$PlayerA\n".
-      "$PlayerB\n".
-      "$PlayerC\n".
-      "$PlayerD\n\n".
-      "If you want to join this game, please follow this link:\n\n".
-      "".$HOST.$INDEX."?me=";
-
-    mymail($EmailA,"You are invited to a game of DoKo","Hello $PlayerA,\n".$message.$hashA);
-    mymail($EmailB,"You are invited to a game of DoKo","Hello $PlayerB,\n".$message.$hashB);
-    mymail($EmailC,"You are invited to a game of DoKo","Hello $PlayerC,\n".$message.$hashC);
-    mymail($EmailD,"You are invited to a game of DoKo","Hello $PlayerD,\n".$message.$hashD);
-
-    output_status();
-    echo "<div class=\"message\">You started a new game. The emails have been sent out!</div>\n";
   }    /* end set up a new game */
 /* cancel a game, if nothing has happend in the last N minutes */
 else if(myisset("cancel","me"))
@@ -408,20 +427,6 @@ else if(myisset("me"))
            output_check_want_to_play($me);
            break;
          }
-       else
-         {
-           /* move on to the next stage*/
-           DB_set_hand_status_by_hash($me,'init');
-         }
-      case 'init':
-       /* first check if everything went ok  in the last step
-        * if not, send user back, if yes, check what he did
-        */
-       if( !myisset("in") )
-         {
-           echo "<p class=\"message\"> You need to answer the <a href=\"$INDEX?me=$me\">question</a>.</p>";
-           DB_set_hand_status_by_hash($me,'start');
-         }
        else
          {
            if($_REQUEST["in"] == "no")
@@ -439,23 +444,70 @@ else if(myisset("me"))
 
                /* delete everything from the dB */
                DB_cancel_game($me);
+               break;
              }
            else
              {
-               $mycards = DB_get_hand($me);
-               sort($mycards);
+               /* user wants to join the game */
 
-               output_check_for_sickness($me,$mycards);
+               /* move on to the next stage,
+                * no break statement to immediately go to the next stage
+                */
 
-               echo "<p class=\"mycards\">Your cards are: <br />\n";
-               foreach($mycards as $card)
-                 display_card($card,$PREF["cardset"]);
-               echo "</p>\n";
+               DB_set_hand_status_by_hash($me,'init');
 
-               /* move on to the next stage*/
-               DB_set_hand_status_by_hash($me,'check');
+               /* check if everyone has reached this stage, send out email */
+               $userids = DB_get_all_userid_by_gameid($gameid);
+               $ok = 1;
+               foreach($userids as $user)
+                 {
+                   $userstat = DB_get_hand_status_by_userid_and_gameid($user,$gameid);
+                   if($userstat!='init')
+                     {
+                       /* whos turn is it? */
+                       DB_set_player_by_gameid($gameid,$user);
+                       $ok = 0;
+                     }
+                 };
+               if($ok)
+                 {
+                   /* all done, send out email unless this player is the startplayer */
+                   $startplayer = DB_get_startplayer_by_gameid($gameid);
+                   if($mypos == $startplayer)
+                     {
+                       /* do nothing, go to next stage */
+                     }
+                   else
+                     {
+                       /* email startplayer */
+                       /*
+                       $email       = DB_get_email_by_pos_and_gameid($startplayer,$gameid);
+                       $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
+                       $who         = DB_get_userid_by_email($email);
+                       DB_set_player_by_gameid($gameid,$who);
+
+                       $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
+                         "Use this link to play a card: ".$HOST.$INDEX."?me=".$hash."\n\n" ;
+                       mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
+                       */
+                     }
+                 }
              }
          }
+      case 'init':
+
+       $mycards = DB_get_hand($me);
+       sort($mycards);
+
+       output_check_for_sickness($me,$mycards);
+
+       echo "<p class=\"mycards\">Your cards are: <br />\n";
+       foreach($mycards as $card)
+         display_card($card,$PREF["cardset"]);
+       echo "</p>\n";
+
+       /* move on to the next stage*/
+       DB_set_hand_status_by_hash($me,'check');
        break;
 
     case 'check':
@@ -833,7 +885,8 @@ else if(myisset("me"))
                    {
                      $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
                      $userhash = DB_get_hash_from_game_and_pos($gameid,$who);
-                     DB_set_player_by_gameid($gameid,$who);
+                     $userid   = DB_get_userid_by_email($To);
+                     DB_set_player_by_gameid($gameid,$userid);
 
                      $message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
                        " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
@@ -913,7 +966,8 @@ else if(myisset("me"))
                            {
                              $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
                              $userhash = DB_get_hash_from_game_and_pos($gameid,$who);
-                             DB_set_player_by_gameid($gameid,$who);
+                             $userid   = DB_get_userid_by_email($To);
+                             DB_set_player_by_gameid($gameid,$userid);
 
                              $message = "Someone has poverty, it's your turn to decide, ".
                                         "if you want to take the trump. Please visit:".
@@ -1125,6 +1179,16 @@ else if(myisset("me"))
              DB_insert_comment($comment,$playid,$myid);
          };
 
+      /* handle notes in case player didn't play a card, allow notes only during a game */
+      if( (!myisset("card") && $mystatus=='play')  )
+       if(myisset("note"))
+         {
+           $note = $_REQUEST["note"];
+
+           if($note != "")
+             DB_insert_note($note,$gameid,$myid);
+         };
+
       /* get everything relevant to display the tricks */
       $result = mysql_query("SELECT Hand_Card.card_id as card,".
                            "       Hand.position as position,".
@@ -1154,6 +1218,31 @@ else if(myisset("me"))
       echo "\n<ul class=\"tricks\">\n";
       echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
 
+      /* output vorbehalte */
+      $mygametype =  DB_get_gametype_by_gameid($gameid);
+      if($mygametype != "normal") /* only show when needed */
+       {
+         echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
+           "    <div class=\"trick\" id=\"trick0\">\n";
+         $show = 1;
+         for($mypos=1;$mypos<5;$mypos++)
+           {
+             $usersick = DB_get_sickness_by_pos_and_gameid($mypos,$gameid);
+             if($usersick!=NULL)
+               {
+                 echo "      <div class=\"vorbehalt".($mypos-1)."\"> Vorbehalt <br />";
+                 if($show)
+                   echo " $usersick <br />";
+                 echo  " </div>\n";
+
+                 if($mygametype == $usersick)
+                   $show = 0;
+               }
+           }
+         echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+       }
+
+      /* output tricks */
       while($r = mysql_fetch_array($result,MYSQL_NUM))
        {
          $pos     = $r[1];
@@ -1398,6 +1487,14 @@ else if(myisset("me"))
                    DB_insert_comment($comment,$playid,$myid);
                };
 
+             /* check for note */
+             if(myisset("note"))
+               {
+                 $note = $_REQUEST["note"];
+                 if($note != "")
+                   DB_insert_note($note,$gameid,$myid);
+               };
+
              /* display played card */
              $pos = DB_get_pos_by_hash($me);
              if($sequence==1)
@@ -1664,6 +1761,38 @@ else if(myisset("me"))
                  $message .= " Total Points (from the Re point of view): $Tpoint\n";
                  $message .= "\n";
 
+                 $session = DB_get_session_by_gameid($gameid);
+                 $score = generate_score_table($session);
+                 /* convert html to ascii */
+                 $score = str_replace("<div class=\"scoretable\">\n<table class=\"score\">\n <tr>\n","",$score);
+                 $score = str_replace("</table></div>\n","",$score);
+                 $score = str_replace("\n","",$score);
+                 $score = str_replace(array("<tr>","</tr>","<td>","</td>"),array("","\n","","|"),$score);
+                 $score = explode("\n",$score);
+
+                 $header = array_slice($score,0,1);
+                 $header = explode("|",$header[0]);
+                 for($i=0;$i<sizeof($header);$i++)
+                   $header[$i]=str_pad($header[$i],6," ",STR_PAD_BOTH);
+                 $header = implode("|",$header);
+                 $header.= "\n------+------+------+------+------+\n";
+                 if(sizeof($score)>5) $header.=   "                ...   \n";
+
+                 if(sizeof($score)>5) $score = array_slice($score,-5,5);
+                 for($i=0;$i<sizeof($score);$i++)
+                   {
+                     $line = explode("|",$score[$i]);
+                     for($j=0;$j<sizeof($line);$j++)
+                       $line[$j]=str_pad($line[$j],6," ",STR_PAD_LEFT);
+                     $score[$i] = implode("|",$line);
+                   }
+
+                 $score = implode("\n",$score);
+                 $score = $header.$score;
+                 
+                 $message .= "Score Table:\n";
+                 $message .= $score;
+
                  /* send out final email */
                  $all = array();
 
@@ -1726,6 +1855,13 @@ else if(myisset("me"))
 
       echo "</ul>\n"; /* end ul tricks*/
 
+      echo "<div class=\"notes\"> Personal notes: <br />\n";
+      $notes = DB_get_notes_by_userid_and_gameid($myid,$gameid);
+      foreach($notes as $note)
+       echo "$note <hr \>\n";
+      echo "Insert note:<input name=\"note\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
+      echo "</div> \n";
+      
       $mycards = DB_get_hand($me);
       $mycards = mysort($mycards,$gametype);
       echo "<div class=\"mycards\">\n";
@@ -1806,6 +1942,11 @@ else if(myisset("me"))
          while( $r = mysql_fetch_array($result,MYSQL_NUM))
            echo "  ".$r[0]." ".$r[1]."<br />\n";
 
+         $queryresult = mysql_query("SELECT timediff(mod_date,create_date) ".
+                                    " FROM Game WHERE id='$gameid'");
+         $r = mysql_fetch_array($queryresult,MYSQL_NUM);
+         echo "<p>This game took ".$r[0]." hours.</p>";
+
          echo "<div class=\"re\">\n Points Re: <br />\n";
          $queryresult = mysql_query("SELECT score FROM Score ".
                                     "  WHERE game_id=$gameid AND party='re'".
@@ -1898,7 +2039,6 @@ else if(myisset("me"))
 
     echo "</div>\n";
 
-
     echo "</form>\n";
     output_footer();
     DB_close();
@@ -2112,21 +2252,18 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
                   if($r[4] != 'gameover')
                     {
                       echo "</td><td>\n    ";
-                      if($r[3])
+                      if($r[3]==$myid || !$r[3])
+                        echo "(it's <strong>your</strong> turn)\n";
+                      else
                         {
-                          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=\"$INDEX?remind=1&amp;me=".$r[0]."\">Send a reminder.</a>";
-                              echo "(it's $name's turn)\n";
-                            };
-                        }
+                          $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=\"$INDEX?remind=1&amp;me=".$r[0]."\">Send a reminder.</a>";
+                          echo "(it's $name's turn)\n";
+                        };
                       if(time()-strtotime($r[2]) > 60*60*24*30)
                         echo "".
                           "<a href=\"$INDEX?cancel=1&amp;me=".$r[0]."\">Cancel?</a>".
@@ -2135,10 +2272,18 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
                     }
                 }
               echo "</td></tr>\n</table>\n";
-              $names = DB_get_all_names();
-              echo "<h4>Registered players:</h4>\n<p>\n";
-              echo implode(", ",$names)."\n";
-              echo "</p>\n</div>";
+
+              $names = DB_get_names_of_new_logins(5);
+              echo "<h4>New Players:</h4>\n<p>\n";
+              echo implode(", ",$names).",...\n";
+              echo "</p>\n";
+
+              $names = DB_get_names_of_last_logins(5);
+              echo "<h4>Players last logged in:</h4>\n<p>\n";
+              echo implode(", ",$names).",...\n";
+              echo "</p>\n";
+              
+              echo "</div>\n";
             }
         }
        else