BUGFIX: fix error when user is not logged in, but tries to access his home page

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

diff --git a/include/game.php b/include/game.php
index ec1be1254f8411dd8655d90355240eb09f8a767b..ae7d6f7c542fd019d29b617cecc7c9b30cada64f 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -71,7 +71,10 @@ $GT         = $gametype;
 if($gametype=='solo')
   {
     $gametype = DB_get_solo_by_gameid($gameid);
-    $GT  = $gametype.' '.$GT;
+    if($gametype=='silent')
+      $GT = 'normal';
+    else
+      $GT = $gametype.' '.$GT;
   }
 
 /* do we need to worry about Schweinchen?
@@ -334,9 +337,10 @@ if($session)
          echo "&nbsp;&nbsp;&nbsp;<a href=\"{$INDEX}?action=game&amp;me=$previous\">"._('previous')."</a> \n";
        if($next)
          echo "&nbsp;&nbsp;&nbsp;<a href=\"{$INDEX}?action=game&amp;me=$next\">"._('next')."</a> \n";
+
+       if($j != $i )
+         echo "&nbsp;&nbsp;&nbsp;<a href=\"{$INDEX}?action=game&amp;me=$lasthash\">"._('last')."</a> \n";
       }
-    if($j != $i )
-      echo "&nbsp;&nbsp;&nbsp;<a href=\"{$INDEX}?action=game&amp;me=$lasthash\">last</a> \n";
 
     echo "\n</div>\n";
   }
@@ -363,7 +367,7 @@ switch($mystatus)
   case 'check':
     /* output sickness of other playes, in case they already selected and are sitting in front of the current player */
     echo "\n<ul class=\"tricks\">\n";
-    echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n";
+    echo "  <li onclick=\"hl(0);\" class=\"active\" id=\"tricks0\"><a href=\"#\">Pre</a>\n";
 
     echo "    </li>\n</ul>\n";  /* end div trick, end li trick , end tricks*/
     /* end displaying sickness */
@@ -377,7 +381,7 @@ switch($mystatus)
 
        $mygametype =  DB_get_gametype_by_gameid($gameid);
 
-       echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n";
+       echo "  <li onclick=\"hl(0);\" class=\"active\"><a href=\"#\">Pre</a>\n";
        echo "  </li>\n</ul>\n\n";  /* end div trick, end li trick , end ul tricks */
       }
     /* end output pre-game trick */
@@ -392,7 +396,7 @@ switch($mystatus)
     $mygamesolo = DB_get_solo_by_gameid($gameid);
     if($mygametype != 'normal') /* only show when needed */
       if(!( $mygametype == 'solo' && $mygamesolo == 'silent') )
-       echo "  <li onclick=\"hl('0');\" class=\"old\"><a href=\"#\">Pre</a></li>\n";
+       echo "  <li onclick=\"hl(0);\" class=\"old\"><a href=\"#\">Pre</a></li>\n";
 
     $result = DB_query('SELECT Trick.id '.
                       'FROM Trick '.
@@ -407,19 +411,19 @@ switch($mystatus)
       {
        $trick=$r[0];
        if($trick!=$lasttrick)
-         echo "  <li onclick=\"hl('$trickNR');\" class=\"old\"><a href=\"#\">"._('Trick')." $trickNR</a></li>\n";
+         echo "  <li onclick=\"hl($trickNR);\" id=\"tricks$trickNR\"><a href=\"#\">$trickNR</a></li>\n";
        else if($trick==$lasttrick)
-         echo "  <li onclick=\"hl('$trickNR');\" class=\"current\"><a href=\"#\">"._('Trick')." $trickNR</a></li>\n";
+         echo "  <li onclick=\"hl($trickNR);\" id=\"tricks$trickNR\" class=\"active\"><a href=\"#\">$trickNR</a></li>\n";
        $trickNR++;
       }
 
     /* if game is over, also output link to Score tab */
     if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' )
-      echo "  <li onclick=\"hl('13');\" class=\"current\"><a href=\"#\">"._('Score')."</a></li>\n";
+      echo "  <li onclick=\"hl(13);\" id=\"tricks13\" class=\"active\"><a href=\"#\">"._('Score')."</a></li>\n";
 
     /* output previous/next buttons */
-    echo '  <li onclick="hl_prev();" ><button>'._('prev')."</button></li>\n";
-    echo '  <li onclick="hl_next();" ><button>'._('next')."</button></li>\n";
+    echo '  <li onclick="hl_prev();" id="prevtr"><a href="#">'._('prev')."</a></li>\n";
+    echo '  <li onclick="hl_next();" id="nexttr"><a href="#">'._('next')."</a></li>\n";
 
     echo "</ul>\n\n";