X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=cef2c6537c2a11141a38ac387f546943f8624b1b;hp=b8963d2fc5134aac1a1d782a4d4371a82b1b5e3b;hb=e9a0778e2270c200bdb77034a56c7c613606d737;hpb=189a8296e5f6ba47e87167083cff9cb3e1d0d03b

diff --git a/include/game.php b/include/game.php
index b8963d2..cef2c65 100644
--- a/include/game.php
+++ b/include/game.php
@@ -49,7 +49,6 @@ global $GAME,$RULES,$CARDS;
 $gameid   = DB_get_gameid_by_hash($me);
 $myname   = DB_get_name('hash',$me);
 $mystatus = DB_get_status_by_hash($me);
-$origmystatus = DB_get_status_by_hash($me); /* to show "it's your turn" menu when game has just finished */
 $mypos    = DB_get_pos_by_hash($me);
 $myhand   = DB_get_handid('hash',$me);
 $myparty  = DB_get_party_by_hash($me);
@@ -175,6 +174,30 @@ if(myisset('call')  && $_REQUEST['call']  == '0' && can_call(0,$me))
   }
 
 
+
+/*****************************************************************
+ * output other games where it is the users turn
+ * make sure that the people looking at old games don't see the wrong games here
+ *****************************************************************/
+
+if( $gamestatus != 'gameover'  && isset($_SESSION['id']) )
+  {
+    /* game isn't over, only valid user can get here, so show menu */
+    display_user_menu($myid, $me);
+  }
+else if( $mystatus == 'gameover' && isset($_SESSION['id']) )
+  {
+    /* user is looking at someone else's game, show the menu for the correct user */
+    display_user_menu($_SESSION['id'],$me);
+  }
+else
+  {
+    echo "<div class=\"usermenu\">\n";
+    echo "It's your turn in these games: \n";
+    echo "Please log in to see this information.\n";
+    echo "</div>\n\n";
+  }
+
 /*****************************************************************
  * output extra division in case this game is part of a session
  *****************************************************************/
@@ -308,6 +331,83 @@ if($mystatus!='gameover')
      DB_update_user_timestamp($_SESSION['id']);
 
 
