X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=4f506f5b5b26eb5a19c557c12fe3935912769fa7;hp=ceed8bbba49d25191fe4cf940d9358b8d7d95c3e;hb=bf9a638ffd9b65d18b682e8b3e9bf19f798181cb;hpb=be7fad04dae48d5fa0c209b84be3e9cf9b763472

diff --git a/include/game.php b/include/game.php
index ceed8bb..4f506f5 100644
--- a/include/game.php
+++ b/include/game.php
@@ -112,18 +112,28 @@ echo "<form action=\"index.php?action=game&amp;me=$me\" method=\"post\">\n";
 /* output extra division in case this game is part of a session */
 if($session)
   {
-    echo "<div class=\"session\">\n".
-      "This game is part of session $session: \n";
+    echo "<div class=\"session\">\n";
+    echo "  <div class=\"sessionrules\">Rules (+icons fur rules) \n";
+    echo "    <div>\n";
+    echo "       10ofhearts : ".$RULES["dullen"]      ."<br />\n";
+    echo "       schweinchen: ".$RULES["schweinchen"] ."<br />\n";
+    echo "       call:        ".$RULES["call"]        ."<br />\n";
+    echo "    </div>\n  </div>\n";
+    echo "  <div class=\"sessionscore\">Score \n";
+    $score   = generate_score_table($session);
+    echo format_score_table_html($score,$myid);
+    echo "  </div>\n";
     $hashes = DB_get_hashes_by_session($session,$myid);
     $i = 1;
     foreach($hashes as $hash)
       {
-	if($hash == $me)
-	  echo "$i \n";
-	else
-	  echo "<a href=\"".$INDEX."?action=game&amp;me=".$hash."\">$i</a> \n";
-	$i++;
+        if($hash == $me)
+	  $j=$i;
+        $i++;
+	$lasthash=$hash;
       }
+    $i--;
+    echo "This is game number $j of <a href=\"".$INDEX."?action=game&amp;me=$lasthash\">$i</a> in session $session.";
     echo "</div>\n";
   }
 
@@ -155,7 +165,7 @@ switch($mystatus)
     else
       {
 	/* check the result, if player wants to join, got next stage, else cancel game */
-	if($_REQUEST["in"] == "no" && !$skip)
+	if(!$skip && $_REQUEST["in"] == "no" )
 	  {
 	    /* cancel the game */
 	    $message = "Hello, \n\n".
@@ -214,7 +224,7 @@ switch($mystatus)
 		     DB_set_player_by_gameid($gameid,$who);
 
 		     $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
-		     "Use this link to go the game: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ;
+		     "Use this link to go the game: ".$HOST.$INDEX."?action=game&amp;me=".$hash."\n\n" ;
 		     mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
 		    */
 		  }
@@ -1045,7 +1055,7 @@ switch($mystatus)
 		       "WHERE Trick.game_id='".$gameid."' ".
 		       "GROUP BY Trick.id, sequence ".
 		       "ORDER BY Trick.id, sequence  ASC");
-    $trickNR   = 1;
+    $trickNR   = 0;
     $lasttrick = DB_get_max_trickid($gameid);
 
     $play = array(); /* needed to calculate winner later  */
@@ -1061,7 +1071,7 @@ switch($mystatus)
     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";
+	     "    <div class=\"trick\" id=\"trick0\">\n";
 	$show = 1;
 	for($mypos=1;$mypos<5;$mypos++)
 	  {
@@ -1089,6 +1099,10 @@ switch($mystatus)
 	$comment = $r[4];
 	$user    = $r[6];
 
+	/* count number of tricks */
+	if($seq==1)
+	  $trickNR++;
+
 	/* check if first schweinchen has been played */
 	if( $GAME['schweinchen-who'] && ($r[0] == 19 || $r[0] == 20) )
 	  if(!$GAME['schweinchen-first'])
@@ -1136,7 +1150,6 @@ switch($mystatus)
 	/* end of trick? */
 	if($seq==4)
 	  {
-	    $trickNR++;
 	    echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
 	  }
       }
