LAYOUT: fixed the login screen

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

diff --git a/include/game.php b/include/game.php
index afe61446dd1dec58f7633e2730eb01cf2d45a067..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))
@@ -1759,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
@@ -1938,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";