X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fnewgame.php;h=f06bebe65d5e82b1028764fb03136080f7bab056;hp=db6b62da3474444b96348638220cc875363293ad;hb=69d701b97474977c4c48367ca6ecfedfb2db0217;hpb=27cbc14d28d072c37474ac1e96d677b88dde27ba
diff --git a/include/newgame.php b/include/newgame.php
index db6b62d..f06bebe 100644
--- a/include/newgame.php
+++ b/include/newgame.php
@@ -1,4 +1,23 @@
+ *
+ * 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 .
+ *
+ */
+
/* 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 "\n";
output_form_for_new_game($names);
echo "
\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");
@@ -126,26 +156,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();
@@ -160,25 +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,"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).')';
+ 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 "You started a new game. The emails have been sent out!
\n";
- display_user_menu();
+ display_user_menu($myid);
}
}