@@ -1646,35 +1659,9 @@ switch($mystatus)
 
 		  $session = DB_get_session_by_gameid($gameid);
 		  $score = generate_score_table($session);
-		  /* convert html to ascii */
-		  $score = str_replace("<div class=\"scoretable\">\n<table class=\"score\">\n <tr>\n","",$score);
-		  $score = str_replace("</table></div>\n","",$score);
-		  $score = str_replace("\n","",$score);
-		  $score = str_replace(array("<tr>","</tr>","<td>","</td>"),array("","\n","","|"),$score);
-		  $score = explode("\n",$score);
-
-		  $header = array_slice($score,0,1);
-		  $header = explode("|",$header[0]);
-		  for($i=0;$i<sizeof($header);$i++)
-		    $header[$i]=str_pad($header[$i],6," ",STR_PAD_BOTH);
-		  $header = implode("|",$header);
-		  $header.= "\n------+------+------+------+------+\n";
-		  if(sizeof($score)>5) $header.=   "                ...   \n";
-
-		  if(sizeof($score)>5) $score = array_slice($score,-5,5);
-		  for($i=0;$i<sizeof($score);$i++)
-		    {
-		      $line = explode("|",$score[$i]);
-		      for($j=0;$j<sizeof($line);$j++)
-			$line[$j]=str_pad($line[$j],6," ",STR_PAD_LEFT);
-		      $score[$i] = implode("|",$line);
-		    }
-
-		  $score = implode("\n",$score);
-		  $score = $header.$score;
 
 		  $message .= "Score Table:\n";
-		  $message .= $score;
+		  $message .= format_score_table_ascii($score);
 
 		  /* send out final email */
 		  $all = array();
@@ -1736,13 +1723,14 @@ switch($mystatus)
 	}
 
       echo "  <li onclick=\"hl_prev();\" class=\"old\"><a href=\"#\">prev</a></li>\n";
-      echo "  <li onclick=\"hl_next();\" class=\"old\"><a href=\"#\">next</a></li>\n</ul>\n"; /* end ul tricks*/
+      echo "  <li onclick=\"hl_next();\" class=\"old\"><a href=\"#\">next</a></li>\n";
+      echo "</ul>\n"; /* end ul tricks*/
 
       echo "<div class=\"notes\"> Personal notes: <br />\n";
       $notes = DB_get_notes_by_userid_and_gameid($myid,$gameid);
       foreach($notes as $note)
 	echo "$note <hr />\n";
-      echo "Insert note:<input name=\"note\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
+      echo "<input name=\"note\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
       echo "</div> \n";
 
       $mycards = DB_get_hand($me);
@@ -1865,15 +1853,6 @@ switch($mystatus)
       /* display rule set for this game */
     echo "<div class=\"gameinfo\">\n";
 
-    if($gamestatus != 'pre')
-      echo " Gametype: $GT <br />\n";
-
-    echo "Rules: <br />\n";
-    echo "10ofhearts : ".$RULES["dullen"]      ."<br />\n";
-    echo "schweinchen: ".$RULES["schweinchen"] ."<br />\n";
-    echo "call:        ".$RULES["call"]        ."<br />\n";
-
-    echo "<hr />\n";
     if($gamestatus == 'play' )
       output_form_calls($me);
 
@@ -1884,15 +1863,9 @@ switch($mystatus)
     if($gamestatus == 'play' || $gameend < 60*60*24*7)
       {
 	echo "<br />\nA short comment:<input name=\"comment\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
-	echo "<hr />";
       }
 
-    echo "<input type=\"submit\" value=\"submit\" />\n<hr />\n";
-
-    $session = DB_get_session_by_gameid($gameid);
-    $score   = generate_score_table($session);
-
-    echo $score;
+    echo "<input type=\"submit\" value=\"submit\" />\n";
 
     echo "</div>\n";