BUGFIX: store canceled games, don't delete them

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

diff --git a/include/newgame.php b/include/newgame.php
index db6b62da3474444b96348638220cc875363293ad..4ce13cb771e07e80c9663ed300a6bd40487b289b 100644 (file)
--- 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
       {
@@ -126,26 +136,26 @@ else
            DB_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre', ".
                     "'$ruleset','$max' ,NULL)");
          }
-       $game_id = DB_insert_id();
+       $gameid = DB_insert_id();
 
        /* create hash */
        $TIME  = (string) time(); /* to avoid collisions */
-       $hashA = md5("AGameOfDoko".$game_id.$PlayerA.$EmailA.$TIME);
-       $hashB = md5("AGameOfDoko".$game_id.$PlayerB.$EmailB.$TIME);
-       $hashC = md5("AGameOfDoko".$game_id.$PlayerC.$EmailC.$TIME);
-       $hashD = md5("AGameOfDoko".$game_id.$PlayerD.$EmailD.$TIME);
+       $hashA = md5("AGameOfDoko".$gameid.$PlayerA.$EmailA.$TIME);
+       $hashB = md5("AGameOfDoko".$gameid.$PlayerB.$EmailB.$TIME);
+       $hashC = md5("AGameOfDoko".$gameid.$PlayerC.$EmailC.$TIME);
+       $hashD = md5("AGameOfDoko".$gameid.$PlayerD.$EmailD.$TIME);
 
        /* create hands */
-       DB_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridA).
+       DB_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($gameid).",".DB_quote_smart($useridA).
                 ", ".DB_quote_smart($hashA).", 'start','1',NULL,NULL,NULL,NULL)");
        $hand_idA = DB_insert_id();
-       DB_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridB).
+       DB_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($gameid).",".DB_quote_smart($useridB).
                 ", ".DB_quote_smart($hashB).", 'start','2',NULL,NULL,NULL,NULL)");
        $hand_idB = DB_insert_id();
-       DB_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridC).
+       DB_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($gameid).",".DB_quote_smart($useridC).
                 ", ".DB_quote_smart($hashC).", 'start','3',NULL,NULL,NULL,NULL)");
        $hand_idC = DB_insert_id();
-       DB_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($game_id).",".DB_quote_smart($useridD).
+       DB_query("INSERT INTO Hand VALUES (NULL,".DB_quote_smart($gameid).",".DB_quote_smart($useridD).
                 ", ".DB_quote_smart($hashD).", 'start','4',NULL,NULL,NULL,NULL)");
        $hand_idD = DB_insert_id();
 
@@ -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,13 +182,14 @@ else
          "If you want to join this game, please follow this link:\n\n".
          "".$HOST.$INDEX."?action=game&me=";
 
-       mymail($EmailA,"You are invited to a game of DoKo","Hello $PlayerA,\n".$message.$hashA);
-       mymail($EmailB,"You are invited to a game of DoKo","Hello $PlayerB,\n".$message.$hashB);
-       mymail($EmailC,"You are invited to a game of DoKo","Hello $PlayerC,\n".$message.$hashC);
-       mymail($EmailD,"You are invited to a game of DoKo","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);
       }
   }