LAYOUT: add names of players to end of score table for long sessions

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

diff --git a/include/game.php b/include/game.php
index 6141ab231e699bc3815c32cce1738602773ada7f..8d07b839f39042ff2fdf53c7c473f5facc9d695d 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))
@@ -131,41 +139,41 @@ if($session)
     switch($RULES['dullen'])
       {
       case 'none':
-       echo "<img class=\"rulesicon\" alt=\"not ten of hearts\" src=\"pics/button/no-ten-of-hearts.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"not ten of hearts\" src=\"pics/button/no-ten-of-hearts.png\"/>\n"; break;
       case 'firstwins':
-       echo "<img class=\"rulesicon\" alt=\"ten of hearts\" src=\"pics/button/ten-of-hearts.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"ten of hearts\" src=\"pics/button/ten-of-hearts.png\"/>\n"; break;
       case 'secondwins':
-       echo "<img class=\"rulesicon\" alt=\"second ten of hearts\" src=\"pics/button/second-ten-of-hearts.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"second ten of hearts\" src=\"pics/button/second-ten-of-hearts.png\"/>\n"; break;
       }
     switch($RULES['schweinchen'])
       {
       case 'none':
-       echo "<img class=\"rulesicon\" alt=\"no schweinchen\" ".
+       echo "  <img class=\"rulesicon\" alt=\"no schweinchen\" ".
          "src=\"pics/button/no-schweinchen.png\"/>\n"; break;
       case 'both':
-       echo "<img class=\"rulesicon\" alt=\"two schweinchen \" ".
+       echo "  <img class=\"rulesicon\" alt=\"two schweinchen \" ".
          "src=\"pics/button/two-schweinchen.png\"/>\n"; break;
       case 'second':
-       echo "<img class=\"rulesicon\" alt=\"second schweinchen\" ".
+       echo "  <img class=\"rulesicon\" alt=\"second schweinchen\" ".
          "src=\"pics/button/second-schweinchen.png\"/>\n"; break;
       case 'secondaftercall':
-       echo "<img class=\"rulesicon\" alt=\"second schweinchen after call\" ".
+       echo "  <img class=\"rulesicon\" alt=\"second schweinchen after call\" ".
          "src=\"pics/button/second-schweinchen-after-call.png\"/>\n"; break;
       }
     switch($RULES['call'])
       {
       case '1st-own-card':
-       echo "<img class=\"rulesicon\" alt=\"1st-own-card\" src=\"pics/button/1st-own-card.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"1st-own-card\" src=\"pics/button/1st-own-card.png\"/>\n"; break;
       case '5th-card':
-       echo "<img class=\"rulesicon\" alt=\"5th-card\" src=\"pics/button/5th-card.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"5th-card\" src=\"pics/button/5th-card.png\"/>\n"; break;
       case '9-cards':
-       echo "<img class=\"rulesicon\" alt=\"9-cards\" src=\"pics/button/9-cards.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"9-cards\" src=\"pics/button/9-cards.png\"/>\n"; break;
       }
-    echo " <div>\n";
+    echo "  <div>\n";
     echo "       10ofhearts : {$RULES['dullen']}      <br />\n";
     echo "       schweinchen: {$RULES['schweinchen']} <br />\n";
     echo "       call:        {$RULES['call']}        <br />\n";
-    echo "    </div>\n  </div>\n";
+    echo "  </div>\n  </div>\n";
     echo "  <div class=\"sessionscore\">Score \n";
     $score   = generate_score_table($session);
     echo format_score_table_html($score,$myid);
@@ -184,7 +192,7 @@ if($session)
       echo "This is game number $j of <a href=\"{$INDEX}?action=game&amp;me=$lasthash\">$i</a> in session $session.";
     else
       echo "This is game number $j of $i in session $session.";
-    echo "</div>\n";
+    echo "\n</div>\n";
   }
 
 /* display the table and the names */
@@ -1759,7 +1767,7 @@ switch($mystatus)
 
                  $message .= "Score Table:\n";
                  $message .= format_score_table_ascii($score);
-                 $message .= "Use these links to have a look at game ".DB_format_gameid($gameid).": \n";
+                 $message .= "\nUse these links to have a look at game ".DB_format_gameid($gameid).": \n";
 
                  /* send out final email */
                  $all = array();
@@ -1937,17 +1945,33 @@ 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";
 
 if($gamestatus == 'play' )
-  output_form_calls($me);
-
+  {
+    $myparty = DB_get_party_by_hash($me);
+    output_form_calls($me,$myparty);
+  }
 /* get time from the last action of the game */
 $r = DB_query_array("SELECT mod_date from Game WHERE id='$gameid' " );
 $gameend = time() - strtotime($r[0]);