X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fnewgame.php;h=b29cc56a7aa92adab30f80142e0d02d18cffcf78;hp=f06bebe65d5e82b1028764fb03136080f7bab056;hb=72842383a6162e43f8b9630bfcca13d10eca7bff;hpb=850378a3e2da48d387dc565cc6e3c2b47f12e34d

diff --git a/include/newgame.php b/include/newgame.php
index f06bebe..b29cc56 100644
--- a/include/newgame.php
+++ b/include/newgame.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -42,6 +42,7 @@ else
 
     if( !myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","callrule","lowtrump" ))
       {
+        display_user_menu($myid);
 	/* only get players that want to be in new games */
 	$names = DB_get_all_user_names_open_for_games();
 
@@ -56,7 +57,6 @@ else
 	output_form_for_new_game($names);
 	echo "</div>\n";
 
-        display_user_menu($myid);
       }
     else
       {
@@ -191,8 +191,7 @@ else
 
 	/* send out email, TODO: check for error with email */
 	$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".
+	  "Please, place comments and bug reports here:\n$WIKI\n\n".
 	  "The whole round would consist of the following players:\n".
 	  "$PlayerA\n".
 	  "$PlayerB\n".
@@ -201,11 +200,10 @@ else
 	  "If you want to join this game, please follow this link:\n".
 	  "".$HOST.$INDEX."?action=game&me=";
 
-	$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");
+	mymail($useridA, $gameid, GAME_NEW, $message.$hashA."\n\n");
+	mymail($useridB, $gameid, GAME_NEW, $message.$hashB."\n\n");
+	mymail($useridC, $gameid, GAME_NEW, $message.$hashC."\n\n");
+	mymail($useridD, $gameid, GAME_NEW, $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);