X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fnewgame.php;h=bce755e66ee5ab47fc5c19513b52ae845f6c7003;hp=d7a2d7f35378bd3fdccf2f9cf477251967f69c23;hb=46140faa11b97252647178a811da22509256d6c4;hpb=6e7ed2d202da016b9a74256371369cc41201df2e

diff --git a/include/newgame.php b/include/newgame.php
index d7a2d7f..bce755e 100644
--- a/include/newgame.php
+++ b/include/newgame.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -27,7 +27,7 @@ if(!isset($HOST))
 /* user needs to be logged in to do this */
 if(! isset($_SESSION["name"]) )
   {
-    echo "<div class=\"message\">Please <a href=\"$INDEX\">log in</a>.</div>";
+    echo '<div class="message">'._('Please')." <a href=\"$INDEX\">"._('log in')."</a>.</div>\n";
   }
 else
   {
@@ -40,8 +40,9 @@ 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" ))
       {
+        display_user_menu($myid);
 	/* only get players that want to be in new games */
 	$names = DB_get_all_user_names_open_for_games();
 
@@ -56,7 +57,6 @@ else
 	output_form_for_new_game($names);
 	echo "</div>\n";
 
-        display_user_menu($myid);
       }
     else
       {
@@ -72,7 +72,7 @@ else
 	/* the person who sets up the game has to be one of the players */
 	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>";
+	    echo '<div class="message">'."You need to be one of the players to start a <a href=\"$INDEX?action=new\">new game</a>.</div>\n";
 	    return;
 	  }
 
@@ -80,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);
@@ -90,7 +91,7 @@ else
 	/* this is used to check if the player names are all ok */
 	if($EmailA=="" || $EmailB=="" || $EmailC=="" || $EmailD=="")
 	  {
-	    echo "couldn't find one of the names, please start a new game";
+	    echo _("couldn't find one of the names, please start a new game");
 	    return;
 	  }
 
@@ -142,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");
@@ -189,24 +190,26 @@ else
 	  DB_query("INSERT INTO Hand_Card VALUES (NULL, '$hand_idD', '".$randomNR[$i]."', 'false')");
 
 	/* send out email, TODO: check for error with email */
-	$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".
-	  "".$HOST.$INDEX."?action=game&me=";
-
-	$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";
+
+	$users =  array( $useridA => $hashA, $useridB => $hashB, $useridC => $hashC, $useridD => $hashD );
+	foreach ( $users as $uid => $hash )
+	  {
+	     set_language($uid,'uid');
+	     $message = _('You are invited to play a game of DoKo.')."\n".
+	       _('Please, place comments and bug reports here:')."\n$WIKI\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".
+	       "".$HOST.$INDEX."?action=game&me=";
+
+	     mymail($uid, $gameid, GAME_NEW, $message.$hash."\n\n");
+	  };
+        set_language($myid,'uid');
+
+	echo '<div class="message">'._('You started a new game. The emails have been sent out!')."</div>\n";
         display_user_menu($myid);
       }
   }