X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=6d47fc9517af6b665884dda628d7750d37d0c27c;hp=8d07b839f39042ff2fdf53c7c473f5facc9d695d;hb=3fd01c7b9fa78fb08ca1ad61c1de850b9a6b9870;hpb=9ea0c1fc3eb689bc8e0223595d42d2e3ecae4192

diff --git a/include/game.php b/include/game.php
index 8d07b83..6d47fc9 100644
--- a/include/game.php
+++ b/include/game.php
@@ -34,6 +34,7 @@ $myname   = DB_get_name('hash',$me);
 $mystatus = DB_get_status_by_hash($me);
 $mypos    = DB_get_pos_by_hash($me);
 $myhand   = DB_get_handid('hash',$me);
+$myparty  = DB_get_party_by_hash($me);
 $session  = DB_get_session_by_gameid($gameid);
 
 /* get prefs and save them in a variable*/
@@ -119,17 +120,50 @@ if( $mystatus != 'gameover' ||
        $myid == $_SESSION['id']))
   output_user_notes($myid,$gameid,$mystatus);
 
-/* handle calls */
+/* handle calls, output a comment to show when the call was made */
+/* initialize comments */
+$comment  =  '';
+
+/* check for calls, set comment */
 if(myisset('call')  && $_REQUEST['call']  == '120' && can_call(120,$me))
-  $result = DB_query("UPDATE Hand SET point_call='120' WHERE hash='$me' ");
+  {
+    $result = DB_query("UPDATE Hand SET point_call='120' WHERE hash='$me' ");
+    if($myparty=='re')
+      $comment .= "Re";
+    else if($myparty=='contra')
+      $comment .= "Contra";
+  }
 if(myisset('call')  && $_REQUEST['call']  == '90' && can_call(90,$me))
-  $result = DB_query("UPDATE Hand SET point_call='90'  WHERE hash='$me' ");
+  {
+    $result = DB_query("UPDATE Hand SET point_call='90'  WHERE hash='$me' ");
+    $comment .= "No 90";
+  }
 if(myisset('call')  && $_REQUEST['call']  == '60' && can_call(60,$me))
-  $result = DB_query("UPDATE Hand SET point_call='60'  WHERE hash='$me' ");
+  {
+    $result = DB_query("UPDATE Hand SET point_call='60'  WHERE hash='$me' ");
+    $comment .= "No 60";
+  }
 if(myisset('call')  && $_REQUEST['call']  == '30' && can_call(30,$me))
-  $result = DB_query("UPDATE Hand SET point_call='30'  WHERE hash='$me' ");
+  {
+    $result = DB_query("UPDATE Hand SET point_call='30'  WHERE hash='$me' ");
+    $comment .= "No 30";
+  }
 if(myisset('call')  && $_REQUEST['call']  == '0' && can_call(0,$me))
-  $result = DB_query("UPDATE Hand SET point_call='0'   WHERE hash='$me' ");
+  {
+    $result = DB_query("UPDATE Hand SET point_call='0'   WHERE hash='$me' ");
+    $comment .= "Zero";
+  }
+
+/* get information needed to submit comment */
+$playid = DB_get_current_playid($gameid);
+
+/* set comment */
+if($comment != '')
+  DB_insert_comment($comment,$playid,$myid);
+/* clear up */
+unset($comment);
+/* end check for calls */
+
 
 /* output extra division in case this game is part of a session */
 if($session)
@@ -174,11 +208,36 @@ if($session)
     echo "       schweinchen: {$RULES['schweinchen']} <br />\n";
     echo "       call:        {$RULES['call']}        <br />\n";
     echo "  </div>\n  </div>\n";
-    echo "  <div class=\"sessionscore\">Score \n";
+
+    /* show score */
     $score   = generate_score_table($session);
