X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fnewgame.php;h=7349e7ef2d074f2af3d78fefb98229c10dc623de;hp=feb5216119f7b92ff6e5bd53fb23354399369bbf;hb=11882439a450641bf0d4dd048775d0bdfb592642;hpb=5bb89f347f1a0e264ac0bd6541e49f248f265fc0

diff --git a/include/newgame.php b/include/newgame.php
index feb5216..7349e7e 100644
--- a/include/newgame.php
+++ b/include/newgame.php
@@ -20,7 +20,6 @@ else
       return;
 
     DB_update_user_timestamp($myid);
-    output_status();
 
     if( !myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","callrule" ))
       {
@@ -28,7 +27,7 @@ else
 	echo "<div class=\"user\">\n";
 	output_form_for_new_game($names);
 	echo "</div>\n";
-        display_user_menu();
+        display_user_menu($myid);
       }
     else
       {
@@ -45,9 +44,7 @@ else
 	if(!in_array($name,array($PlayerA,$PlayerB,$PlayerC,$PlayerD)))
 	  {
 	    echo "<div class=\"message\">You need to be one of the players to start a <a href=\"$INDEX?action=new\">new game</a>.</div>";
-	    output_footer();
-	    DB_close();
-	    exit();
+	    return;
 	  }
 
 	/* what rules were selected */
@@ -65,9 +62,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 +89,12 @@ else
 	    if( DB_is_session_active($session) > 0 )
 	      {
 		echo "<p class=\"message\"> There is already a game going on in session $session, you can't start a new one</p>";
-		output_footer();
-		DB_close();
-		exit();
+		return;
 	      }
 	    else if ( DB_is_session_active($session) < 0 )
 	      {
 		echo "<p class=\"message\"> ERROR: status of session $session couldn't be determined.</p>";
-		output_footer();
-		DB_close();
-		exit();
+		return;
 	      }
 
 	    if($session)
@@ -126,9 +117,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 +126,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();
 
@@ -183,13 +172,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 "<div class=\"message\">You started a new game. The emails have been sent out!</div>\n";
-        display_user_menu();
+        display_user_menu($myid);
       }
   }