BUGFIX: didn't set next player correctly during startup

[e-DoKo.git] / index.php

diff --git a/index.php b/index.php
index fe674be6b6af6c05cbc87335490c7bf7ad233701..eb52e4e1d2826467f74476a3ade6cd9c10d0ebf2 100644 (file)
--- a/index.php
+++ b/index.php
@@ -313,8 +313,6 @@ else if(myisset("me"))
        exit();
       }
 
        exit();
       }
 

-    output_status();
-

     if(isset($_SESSION["name"]))
       output_status($_SESSION["name"]);
 
     if(isset($_SESSION["name"]))
       output_status($_SESSION["name"]);
 


@@ -835,7 +833,8 @@ else if(myisset("me"))
                    {
                      $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
                      $userhash = DB_get_hash_from_game_and_pos($gameid,$who);
                    {
                      $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
                      $userhash = DB_get_hash_from_game_and_pos($gameid,$who);

-                     DB_set_player_by_gameid($gameid,$who);
+                     $userid   = DB_get_userid_by_email($To);
+                     DB_set_player_by_gameid($gameid,$userid);

 
                      $message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
                        " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
 
                      $message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
                        " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;


@@ -915,7 +914,8 @@ else if(myisset("me"))
                            {
                              $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
                              $userhash = DB_get_hash_from_game_and_pos($gameid,$who);
                            {
                              $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
                              $userhash = DB_get_hash_from_game_and_pos($gameid,$who);

-                             DB_set_player_by_gameid($gameid,$who);
+                             $userid   = DB_get_userid_by_email($To);
+                             DB_set_player_by_gameid($gameid,$userid);

 
                              $message = "Someone has poverty, it's your turn to decide, ".
                                         "if you want to take the trump. Please visit:".
 
                              $message = "Someone has poverty, it's your turn to decide, ".
                                         "if you want to take the trump. Please visit:".


@@ -1156,6 +1156,31 @@ else if(myisset("me"))
       echo "\n<ul class=\"tricks\">\n";
       echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
 
       echo "\n<ul class=\"tricks\">\n";
       echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
 

+      /* output vorbehalte */
+      $mygametype =  DB_get_gametype_by_gameid($gameid);
+      if($mygametype != "normal") /* only show when needed */
+       {
+         echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
+           "    <div class=\"trick\" id=\"trick0\">\n";
+         $show = 1;
+         for($mypos=1;$mypos<5;$mypos++)
+           {
+             $usersick = DB_get_sickness_by_pos_and_gameid($mypos,$gameid);
+             if($usersick!=NULL)
+               {
+                 echo "      <div class=\"vorbehalt".($mypos-1)."\"> Vorbehalt <br />";
+                 if($show)
+                   echo " $usersick <br />";
+                 echo  " </div>\n";
+
+                 if($mygametype == $usersick)
+                   $show = 0;
+               }
+           }
+         echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+       }
+
+      /* output tricks */

       while($r = mysql_fetch_array($result,MYSQL_NUM))
        {
          $pos     = $r[1];
       while($r = mysql_fetch_array($result,MYSQL_NUM))
        {
          $pos     = $r[1];