+    $tmpscore= $score;
+    $finalscore = array_pop($tmpscore);
+    $finalscore = $finalscore['players'];
+
+    echo "  <div class=\"sessionscore\">";
+    if($finalscore)
+      { 
+	echo "Score: \n";
+	/* output the final score on the front page */
+	foreach($finalscore as $user=>$value)
+	  {
+	    $name = DB_get_name('userid',$user);
+	    echo " ".substr($name,0,2).": $value ";
+	  }
+      }
+    else 
+      {
+	/* first game, no score yet */ 
+	echo "&nbsp;";
+      }
+
     echo format_score_table_html($score,$myid);
     echo "  </div>\n";
+
+    /* figure out which game in a session we are in and link to the previous and next game if possible */
     $hashes = DB_get_hashes_by_session($session,$myid);
+    $next     = NULL;
     $i = 1;
     foreach($hashes as $hash)
       {
@@ -188,8 +247,24 @@ if($session)
 	$lasthash=$hash;
       }
     $i--;
+
+    if($j>1)
+      $previous = $hashes[$j-2];
+    else
+      $previous = NULL;
+    if($j<$i)
+      $next = $hashes[$j];
+    else
+      $next = NULL;
+
     if(isset($_SESSION['id']) && $_SESSION['id']==$myid)
-      echo "This is game number $j of <a href=\"{$INDEX}?action=game&amp;me=$lasthash\">$i</a> in session $session.";
+      {
+	if($previous)
+	  echo "<a href=\"{$INDEX}?action=game&amp;me=$previous\">previous game</a>&nbsp;&nbsp;&nbsp; \n";
+	echo "This is game number $j of <a href=\"{$INDEX}?action=game&amp;me=$lasthash\">$i</a> in session $session.\n";
+	if($next)
+	  echo "&nbsp;&nbsp;&nbsp;<a href=\"{$INDEX}?action=game&amp;me=$next\">next game</a> \n";
+      }
     else
       echo "This is game number $j of $i in session $session.";
     echo "\n</div>\n";
@@ -232,8 +307,8 @@ switch($mystatus)
 	    $userids = DB_get_all_userid_by_gameid($gameid);
 	    foreach($userids as $user)
 	      {
-		$To = DB_get_email('userid',$user);
-		mymail($To,"$EmailName game ".DB_format_gameid($gameid)." canceled",$message);
+		$subject = 'Game '.DB_format_gameid($gameid).' canceled';
+		mymail($user,$subject,$message);
 	      }
 
 	    /* delete everything from the dB */
@@ -276,14 +351,13 @@ switch($mystatus)
 		  {
 		    /* email startplayer */
 		    /*
-		     $email       = DB_get_email('position-gameid',$startplayer,$gameid);
 		     $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
-		     $who         = DB_get_userid('email',$email);
+		     $who         = DB_get_userid('hash',$hash);
 		     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" ;
-		     mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
+		     mymail($who,"Ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
 		    */
 		  }
 	      }
@@ -525,8 +599,8 @@ switch($mystatus)
 	    $userids = DB_get_all_userid_by_gameid($gameid);
 	    foreach($userids as $user)
 	      {
-		$To = DB_get_email('userid',$user);
-		mymail($To,"$EmailName game ".DB_format_gameid($gameid)." canceled",$message);
+		$subject = 'Game '.DB_format_gameid($gameid).' canceled';
+		mymail($user,$subject,$message);
 	      }
 
 	    /* delete everything from the dB */
@@ -656,9 +730,8 @@ switch($mystatus)
 	if($gametype!='poverty' && $gametype!='dpoverty')
 	  {
 	    $startplayer = DB_get_startplayer_by_gameid($gameid);
-	    $email       = DB_get_email('position-gameid',$startplayer,$gameid);
 	    $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
-	    $who         = DB_get_userid('email',$email);
+	    $who         = DB_get_userid('hash',$hash);
 	    DB_set_player_by_gameid($gameid,$who);
 
 	    if($hash!=$me)
@@ -668,11 +741,12 @@ switch($mystatus)
 		    /* email startplayer */
 		    $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
 		      "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ;
-		    mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
+		    $subject = 'Ready, set, go... (game '.DB_format_gameid($gameid).')';
+		    mymail($who,$subject,$message);
 		  }
 	      }
 	    else