+/******************************************************************************
+ * Output menu for selecting tricks
+ ******************************************************************************/
+
+switch($mystatus)
+  {
+  case 'start':
+    break;
+  case 'init':
+  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>\n</ul>\n";  /* end div trick, end li trick , end tricks*/
+    /* end displaying sickness */
+    break;
+  case 'poverty':
+    /* output pre-game trick in case user reloads,
+     * only needs to be done when a team has been formed */
+    if($myparty=='re' || $myparty=='contra')
+      {
+	echo "\n<ul class=\"tricks\">\n";
+
+	$mygametype =  DB_get_gametype_by_gameid($gameid);
+
+	echo "  <li onclick=\"hl('0');\" class=\"current\"><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 */
+    break;
+  case 'play':
+  case 'gameover':
+
+    echo "\n<ul class=\"tricks\">\n";
+
+    /* output vorbehalte */
+    $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=\"old\"><a href=\"#\">Pre</a></li>\n";
+
+    $result = DB_query("SELECT Trick.id ".
+		       "FROM Trick ".
+		       "WHERE Trick.game_id='".$gameid."' ".
+		       "GROUP BY Trick.id ".
+		       "ORDER BY Trick.id ASC");
+    $trickNR   = 1;
+    $lasttrick = DB_get_max_trickid($gameid);
+
+    /* output tricks */
+    while($r = DB_fetch_array($result))
+      {
+	$trick=$r[0];
+	if($trick!=$lasttrick)
+	  echo "  <li onclick=\"hl('$trickNR');\" class=\"old\"><a href=\"#\">"._('Trick')." $trickNR</a></li>\n";
+	else if($trick==$lasttrick)
+	  echo "  <li onclick=\"hl('$trickNR');\" class=\"current\"><a href=\"#\">"._('Trick')." $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";
+
+    /* 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 "</ul>\n\n";
+
+    break;
+  default:
+  }
+
+
 /******************************************************************************
  * Output tricks played, table, messages, and cards (depending on game status)
  ******************************************************************************/
@@ -316,7 +416,68 @@ if($mystatus!='gameover')
 echo "<form action=\"index.php?action=game&amp;me=$me\" method=\"post\">\n";
 
 /* display the table and the names */
-display_table();
+display_table_begin();
+
+
+/******************************
+ * Output pre-trick if needed *
+ ******************************/
+
+switch($mystatus)
+  {
+  case 'start':
+    break;
+  case 'init':
+  case 'check':
+    /* output sickness of other playes, in case they already selected and are sitting in front of the current player */
+    echo "\n<div class=\"tricks\">\n";
+    echo "    <div class=\"trick\" id=\"trick0\">\n";
+
+    for($pos=1;$pos<5;$pos++)
+      {
+	$usersick   = DB_get_sickness_by_pos_and_gameid($pos,$gameid);
+	$userid     = DB_get_userid('gameid-position',$gameid,$pos);
+	$userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
+
+	if($userstatus=='start' || $userstatus=='init')
+	  echo " <div class=\"vorbehalt".($pos-1)."\"> still needs <br />to decide </div>\n"; /* show this to everyone */
+	else
+	  if($usersick!=NULL) /* in the init-phase we only showed players with $pos<$mypos, now we can show all */
+	    echo " <div class=\"vorbehalt".($pos-1)."\"> sick </div>\n";
+	  else
+	    echo " <div class=\"vorbehalt".($pos-1)."\"> healthy </div>\n";
+      }
+    echo "    </div>\n  </div>\n";  /* end div trick, end li trick , end tricks*/
+    /* end displaying sickness */
+    break;
+  case 'poverty':
+    /* output pre-game trick in case user reloads,
+     * only needs to be done when a team has been formed */
+    if($myparty=='re' || $myparty=='contra')
+      {
+	echo "\n<ul class=\"tricks\">\n";
+
+	$mygametype =  DB_get_gametype_by_gameid($gameid);
+
+	echo "    <div class=\"trick\" id=\"trick0\">\n";
+
+	/* get information so show the cards that have been handed over in a poverty game */
+	output_exchanged_cards();
+
+	echo "    </div>\n  </div>\n\n";  /* end div trick, end li trick , end ul tricks */
+      }
+    /* end output pre-game trick */
+    break;
+  case 'play':
+  case 'gameover':
+
+    /* taken care further down */
+    break;
+  default:
+  }
+
+
+
 
 /* mystatus gets the player through the different stages of a game.
  * start:    does the player want to play?
@@ -339,6 +500,7 @@ $cards_status = CARDS_EMPTY;
  */
 $messages = array();
 
+
 switch($mystatus)
   {
   case 'start':
@@ -406,28 +568,6 @@ switch($mystatus)
      ***************************/
     if(!myisset('solo','wedding','poverty','nines','lowtrump') )
       {
-	/* 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".
-	  "    <div class=\"trick\" id=\"trick0\">\n";
-
-	for($pos=1;$pos<5;$pos++)
-	  {
-	    $usersick   = DB_get_sickness_by_pos_and_gameid($pos,$gameid);
-	    $userid     = DB_get_userid('gameid-position',$gameid,$pos);
-	    $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
-
-	    if($userstatus=='start' || $userstatus=='init')
-	      echo " <div class=\"vorbehalt".($pos-1)."\"> still needs <br/ > to decide </div>\n"; /* show this to everyone */
-	    else
-	      if($usersick!=NULL && $pos<=$mypos ) /* only show this for people sitting before the player */
-		echo " <div class=\"vorbehalt".($pos-1)."\"> sick </div>\n";
-	      else if($usersick==NULL && $pos<=$mypos)
-		echo " <div class=\"vorbehalt".($pos-1)."\"> healthy </div>\n";
-	  }
-	echo "    </div>\n  </li>\n</ul>\n";  /* end div trick, end li trick , end tricks*/
-	/* end displaying sickness */
-
 	$mycards = DB_get_hand($me);
 	output_check_for_sickness($me,$mycards);
 
@@ -524,28 +664,6 @@ switch($mystatus)
      * this can therefore only be handled once all players finished the last stage
      */
 
-    /* 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".
-      "    <div class=\"trick\" id=\"trick0\">\n";
-
-    for($pos=1;$pos<5;$pos++)
-      {
-	$usersick   = DB_get_sickness_by_pos_and_gameid($pos,$gameid);
-	$userid     = DB_get_userid('gameid-position',$gameid,$pos);
-	$userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
-
-	if($userstatus=='start' || $userstatus=='init')
-	  echo " <div class=\"vorbehalt".($pos-1)."\"> still needs <br />to decide </div>\n"; /* show this to everyone */
-	else
-	  if($usersick!=NULL) /* in the init-phase we only showed players with $pos<$mypos, now we can show all */
-	    echo " <div class=\"vorbehalt".($pos-1)."\"> sick </div>\n";
-	  else
-	    echo " <div class=\"vorbehalt".($pos-1)."\"> healthy </div>\n";
-      }
-    echo "    </div>\n  </li>\n</ul>\n";  /* end div trick, end li trick , end tricks*/
-    /* end displaying sickness */
-
     $messages[] = _('Checking if someone else selected solo, nines, wedding or poverty.');
 
     /* check if everyone has reached this stage */
@@ -857,24 +975,6 @@ switch($mystatus)
 	  };
       }
 
-    /* output pre-game trick in case user reloads,
-     * only needs to be done when a team has been formed */
-    if($myparty=='re' || $myparty=='contra')
-      {
-	echo "\n<ul class=\"tricks\">\n";
-
-	$mygametype =  DB_get_gametype_by_gameid($gameid);
-
-	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();
-
-	echo "    </div>\n  </li>\n</ul>\n\n";  /* end div trick, end li trick , end ul tricks */
-      }
-    /* end output pre-game trick */
-
     /* get hand */
     $mycards = DB_get_hand($me);
 
@@ -1248,7 +1348,7 @@ switch($mystatus)
     $pos  = DB_get_startplayer_by_gameid($gameid)-1;
     $firstcard = ''; /* first card in a trick */
 
-    echo "\n<ul class=\"tricks\">\n";
+    echo "\n<div class=\"tricks\">\n";
 
     /* output vorbehalte */
     $mygametype = DB_get_gametype_by_gameid($gameid);
@@ -1256,15 +1356,15 @@ switch($mystatus)
     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";
+	  echo "    <div class=\"trick\" id=\"trick0\">\n";
 
 	  /* 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";  /* end div trick, end li trick */
 	}
 
