Merge branch 'master' of /home/arun/nubati.net/git/e-DoKo

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

diff --git a/include/newgame.php b/include/newgame.php
index 8dbefdff70ee571ce0b3009a5c5794cf2bd2d287..f06bebe65d5e82b1028764fb03136080f7bab056 100644 (file)
--- a/include/newgame.php
+++ b/include/newgame.php
@@ -1,4 +1,23 @@
 <?php
+/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+ *
+ *   This file is part of e-DoKo.
+ *
+ *   e-DoKo is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   e-DoKo is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with e-DoKo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /* make sure that we are not called from outside the scripts,
  * use a variable defined in config.php to check this
  */
@@ -21,13 +40,23 @@ 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" ))
       {
-       $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
       {
@@ -51,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);
@@ -113,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");
@@ -160,29 +190,25 @@ 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();
+        display_user_menu($myid);
       }
   }