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=db6b62da3474444b96348638220cc875363293ad;hb=94bbb934cb0bc65c72e2ab724f4bf99b3c7207be;hpb=cd4cbd4a1cce2c35a6a78b1b957c17389001b4b1

diff --git a/include/newgame.php b/include/newgame.php
index db6b62d..bce755e 100644
--- a/include/newgame.php
+++ b/include/newgame.php
@@ -1,4 +1,23 @@
 <?php
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 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
  */
@@ -8,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
   {
@@ -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();
+        display_user_menu($myid);
+	/* 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();
+
       }
     else
       {
@@ -43,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;
 	  }
 
@@ -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);
@@ -61,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;
 	  }
 
@@ -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,27 @@ 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".
-	  "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".
-	  "".$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);
-
-	echo "<div class=\"message\">You started a new game. The emails have been sent out!</div>\n";
-        display_user_menu();
+
+	$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);
       }
   }