BUGFIX: wrongly displayed "trump back" in pre-trick during poverty

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

diff --git a/include/game.php b/include/game.php
index 1dc4802b3ee7155a16b6aed098b73e97df10e1c1..f9daf6523dc916dd7517854925c98d5fcdbf9fec 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -302,7 +302,7 @@ switch($mystatus)
          {
            /* cancel the game */
            $message = "Hello, \n\n".
-             "the game has been canceled due to the request of one of the players.\n";
+             "the game has been canceled due to the request of one of the players.\n\n";
 
            $userids = DB_get_all_userid_by_gameid($gameid);
            foreach($userids as $user)
@@ -593,7 +593,7 @@ switch($mystatus)
              " the game has been canceled because ".DB_get_name('userid',$nines).
              " has five or more nines and nobody is playing solo.\n\n".
              " To redeal either start a new game or, in case the game was part of a tournament, \n".
-             " go to the last game and use the link at the bottom of the page to redeal.";
+             " go to the last game and use the link at the bottom of the page to redeal.\n\n";
 
            $userids = DB_get_all_userid_by_gameid($gameid);
            foreach($userids as $user)
@@ -940,7 +940,7 @@ switch($mystatus)
            if($mypos+$next>4)
              {
                $message = "Hello, \n\n".
-                 "Game ".DB_format_gameid($gameid)." has been canceled since nobody wanted to take the trump.\n";
+                 "Game ".DB_format_gameid($gameid)." has been canceled since nobody wanted to take the trump.\n\n";
 
                $userids = DB_get_all_userid_by_gameid($gameid);
                foreach($userids as $user)
@@ -1798,12 +1798,8 @@ switch($mystatus)
                  $message .= "\nUse these links to have a look at game ".DB_format_gameid($gameid).": \n";
 
                  /* send out final email */
-                 $all = array();
-
                  foreach($userids as $user)
                    {
-                     $all[] = DB_get_email('userid',$user);
-
                      /* add links for all players */
                      $hash = DB_get_hash_from_gameid_and_userid($gameid,$user);
                      $name = DB_get_name('userid',$user);
@@ -1811,11 +1807,9 @@ switch($mystatus)
                      $link = "$name: ".$HOST.$INDEX."?action=game&me=".$hash."\n" ;
                      $message .= $link;
                    }
-                 $To = implode(",",$all);
-
-                 $message .= "\n\n (you can use reply all on this email to reach all the players.)\n";
-                 $subject = $EmailName.' Game over (game '.DB_format_gameid($gameid).') ';
-                 sendmail($To,$subject,$message);
+                 $message .= "\n\n (you can use reply all on this email to reach all the players.)\n\n";
+                 $subject = ' Game over (game '.DB_format_gameid($gameid).') ';
+                 mymail($userids,$subject,$message);
              }
          }
        else