BUGFIX: fixed some small typo/layout issues in the "game over" email

[e-DoKo.git] / include / game.php

diff --git a/include/game.php b/include/game.php
index 49957b121ec31c81e781425fafa632e87bec97b5..b2df36918e6624e94f8739a14e32764eac5d98d5 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -109,7 +109,15 @@ if( $mystatus!='gameover'  )
       if($note != '')
        DB_insert_note($note,$gameid,$myid);
     };
-output_user_notes($myid,$gameid,$mystatus);
+
+/* make sure that we don't show the notes to the wrong person
+ * (e.g. other people looking at an old game)
+ */
+if( $mystatus != 'gameover' ||
+    (  $mystatus == 'gameover' &&
+       isset($_SESSION['id'])  &&
+       $myid == $_SESSION['id']))
+  output_user_notes($myid,$gameid,$mystatus);
 
 /* handle calls */
 if(myisset('call')  && $_REQUEST['call']  == '120' && can_call(120,$me))
@@ -1324,7 +1332,11 @@ switch($mystatus)
                else
                  $GAME['schweinchen-second'] = 1; /* this must be the second fox */
 
-               if( ($GAME['schweinchen-second']==1 && $RULES['schweinchen']=='second') || $RULES['schweinchen']=='both')
+               if( $RULES['schweinchen']=='both' ||
+                   ($RULES['schweinchen']=='second' && $GAME['schweinchen-second']==1 )||
+                   ($RULES['schweinchen']=='secondaftercall' && $GAME['schweinchen-second']==1 &&
+                    (DB_get_call_by_hash($GAME['schweinchen-who']) || DB_get_partner_call_by_hash($GAME['schweinchen-who']) ))
+                 )
                  {
                    DB_insert_comment('Schweinchen! ',$playid,$myid);
                    $commentSchweinchen = 'Schweinchen! ';
@@ -1755,27 +1767,26 @@ switch($mystatus)
 
                  $message .= "Score Table:\n";
                  $message .= format_score_table_ascii($score);
+                 $message .= "\nUse these links to have a look at game ".DB_format_gameid($gameid).": \n";
 
                  /* send out final email */
                  $all = array();
 
-                 foreach($userids as $user)
-                   $all[] = DB_get_email('userid',$user);
-                 $To = implode(",",$all);
-
-                 $help = "\n\n (you can use reply all on this email to reach all the players.)\n";
-                 mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 1(2)",$message.$help);
-
                  foreach($userids as $user)
                    {
-                     $To   = DB_get_email('userid',$user);
+                     $all[] = DB_get_email('userid',$user);
+
+                     /* add links for all players */
                      $hash = DB_get_hash_from_gameid_and_userid($gameid,$user);
+                     $name = DB_get_name('userid',$user);
 
-                     $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ".
-                       $HOST.$INDEX."?action=game&me=".$hash."\n\n" ;
-                     if( DB_get_email_pref_by_uid($user) != 'emailaddict' )
-                       mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 2(2)",$link);
+                     $link = "$name: ".$HOST.$INDEX."?action=game&me=".$hash."\n" ;
+                     $message .= $link;
                    }
+                 $To = implode(",",$all);
+
+                 $message .= "\n\n (you can use reply all on this email to reach all the players.)\n";
+                 mymail($To,$EmailName."Game over (game ".DB_format_gameid($gameid).") ",$message);
              }
          }
        else
@@ -1871,9 +1882,15 @@ switch($mystatus)
 
        foreach($mycards as $card)
          {
+           /* display only cards that the player is allowed to play as links, the rest just display normal
+            * also check if we have both schweinchen, in that case only display on of them as playable
+            */
            if( ($followsuit && !same_type($card,$firstcard)) ||
-               ( (int)($card)==19 && ($RULES['schweinchen']=='second'||$RULES['schweinchen']=='secondaftercall')
-                 && $GAME['schweinchen-who']==$me && !$GAME['schweinchen-first'] )
+               ( (int)($card)==19 && !$GAME['schweinchen-first'] &&
+                 ($RULES['schweinchen']=='second'||
+                  ( $RULES['schweinchen']=='secondaftercall' &&
+                    (DB_get_call_by_hash($GAME['schweinchen-who']) || DB_get_partner_call_by_hash($GAME['schweinchen-who']) )))
+                 && $GAME['schweinchen-who']==$me  )
                )
              display_card($card,$PREF['cardset']);
            else
@@ -1928,10 +1945,24 @@ switch($mystatus)
   default:
     myerror("error in testing the status");
   }
-/* output left menu */
-display_user_menu();
 
-/* output right menu */
+/* output other games where it is the users turn
+ * make sure that the people looking at old games don't see the wrong games here
+ */
+if( $mystatus != 'gameover' )
+  display_user_menu($myid);
+else if(  $mystatus == 'gameover' &&
+       isset($_SESSION['id']) )
+  {
+    display_user_menu($_SESSION['id']);
+  }
+else
+  {
+    echo "<div class=\"usermenu\">\n";
+    echo "It's your turn in these games:<br />\n";
+    echo "Please log in to see this information.\n";
+    echo "</div>\n";
+  }
 
 /* display rule set for this game */
 echo "<div class=\"gameinfo\">\n";