CLEANUP: fixed some invalid html

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

diff --git a/include/functions.php b/include/functions.php
index 31fc28646cd1d0ba19267910629b41a226bb6904..a338f388df0bb2822a654f3a13afb27e01d39a3a 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -847,7 +847,6 @@ function display_table ()
 function display_user_menu()
 {
   global $WIKI,$myid,$INDEX;
-  echo "<div class=\"usermenu\">\n";
 
   $result = DB_query("SELECT Hand.hash,Hand.game_id,Game.player from Hand".
                     " LEFT JOIN Game On Hand.game_id=Game.id".
@@ -861,6 +860,9 @@ function display_user_menu()
   $i=0;
   while( $r = DB_fetch_array($result))
     {
+      if($i==0)
+       echo "<div class=\"usermenu\">\n";
+
       $i++;
       echo "<a href=\"".$INDEX."?action=game&me=".$r[0]."\">game ".DB_format_gameid($r[1])." </a><br />\n";
       if($i>4)
@@ -870,7 +872,8 @@ function display_user_menu()
        }
     }
 
-  echo  "</div>\n";
+  if($i)
+    echo  "</div>\n";
   return;
 }
 
@@ -931,6 +934,8 @@ function generate_score_table($session)
 
 function generate_global_score_table()
 {
+  $return = array();
+
   /* get all ids */
   $gameids = DB_get_gameids_of_finished_games_by_session(0);
 
@@ -964,7 +969,6 @@ function generate_global_score_table()
        }
     }
 
-  echo "<table>\n <tr>\n";
   function cmp($a,$b)
   {
     if($a['nr']==0 ) return 1;
@@ -978,14 +982,15 @@ function generate_global_score_table()
     return ($a > $b) ? -1 : 1;
   }
   usort($player,"cmp");
+
   foreach($player as $pl)
     {
+      /* limit to players with at least 10 games */
       if($pl['nr']>10)
-       echo "  <tr><td>",$pl['name'],"</td><td>",round($pl['points']/$pl['nr'],3),"</td></tr>\n";
+       $return[] = array( $pl['name'], round($pl['points']/$pl['nr'],3) );
     }
-  echo "</table>\n";
 
-  return;
+  return $return;
 }