+
     /* output tricks */
     while($r = DB_fetch_array($result))
       {
@@ -1294,15 +1394,13 @@ switch($mystatus)
 	    if($trick!=$lasttrick)
 	      {
 		/* start of an old trick? */
-		echo "  <li onclick=\"hl('$trickNR');\" class=\"old\"><a href=\"#\">"._('Trick')." $trickNR</a>\n".
-		  "    <div class=\"trick\" id=\"trick".$trickNR."\">\n".
+		echo  "    <div class=\"trick\" id=\"trick".$trickNR."\">\n".
 		  "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
 	      }
 	    else if($trick==$lasttrick)
 	      {
 		/* start of a last trick? */
-		echo "  <li onclick=\"hl('$trickNR');\" class=\"current\"><a href=\"#\">"._('Trick')." $trickNR</a>\n".
-		  "    <div class=\"trick\" id=\"trick".$trickNR."\">\n".
+		echo "    <div class=\"trick\" id=\"trick".$trickNR."\">\n".
 		  "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
 	      };
 
@@ -1326,7 +1424,7 @@ switch($mystatus)
 	if($seq==4)
 	  {
 	    $winner    = get_winner($play,$gametype); /* returns the position */
-	    echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+	    echo "    </div>\n";  /* end div trick, end li trick */
 	  }
       }
 
@@ -1564,8 +1662,7 @@ switch($mystatus)
 	    $pos = DB_get_pos_by_hash($me);
 	    if($sequence==1)
 	      {
-		echo "  <li onclick=\"hl('".($tricknr)."');\" class=\"current\"><a href=\"#\">"._('Trick').' '.($tricknr)."</a>\n".
-		  "    <div class=\"trick\" id=\"trick".($tricknr)."\">\n".
+		echo "    <div class=\"trick\" id=\"trick".($tricknr)."\">\n".
 		  "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
 	      }
 
@@ -1577,7 +1674,7 @@ switch($mystatus)
 	      echo "\n        <span class=\"comment\"> ".$comment."</span>\n";
 	    echo "      </div>\n";
 
-	    echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+	    echo "    </div>\n";  /* end div trick, end li trick */
 
 	    /*check if we still have cards left, else set status to gameover */
 	    if(sizeof(DB_get_hand($me))==0)
