X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=eb66a987157c6bcd98ddbcf57f0ce343e7e7fcca;hp=aa2561699b15a43a74ec8b26f30b69da056b43ed;hb=8550cac6f9bedbd9219d898f7b3de731bf1cb2b2;hpb=4601624395d2f42086d058668b1b96778c8fcbb6

diff --git a/include/game.php b/include/game.php
index aa25616..eb66a98 100644
--- a/include/game.php
+++ b/include/game.php
@@ -531,7 +531,7 @@ switch($mystatus)
     $mycards = DB_get_hand($me);
     $mycards = mysort($mycards,$gametype);
 
-    /* output sickness of other playes, in case the already selected and are sitting in front of the current player */
+    /* 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 class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
     echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
@@ -1291,17 +1291,19 @@ switch($mystatus)
     echo '  <li class="nohighlight"> '._('Game').' '.DB_format_gameid($gameid).": </li>\n";
 
     /* output vorbehalte */
-    $mygametype =  DB_get_gametype_by_gameid($gameid);
-    if($mygametype != 'normal' && $mygametype != 'silent') /* only show when needed */
-      {
-	echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
-	     "    <div class=\"trick\" id=\"trick0\">\n";
+    $mygametype = DB_get_gametype_by_gameid($gameid);
+    $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=\"current\"><a href=\"#\">Pre</a>\n".
+	    "    <div class=\"trick\" id=\"trick0\">\n";
 
-	/* get information so show the cards that have been handed over in a poverty game */
-	output_exchanged_cards();
+	  /* get information so show the cards that have been handed over in a poverty game */
+	  output_exchanged_cards();
 
-	echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
-      }
+	  echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+	}
 
     /* output tricks */
     while($r = DB_fetch_array($result))
@@ -2095,41 +2097,51 @@ else
     echo "</div>\n";
   }
 
-/* display rule set for this game */
+/*
+ * display gameinfo: re/contra, comment-box, play-card button, games played by others
+ */
+
 echo "<div class=\"gameinfo\">\n";
 
+/* 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]);
+
+/* comment box */
+if($gamestatus == 'play' || $gameend < 60*60*24*7)
+  {
+    echo '  '._('A short comment').":<input name=\"comment\" type=\"text\" size=\"20\" maxlength=\"100\" />\n";
+  }
+
+/* re-contra */
 if($gamestatus == 'play' )
   {
     $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]);
 
+/* play-card button */
 if($gamestatus == 'play' || $gameend < 60*60*24*7)
   {
-    echo "<br />\n"._('A short comment').":<input name=\"comment\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
+    echo "  <input type=\"submit\" value=\""._('submit')."\" />\n";
   }
 
-echo "<input type=\"submit\" value=\""._('submit')."\" />\n";
-
 /* has this hand been played by others? */
 $other_game_ids = DB_played_by_others($gameid);
 if(sizeof($other_game_ids)>0 && $mystatus=='gameover')
   {
     $mypos = DB_get_pos_by_hash($me);
-    echo "<p>See how other played the same hand: <br />\n";
+    echo "  <p>See how other played the same hand: \n";
     foreach($other_game_ids as $id)
       {
 	$otherhash = DB_get_hash_from_game_and_pos($id,$mypos);
 	$othername = DB_get_name('hash',$otherhash);
-	echo "<a href=\"$INDEX?action=game&amp;me=$otherhash\">$othername</a><br />";
+	echo "    <a href=\"$INDEX?action=game&amp;me=$otherhash\">$othername</a> ";
       }
-    echo "</p>\n";
+    echo "  </p>\n";
   }
 
-echo "</div>\n";
+echo "</div>\n"; /* end gameinfo */
 
 echo "</form>\n";