-	      echo " Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.<br />\n";
+	      echo "<div class=\"message\">Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.</div>\n";
 	  }
 	else
 	  {
@@ -682,10 +756,9 @@ switch($mystatus)
 
 	    $whoid = DB_get_userid('gameid-position',$gameid,$who);
 	    if($whoid==$myid)
-	      echo " Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.<br />\n";
+	      echo "<div class=\"message\">Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.</div>\n";
 	    else
 	      {
-		$email   = DB_get_email('position-gameid',$who,$gameid);
 		$whohash = DB_get_hash_from_game_and_pos($gameid,$who);
 		DB_set_player_by_gameid($gameid,$whoid);
 
@@ -694,7 +767,8 @@ switch($mystatus)
 		    /* email player for poverty */
 		    $message = "Poverty: It's your turn now in game ".DB_format_gameid($gameid).".\n".
 		      "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$whohash."\n\n" ;
-		    mymail($email,$EmailName."Poverty (game ".DB_format_gameid($gameid).") ",$message);
+		    $subject = 'Poverty (game '.DB_format_gameid($gameid).') ';
+		    mymail($whoid,$subject,$message);
 		  }
 	      }
 	  }
@@ -718,9 +792,6 @@ switch($mystatus)
      * it is easier to check B) first
      */
 
-    /* output pre game in case user reloads */
-
-
     set_gametype($gametype); /* this sets the $CARDS variable */
     $myparty = DB_get_party_by_hash($me);
 
@@ -746,6 +817,25 @@ switch($mystatus)
     $mycards = DB_get_hand($me);
     $mycards = mysort($mycards,$gametype);
 
+    /* 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";
+	echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\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";  /* end div trick, end li trick */
+      }
+    /* end output pre-game trick */
+
     /* check if user need to give more cards back */
     if( ($myparty=='re' || $myparty=='contra') && count($mycards)>12)
       {
@@ -765,9 +855,8 @@ switch($mystatus)
 
 	/* email start player */
 	$startplayer = DB_get_startplayer_by_gameid($gameid);
-	$email       = DB_get_email('position-gameid',$startplayer,$gameid);
 	$hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
-	$who         = DB_get_userid('email',$email);
+	$who         = DB_get_userid('hash',$hash);
 	DB_set_player_by_gameid($gameid,$who);
 
 	if($hash!=$me)
@@ -777,11 +866,12 @@ switch($mystatus)
 		/* email startplayer */
 		$message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
 		  "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ;
-		mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
+		$subject = 'Ready, set, go... (game '.DB_format_gameid($gameid).') ';
+		mymail($who,$subject,$message);
 	      }
 	  }
 	else
-	  echo " Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.<br />\n";
+	  echo "<div class=\"message\">Please, <a href=\"$INDEX?action=game&amp;me=$me\">start</a> the game.</div>\n";
       }
 
     /* the following is part A) of what needs to be done */
@@ -856,8 +946,8 @@ switch($mystatus)
 		$userids = DB_get_all_userid_by_gameid($gameid);
 		foreach($userids as $user)
 		  {
-		    $To = DB_get_email('userid',$user);
-		    mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled (poverty not resolved)",$message);
+		    $subject = 'Game '.DB_format_gameid($gameid).' canceled (poverty not resolved)';
+		    mymail($user,$subject,$message);
 		  }
 
 		/* delete everything from the dB */
@@ -869,16 +959,16 @@ switch($mystatus)
 	    else
 	      {
 		/* email next player, set his status to poverty */
-		$To       = DB_get_email('position-gameid',$mypos+$next,$gameid);
 		$userhash = DB_get_hash_from_game_and_pos($gameid,$mypos+$next);
-		$userid   = DB_get_userid('email',$To);
+		$userid   = DB_get_userid('hash',$userhash);
 
 		DB_set_player_by_gameid($gameid,$userid);
 		DB_set_hand_status_by_hash($userhash,'poverty');
 
 		$message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
 		  " ".$HOST.$INDEX."?action=game&me=".$userhash."\n\n" ;
-		mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
+		$subject = 'Poverty (game '.DB_format_gameid($gameid).')';
+		mymail($userid,$subject,$message);
 	      }
 	  }
 	else
