CLEANUP: make emails more uniform

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

diff --git a/include/newgame.php b/include/newgame.php
index 7a88a80ba469c1bf5b60e35519df39c902946b07..4ce13cb771e07e80c9663ed300a6bd40487b289b 100644 (file)
--- a/include/newgame.php
+++ b/include/newgame.php
@@ -27,7 +27,7 @@ else
        $names = DB_get_all_user_names_open_for_games();
 
        /* add player if he is not open for games */
-       if(!in_array($names,$_SESSION["name"]))
+       if(!in_array($_SESSION["name"],$names))
          $names[]=$_SESSION["name"];
 
        /* add some randomness */
@@ -171,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,14 +182,11 @@ 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($myid);