@@ -1868,13 +1965,12 @@ switch($mystatus)
       }
 
     if($seq!=4 && $trickNR>=1 && !(myisset('card') && $myturn) )
-      echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+      echo "    </div>\n";  /* end div trick, end li trick */
 
     /* display points in case game is over */
     if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' )
       {
-	echo "  <li onclick=\"hl('13');\" class=\"current\"><a href=\"#\">"._('Score')."</a>\n".
-	  "    <div class=\"trick\" id=\"trick13\">\n";
+	echo "    <div class=\"trick\" id=\"trick13\">\n";
 	/* add pic for re/contra
 	 "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";*/
 
@@ -1900,39 +1996,37 @@ switch($mystatus)
 			   " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
 			   " WHERE Hand.game_id='$gameid'".
 			   " GROUP BY Hand.party" );
-	echo "<div class=\"total\">\n  Totals:<br />\n";
+	echo "    <div class=\"total\">\n  Totals:<br />\n";
 	while( $r = DB_fetch_array($result))
-	  echo "  ".$r[0]." ".$r[1]."<br />\n";
+	  echo "      ".$r[0]." ".$r[1]."<br />\n";
 
 	$queryresult = DB_query("SELECT timediff(mod_date,create_date) ".
 				" FROM Game WHERE id='$gameid'");
 	$r = DB_fetch_array($queryresult);
-	echo "  <p>This game took ".$r[0]." hours.</p>\n";
+	echo "      <p>This game took ".$r[0]." hours.</p>\n";
 
-	echo "  <div class=\"re\">\n   Points Re: <br />\n";
+	echo "      <div class=\"re\">\n   Points Re: <br />\n";
 	$queryresult = DB_query("SELECT score FROM Score ".
 				"  WHERE game_id=$gameid AND party='re'".
 				" ");
 	while($r = DB_fetch_array($queryresult) )
-	  echo "   ".$r[0]."<br />\n";
-	echo "  </div>\n";
+	  echo "       ".$r[0]."<br />\n";
+	echo "      </div>\n";
 
-	echo "  <div class=\"contra\">\n   Points Contra: <br />\n";
+	echo "      <div class=\"contra\">\n   Points Contra: <br />\n";
 	$queryresult = DB_query("SELECT score FROM Score ".
 				"  WHERE game_id=$gameid AND party='contra'".
 				" ");
 	while($r = DB_fetch_array($queryresult) )
-	  echo "   ".$r[0]."<br />\n";
-	echo "  </div>\n";
+	  echo "       ".$r[0]."<br />\n";
+	echo "      </div>\n";
 
-	echo "</div>\n";
+	echo "    </div>\n";
 
-	echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+	echo "    </div>\n";  /* end div trick, end li trick */
       }
 
-    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";
-    echo "</ul>\n"; /* end ul tricks*/
+    echo "</div>\n"; /* end ul tricks*/
 
     if($myturn && !myisset('card') && $mystatus=='play' )
       {
@@ -1965,6 +2059,9 @@ switch($mystatus)
     myerror("error in testing the status");
   } /*end of output: tricks, table, messages, card */
 
+/* display the 2nd half of table and the names */
+display_table_end();
+
 /**************
  * show cards *
  **************/
@@ -2111,33 +2208,6 @@ if( sizeof($messages) )
  * Comments, re/contra calls, user menu
  ***********************************************/
 
-/* output other games where it is the users turn
- * make sure that the people looking at old games don't see the wrong games here
- */
-if( $gamestatus != 'gameover' )
-  {
-    /* game isn't over, only valid user can get here, so show menu */
-    display_user_menu($myid);
-  }
-else if( $origmystatus != 'gameover' )
-  {
-    /* user just played the very last card, game is now over, it's still ok to show the menu though */
-    display_user_menu($myid);
-  }
-else if( $mystatus == 'gameover'
-	 && isset($_SESSION['id']) )
-  {
-    /* user is looking at someone else's game, show the menu for the correct user */
-    display_user_menu($_SESSION['id']);
-  }
-else
-  {
-    echo "<div class=\"usermenu\">\n";
-    echo "It's your turn in these games:<br />\n";
-    echo "Please log in to see this information.\n";
-    echo "</div>\n\n";
-  }
-
 /*
  * display gameinfo: re/contra, comment-box, play-card button, games played by others
  */