@@ -961,21 +1051,19 @@ switch($mystatus)
 		    if($mypos+$next>4)
 		      echo "<div class=\"message\">Error in poverty, please contact the Admin</div>\n";
 
-		    $To       = DB_get_email('position-gameid',$mypos+$next,$gameid);
 		    $userhash = DB_get_hash_from_game_and_pos($gameid,$mypos+$next);
-		    $userid   = DB_get_userid('email',$To);
+		    $userid   = DB_get_userid('hash',$userhash);
 
 		    DB_set_player_by_gameid($gameid,$userid);
 		    DB_set_hand_status_by_hash($userhash,'poverty');
 
 		    $message = "Two people have poverty, it's your turn to decide, if you want to take the trump. Please visit:".
 		      " ".$HOST.$INDEX."?action=game&me=".$userhash."\n\n" ;
-		    mymail($To,$EmailName." double poverty (game ".DB_format_gameid($gameid).")",$message);
-
-
+		    $subject = 'Double poverty (game '.DB_format_gameid($gameid).')';
+		    mymail($userid,$subject,$message);
 		  }
 	      }
-	    echo "<div class=\"message\"> Please, <a href=\"$INDEX?action=game&amp;me=$me\">continue</a> here.</div>\n";
+	    echo "<div class=\"message\">Please, <a href=\"$INDEX?action=game&amp;me=$me\">continue</a> here.</div>\n";
 	  }
       }
     echo "</div>";
@@ -1013,9 +1101,8 @@ switch($mystatus)
 
 	    /* email startplayer */
 	    $startplayer = DB_get_startplayer_by_gameid($gameid);
-	    $email       = DB_get_email('position-gameid',$startplayer,$gameid);
 	    $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
-	    $who         = DB_get_userid('email',$email);
+	    $who         = DB_get_userid('hash',$hash);
 	    DB_set_player_by_gameid($gameid,$who);
 
 	    if($hash!=$me && DB_get_email_pref_by_hash($hash)!='emailaddict')
@@ -1023,7 +1110,8 @@ switch($mystatus)
 		/* email startplayer) */
 		$message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
 		  "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ;
-		mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
+		$subject = 'Ready, set, go... (game '.DB_format_gameid($gameid).')';
+		mymail($who,$subject,$message);
 	      }
 	  }
       }
@@ -1069,6 +1157,7 @@ switch($mystatus)
 		* only  play a card after everyone is ready to play */
       }
 
+
     /* 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]);
@@ -1119,93 +1208,10 @@ switch($mystatus)
       {
 	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 */
