X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fnewgame.php;h=4ce13cb771e07e80c9663ed300a6bd40487b289b;hp=8dbefdff70ee571ce0b3009a5c5794cf2bd2d287;hb=4cbc3848a891ac9addf10264d24a9f4273c5e355;hpb=4f932986e02718cba7aef75d69702e2b7daa88fe

diff --git a/include/newgame.php b/include/newgame.php
index 8dbefdf..4ce13cb 100644
--- 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".
@@ -172,17 +182,14 @@ else
 	  "If you want to join this game, please follow this link:\n\n".
 	  "".$HOST.$INDEX."?action=game&me=";
 
-	mymail($EmailA,"$EmailName You are invited to a game of DoKo (game ".DB_format_gameid($gameid).")",
-	       "Hello $PlayerA,\n".$message.$hashA);
-	mymail($EmailB,"$EmailName You are invited to a game of DoKo (game ".DB_format_gameid($gameid).")",
-	       "Hello $PlayerB,\n".$message.$hashB);
-	mymail($EmailC,"$EmailName You are invited to a game of DoKo (game ".DB_format_gameid($gameid).")",
-	       "Hello $PlayerC,\n".$message.$hashC);
-	mymail($EmailD,"$EmailName You are invited to a game of DoKo (game ".DB_format_gameid($gameid).")",
-	       "Hello $PlayerD,\n".$message.$hashD);
+	$subject = 'You are invited to a game of DoKo (game '.DB_format_gameid($gameid).')';
+	sendmail($EmailA,$subject, "Hello $PlayerA,\n".$message.$hashA);
+	sendmail($EmailB,$subject, "Hello $PlayerB,\n".$message.$hashB);
+	sendmail($EmailC,$subject, "Hello $PlayerC,\n".$message.$hashC);
+	sendmail($EmailD,$subject, "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);
       }
   }