BUGFIX: error in card dealing routine

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

diff --git a/include/functions.php b/include/functions.php
index f693abc38ad018b83d82e027d919a59b40fac388..9103c6f517fc9e19501fc2364f1283315e66f582 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -727,7 +727,7 @@ function can_call($what,$hash)
 
 function display_table ()
 {
-  global $gameid, $GT, $debug,$INDEX,$defaulttimezone;
+  global $gameid, $GT, $debug,$INDEX,$defaulttimezone,$session;
   global $RULES,$GAME,$gametype;
 
   $result = DB_query("SELECT  User.fullname as name,".
@@ -863,8 +863,8 @@ function display_table ()
        }
 
       echo "    <br />\n";
-      echo "    <span title=\"".date("Y-m-d H:i:s",$timenow).  "\">local time</span>\n";
-      echo "    <span title=\"".date("Y-m-d H:i:s",$lastlogin)."\">last login</span>\n";
+      echo "    <span title=\"local time: ".date("Y-m-d H:i:s",$timenow).  " ".
+                            "last login: ".date("Y-m-d H:i:s",$lastlogin)."\">time info</span>\n";
       echo "   </div>\n";
 
     }
@@ -939,11 +939,12 @@ function generate_score_table($session)
   foreach($gameids as $gameid)
     {
       $re_score = DB_get_score_by_gameid($gameid);
+      $gametype = DB_get_gametype_by_gameid($gameid);
       foreach($player as $id=>$points)
        {
          $party = DB_get_party_by_gameid_and_userid($gameid,$id);
          if($party == "re")
-           if(DB_get_gametype_by_gameid($gameid)=="solo")
+           if($gametype=="solo")
              $player[$id] += 3*$re_score;
            else
              $player[$id] += $re_score;
@@ -953,7 +954,7 @@ function generate_score_table($session)
       $score[$i]['gameid']  = $gameid ;
       $score[$i]['players'] = $player;
       $score[$i]['points']  = abs($re_score);
-      $score[$i]['solo']    = (DB_get_gametype_by_gameid($gameid)=="solo");
+      $score[$i]['solo']    = ($gametype=="solo");
 
       $i++;
     }
@@ -982,12 +983,14 @@ function generate_global_score_table()
   foreach($gameids as $gameid)
     {
       $re_score = DB_get_score_by_gameid($gameid);
+      $gametype = DB_get_gametype_by_gameid($gameid);
+
       /* TODO: this shouldn't loop over all players, just the 4 players that are in the game */
       foreach($player as $key=>$pl)
        {
          $party = DB_get_party_by_gameid_and_userid($gameid,$pl['id']);
          if($party == "re")
-           if(DB_get_gametype_by_gameid($gameid)=="solo")
+           if($gametype=="solo")
              $player[$key]['points'] += 3*$re_score;
            else
              $player[$key]['points'] += $re_score;
@@ -1070,39 +1073,60 @@ function format_score_table_html($score,$userid)
   if(sizeof($score)==0)
     return "";
 
-  $output = "<div class=\"scoretable\">\n<table class=\"score\">\n <thead>\n  <tr>\n";
+  $output = "<div class=\"scoretable\">\n<table class=\"score\">\n";
 
   /* output header */
-  $output.= "   <th> No </th>";
+  $header = "";
+  $header.= " <thead>\n  <tr>\n";
+  $header.= "   <th> No </th>";
   foreach($score[0]['players'] as $id=>$points)
     {
       $name = DB_get_name('userid',$id); /*TODO*/
-      $output.= "<th> ".substr($name,0,2)." </th>";
+      $header.= "<th> ".substr($name,0,2)." </th>";
     }
-  $output.="<th>P</th>\n  </tr>\n </thead>\n <tbody>\n";
+  $header.="<th>P</th>\n  </tr>\n </thead>\n";
 
+  /* use the same as footer */
+  $footer = "";
+  $footer.= " <tfoot>\n  <tr>\n";
+  $footer.= "   <td> No </td>";
+  foreach($score[0]['players'] as $id=>$points)
+    {
+      $name = DB_get_name('userid',$id); /*TODO*/
+      $footer.= "<td> ".substr($name,0,2)." </td>";
+    }
+  $footer.="<td>P</td>\n  </tr>\n </tfoot>\n";
+
+  /* body */
+  $body = "";
+  $body.= " <tbody>\n";
   $i=0;
   foreach($score as $game)
     {
       $i++;
-      $output.="  <tr>";
+      $body.="  <tr>";
       $userhash = DB_get_hash_from_gameid_and_userid($game['gameid'],$userid);
       /* create link to old games only if you are logged in and its your game*/
       if(isset($_SESSION['id']) && $_SESSION['id']==$userid)
-       $output.="  <td> <a href=\"".$INDEX."?action=game&amp;me=".$userhash."\">$i</a></td>";
+       $body.="  <td> <a href=\"".$INDEX."?action=game&amp;me=".$userhash."\">$i</a></td>";
       else
-       $output.="  <td>$i</td>";
+       $body.="  <td>$i</td>";
 
       foreach($game['players'] as $id=>$points)
-       $output.="<td>".$points."</td>";
-      $output.="<td>".$game['points'];
+       $body.="<td>".$points."</td>";
+      $body.="<td>".$game['points'];
 
       /* check for solo */
       if($game['solo'])
-       $output.= " S";
-      $output.="</td></tr>\n";
+       $body.= " S";
+      $body.="</td></tr>\n";
     }
 
+  $output.=$header;
+  if($i>12)
+    $output.=$footer;
+  $output.=$body;
+
   $output.=" </tbody>\n</table>\n</div>\n";
 
   return $output;