X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fnewgame.php;h=68e0d155cd2743aae0e976b19a9f758e0c2522de;hp=d7a2d7f35378bd3fdccf2f9cf477251967f69c23;hb=6da798e39be09e3cea651be2c7d826b79450a1f8;hpb=f47ddae6b4d00d950c3a29d6b7536ce1ae9ac813

diff --git a/include/newgame.php b/include/newgame.php
index d7a2d7f..68e0d15 100644
--- a/include/newgame.php
+++ b/include/newgame.php
@@ -40,7 +40,7 @@ else
 
     DB_update_user_timestamp($myid);
 
-    if( !myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","callrule" ))
+    if( !myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","callrule","lowtrump" ))
       {
 	/* only get players that want to be in new games */
 	$names = DB_get_all_user_names_open_for_games();
@@ -80,6 +80,7 @@ else
 	$dullen      = $_REQUEST["dullen"];
 	$schweinchen = $_REQUEST["schweinchen"];
 	$call        = $_REQUEST["callrule"];
+	$lowtrump    = $_REQUEST["lowtrump"];
 
 	/* get the emails addresses of the players */
 	$EmailA  = DB_get_email('name',$PlayerA);
@@ -142,7 +143,7 @@ else
 	else /* no follow up, start a new session */
 	  {
 	    /* get ruleset information or create new one */
-	    $ruleset = DB_get_ruleset($dullen,$schweinchen,$call);
+	    $ruleset = DB_get_ruleset($dullen,$schweinchen,$call,$lowtrump);
 	    if($ruleset <0)
 	      {
 		myerror("Error defining ruleset: $ruleset");
@@ -190,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".
@@ -200,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);