X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fnewgame.php;h=b41dc8b44fe867c4e9fd503eb6a9283c4b2c682b;hp=7349e7ef2d074f2af3d78fefb98229c10dc623de;hb=ba7d92fad7b3ac0cfe4a6733339aa474991315a2;hpb=2666bb58429c385b716d2ffd5d5fe9a9e7af4f45

diff --git a/include/newgame.php b/include/newgame.php
index 7349e7e..b41dc8b 100644
--- a/include/newgame.php
+++ b/include/newgame.php
@@ -23,10 +23,20 @@ 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($myid);
       }
     else
@@ -160,26 +170,22 @@ else
 	  DB_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".
+	$message = "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".
 	  "$PlayerB\n".
 	  "$PlayerC\n".
 	  "$PlayerD\n\n".
-	  "If you want to join this game, please follow this link:\n\n".
+	  "If you want to join this game, please follow this link:\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).')';
+	mymail($useridA,$subject, $message.$hashA."\n\n");
+	mymail($useridB,$subject, $message.$hashB."\n\n");
+	mymail($useridC,$subject, $message.$hashC."\n\n");
+	mymail($useridD,$subject, $message.$hashD."\n\n");
 
 	echo "<div class=\"message\">You started a new game. The emails have been sent out!</div>\n";
         display_user_menu($myid);