-	$partnerpos1 = 0;
-	$povertypos1 = 0;
-	$partnerpos2 = 0;
-	$povertypos2 = 0;
-	if($mygametype == 'poverty' || $mygametype=='dpoverty')
-	  {
-	    /* who has poverty */
-	    for($mypos=1;$mypos<5;$mypos++)
-	      {
-		$usersick = DB_get_sickness_by_pos_and_gameid($mypos,$gameid);
-		if($usersick == 'poverty')
-		  if($povertypos1)
-		    $povertypos2 = $mypos;
-		  else
-		    $povertypos1 = $mypos;
-	      }
-	    /* get hash and cards for all */
-	    $povertyhash1 = DB_get_hash_from_game_and_pos($gameid,$povertypos1);
-	    $partnerhash1 = DB_get_partner_hash_by_hash($povertyhash1);
-
-	    $povertycards1 = DB_get_exchanged_cards($povertyhash1);
-	    $partnercards1 = DB_get_exchanged_cards($partnerhash1);
-
-	    $partnerpos1 = DB_get_pos_by_hash($partnerhash1);
-	    if($povertypos2)
-	      {
-		$povertyhash2 = DB_get_hash_from_game_and_pos($gameid,$povertypos2);
-		$partnerhash2 = DB_get_partner_hash_by_hash($povertyhash2);
 
-		$povertycards2 = DB_get_exchanged_cards($povertyhash2);
-		$partnercards2 = DB_get_exchanged_cards($partnerhash2);
-
-		$partnerpos2 = DB_get_pos_by_hash($partnerhash2);
-	      }
-	  }
-
-	$show = 1;
-	for($mypos=1;$mypos<5;$mypos++)
-	  {
-	    $usersick = DB_get_sickness_by_pos_and_gameid($mypos,$gameid);
-	    if($usersick!=NULL ||
-	       $mypos==$povertypos1 || $mypos==$partnerpos1 ||
-	       $mypos==$povertypos2 || $mypos==$partnerpos2 )
-	      {
-		echo "      <div class=\"vorbehalt".($mypos-1)."\"> Vorbehalt <br />";
-		if($show)
-		  echo " $usersick <br />";
-		if($mypos==$partnerpos1)
-		  {
-		    foreach($partnercards1 as $card)
-		      if($povertyhash1 == $me || $partnerhash1 == $me || $mystatus=='gameover')
-			display_card($card,$PREF['cardset']);
-		      else
-			display_card(0,$PREF['cardset']);
-		  }
-		else if($mypos==$povertypos1)
-		  {
-		    foreach($povertycards1 as $card)
-		      if($povertyhash1 == $me || $partnerhash1 == $me || $mystatus=='gameover')
-			display_card($card,$PREF['cardset']);
-		      else
-			display_card(0,$PREF['cardset']);
-		  }
-		else if($mypos==$povertypos2)
-		  {
-		    foreach($povertycards2 as $card)
-		      if($povertyhash2 == $me || $partnerhash2 == $me || $mystatus=='gameover')
-			display_card($card,$PREF['cardset']);
-		      else
-			display_card(0,$PREF['cardset']);
-		  }
-		else if($mypos==$partnerpos2)
-		  {
-		    foreach($partnercards2 as $card)
-		      if($povertyhash2 == $me || $partnerhash2 == $me || $mystatus=='gameover')
-			display_card($card,$PREF['cardset']);
-		      else
-			display_card(0,$PREF['cardset']);
-		  }
-
-		echo  " </div>\n";
+	/* get information so show the cards that have been handed over in a poverty game */
+	output_exchanged_cards();
 
-		if($mygametype == $usersick)
-		  $show = 0;
-	      }
-	  }
 	echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
       }
 
@@ -1531,15 +1537,17 @@ switch($mystatus)
 	    if(DB_get_game_status_by_gameid($gameid)=='play')
 	      {
 		$next_hash = DB_get_hash_from_game_and_pos($gameid,$next);
-		$email     = DB_get_email('hash',$next_hash);
-		$who       = DB_get_userid('email',$email);
+		$who       = DB_get_userid('hash',$next_hash);
 		DB_set_player_by_gameid($gameid,$who);
 
 		$message = "A card has been played in game ".DB_format_gameid($gameid).".\n\n".
 		  "It's your turn  now.\n".
 		  "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$next_hash."\n\n" ;
 		if( DB_get_email_pref_by_uid($who)!='emailaddict' )
-		  mymail($email,$EmailName."a card has been played in game ".DB_format_gameid($gameid),$message);
+		  {
+		    $subject = 'A card has been played in game '.DB_format_gameid($gameid);
+		    mymail($who,$subject,$message);
+		  }
 	      }
 	    else /* send out final email */
 	      {
@@ -1786,7 +1794,8 @@ switch($mystatus)
 		  $To = implode(",",$all);
 
 		  $message .= "\n\n (you can use reply all on this email to reach all the players.)\n";
-		  mymail($To,$EmailName."Game over (game ".DB_format_gameid($gameid).") ",$message);
+		  $subject = $EmailName.' Game over (game '.DB_format_gameid($gameid).') ';
+		  sendmail($To,$subject,$message);
 	      }
 	  }
 	else