CLEANUP: clean up the preferences html output a bit

[e-DoKo.git] / include / newgame.php

diff --git a/include/newgame.php b/include/newgame.php
index 8dbefdff70ee571ce0b3009a5c5794cf2bd2d287..40ab74de6f47e88e959e451c976a6044b213ed3f 100644 (file)
--- a/include/newgame.php
+++ b/include/newgame.php
@@ -23,11 +23,21 @@ else
 
     if( !myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","callrule" ))
       {
-       $names = DB_get_all_names();
+       /* only get players that want to be in new games */
+       $names = DB_get_all_user_names_open_for_games();
+
+       /* add player if he is not open for games */
+       if(!in_array($_SESSION["name"],$names))
+         $names[]=$_SESSION["name"];
+
+       /* add some randomness */
+       shuffle($names);
+
        echo "<div class=\"user\">\n";
        output_form_for_new_game($names);
        echo "</div>\n";
-        display_user_menu();
+
+        display_user_menu($myid);
       }
     else
       {
@@ -161,8 +171,8 @@ else
 
        /* 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".
+         "you are invited to play a game of DoKo.\n".
+         "Please, 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".
@@ -182,7 +192,7 @@ else
               "Hello $PlayerD,\n".$message.$hashD);
 
        echo "<div class=\"message\">You started a new game. The emails have been sent out!</div>\n";
-        display_user_menu();
+        display_user_menu($myid);
       }
   }