X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fnewgame.php;h=40ab74de6f47e88e959e451c976a6044b213ed3f;hp=feb5216119f7b92ff6e5bd53fb23354399369bbf;hb=ee08bf05ddb0bb5722b0f8b1569d7ab4473a798d;hpb=5bb89f347f1a0e264ac0bd6541e49f248f265fc0
diff --git a/include/newgame.php b/include/newgame.php
index feb5216..40ab74d 100644
--- a/include/newgame.php
+++ b/include/newgame.php
@@ -20,15 +20,24 @@ else
return;
DB_update_user_timestamp($myid);
- output_status();
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 "
\n";
output_form_for_new_game($names);
echo "
\n";
- display_user_menu();
+
+ display_user_menu($myid);
}
else
{
@@ -45,9 +54,7 @@ else
if(!in_array($name,array($PlayerA,$PlayerB,$PlayerC,$PlayerD)))
{
echo "You need to be one of the players to start a
new game.
";
- output_footer();
- DB_close();
- exit();
+ return;
}
/* what rules were selected */
@@ -65,9 +72,7 @@ else
if($EmailA=="" || $EmailB=="" || $EmailC=="" || $EmailD=="")
{
echo "couldn't find one of the names, please start a new game";
- output_footer();
- DB_close();
- exit();
+ return;
}
/* get user ids */
@@ -94,16 +99,12 @@ else
if( DB_is_session_active($session) > 0 )
{
echo " There is already a game going on in session $session, you can't start a new one
";
- output_footer();
- DB_close();
- exit();
+ return;
}
else if ( DB_is_session_active($session) < 0 )
{
echo " ERROR: status of session $session couldn't be determined.
";
- output_footer();
- DB_close();
- exit();
+ return;
}
if($session)
@@ -126,9 +127,7 @@ else
if($ruleset <0)
{
myerror("Error defining ruleset: $ruleset");
- output_footer();
- DB_close();
- exit();
+ return;
};
/* get max session */
$max = DB_get_max_session();
@@ -137,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();
@@ -172,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".
@@ -183,13 +182,17 @@ 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);
+ 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);
echo "You started a new game. The emails have been sent out!
\n";
- display_user_menu();
+ display_user_menu($myid);
}
}