NEW FEATURE: always show current score on main page

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

diff --git a/include/game.php b/include/game.php
index fb807c74ed4533da18ccdc4da77e2f8c159e9e14..086a2f9074501c9bbd98e3c23ba47ad0414cbc4d 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -174,11 +174,25 @@ if($session)
     echo "       schweinchen: {$RULES['schweinchen']} <br />\n";
     echo "       call:        {$RULES['call']}        <br />\n";
     echo "  </div>\n  </div>\n";
-    echo "  <div class=\"sessionscore\">Score \n";
+
+    /* show score */
     $score   = generate_score_table($session);
+    $tmpscore= $score;
+    $finalscore = array_pop($tmpscore);
+    $finalscore = $finalscore['players'];
+
+    echo "  <div class=\"sessionscore\">Score: \n";
+    foreach($finalscore as $user=>$value)
+      {
+       $name = DB_get_name('userid',$user);
+       echo " ".substr($name,0,2).": $value ";
+      }
     echo format_score_table_html($score,$myid);
     echo "  </div>\n";
+
+    /* figure out which game in a session we are in and link to the previous and next game if possible */
     $hashes = DB_get_hashes_by_session($session,$myid);
+    $next     = NULL;
     $i = 1;
     foreach($hashes as $hash)
       {
@@ -188,8 +202,24 @@ if($session)
        $lasthash=$hash;
       }
     $i--;
+
+    if($j>1)
+      $previous = $hashes[$j-2];
+    else
+      $previous = NULL;
+    if($j<$i)
+      $next = $hashes[$j];
+    else
+      $next = NULL;
+
     if(isset($_SESSION['id']) && $_SESSION['id']==$myid)
-      echo "This is game number $j of <a href=\"{$INDEX}?action=game&amp;me=$lasthash\">$i</a> in session $session.";
+      {
+       if($previous)
+         echo "<a href=\"{$INDEX}?action=game&amp;me=$previous\">previous game</a>&nbsp;&nbsp;&nbsp; \n";
+       echo "This is game number $j of <a href=\"{$INDEX}?action=game&amp;me=$lasthash\">$i</a> in session $session.\n";
+       if($next)
+         echo "&nbsp;&nbsp;&nbsp;<a href=\"{$INDEX}?action=game&amp;me=$next\">next game</a> \n";
+      }
     else
       echo "This is game number $j of $i in session $session.";
     echo "\n</div>\n";
@@ -1968,8 +1998,10 @@ else
 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]);