BUGFIX: cards didn't show up anymore at the end of the game
[e-DoKo.git] / index.php
index 44a5d5fc233f3d8220538ecc3a1e103be6ffabfa..bae38d4c778adcc6bc72563167053b79cb9a5042 100644 (file)
--- a/index.php
+++ b/index.php
@@ -61,7 +61,7 @@ if(myisset("new"))
     output_form_for_new_game($names);
   }
 /*check if everything is ready to set up a new game */
- else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen" ))
+ else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","call" ))
   {
     $PlayerA = $_REQUEST["PlayerA"];
     $PlayerB = $_REQUEST["PlayerB"];
@@ -70,7 +70,8 @@ if(myisset("new"))
 
     $dullen      = $_REQUEST["dullen"];
     $schweinchen = $_REQUEST["schweinchen"];
-    
+    $call        = $_REQUEST["call"];
+
     $EmailA  = DB_get_email_by_name($PlayerA);
     $EmailB  = DB_get_email_by_name($PlayerB);
     $EmailC  = DB_get_email_by_name($PlayerC);
@@ -92,17 +93,7 @@ if(myisset("new"))
     /* create random numbers */
     $randomNR       = create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD);
     $randomNRstring = join(":",$randomNR);
-    
-    /* get ruleset information or create new one */
-    $ruleset = DB_get_ruleset($dullen,$schweinchen);
-    if($ruleset <0) 
-      {
-       myerror("Error defining ruleset: $ruleset");
-       output_footer();
-       DB_close();
-       exit();
-      };
-    
+        
     /* create game */
     $followup = NULL;
     if(myisset("followup") )
@@ -125,8 +116,20 @@ if(myisset("new"))
          }
       }
     else
-      mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre', ".
+      {
+       /* get ruleset information or create new one */
+       $ruleset = DB_get_ruleset($dullen,$schweinchen,$call);
+       if($ruleset <0) 
+         {
+           myerror("Error defining ruleset: $ruleset");
+           output_footer();
+           DB_close();
+           exit();
+         };
+       
+       mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre', ".
                  "'$ruleset',NULL ,NULL)");
+      }
     $game_id = mysql_insert_id();
     
     /* create hash */
@@ -286,9 +289,9 @@ else if(myisset("me"))
       echo " Gametype: $GT <br />\n";
     
     echo "Rules: <br />\n";
-    echo "10ofhearts : ".$r[2]."<br />\n";
-    echo "schweinchen: ".$r[3]."<br />\n";
-    echo "call:        ".$r[4]."<br />\n";
+    echo "10ofhearts : ".$RULES["dullen"]      ."<br />\n";
+    echo "schweinchen: ".$RULES["schweinchen"] ."<br />\n";
+    echo "call:        ".$RULES["call"]        ."<br />\n";
     echo "</div>\n";
 
     /* output extra division in case this game is part of a session */
@@ -336,24 +339,30 @@ else if(myisset("me"))
     switch($mystatus)
       {
       case 'start':
-       check_want_to_play($me);
-       /* move on to the next stage*/
-       DB_set_hand_status_by_hash($me,'init');
-       break;
+       if( !myisset("in") )
+         {
+           output_check_want_to_play($me);
+           break;
+         }
+       else
+         {
+           /* move on to the next stage*/
+           DB_set_hand_status_by_hash($me,'init');
+         }
       case 'init':
        /* first check if everything went ok  in the last step
         * if not, send user back, if yes, check what he did
         */
        if( !myisset("in") )
          {
-           echo "<p> you need to answer the <a href=\"$host?me=$me\">question</a>.</p>";
+           echo "<p> You need to answer the <a href=\"$host?me=$me\">question</a>.</p>";
            DB_set_hand_status_by_hash($me,'start');
          }
        else
          {
            if($_REQUEST["in"] == "no")
              {
-               /* cancle the game */
+               /* cancel the game */
                $message = "Hello, \n\n".
                  "the game has been canceled due to the request of one of the players.\n";
                
@@ -369,7 +378,7 @@ else if(myisset("me"))
              }
            else
              {
-               echo "thanks for joining the game...";
+               echo "Thanks for joining the game...";
                
                $mycards = DB_get_hand($me);
                sort($mycards);
@@ -390,17 +399,20 @@ else if(myisset("me"))
       /* ok, user is in the game, saw his cards and selected his vorbehalt
        * so first we check what he selected
        */
-      echo "Processing what you selected in the last step...<br />";
-
       if(!myisset("solo","wedding","poverty","nines") )
        {
          /* all these variables have a pre-selected default,
           * so we should never get here,
-          * unless a user tries to cheat ;) */
-         echo "something went wrong during the setup...please contact the $ADMIN_NAME at $ADMIN_EMAIL.";
+          * unless a user tries to cheat ;)
+          * can also happen if user reloads the page!
+          */
+         echo "<p> You need to answer the <a href=\"$host?me=$me&in=yes\">questions</a>.</p>";
+         DB_set_hand_status_by_hash($me,'init');
        }
       else
        {
+         echo "Processing what you selected in the last step...<br />";
+      
          /* check if this sickness needs to be handled first */
          $gametype    = DB_get_gametype_by_gameid($gameid);
          $startplayer = DB_get_startplayer_by_gameid($gameid);
@@ -490,7 +502,7 @@ else if(myisset("me"))
        * set that one in the Game table
        * tell people about it.
        */
-      echo "<br /> Checking if someone else selected solo, nines or wedding or poverty.<br />";
+      echo "<br /> Checking if someone else selected solo, nines, wedding or poverty.<br />";
       
       /* check if everyone has reached this stage */
       $userids = DB_get_all_userid_by_gameid($gameid);
@@ -558,13 +570,13 @@ else if(myisset("me"))
            }
          else if($nines)
            {
-             /* cancle game */
+             /* cancel game */
              /* TODO: should we keep statistics of this? */
              $message = "Hello, \n\n".
-               "the game has been canceled because ".DB_get_name_by_userid($nines).
-               " has five or more nines and nobody is playing solo.\n";
-             
-             /* TODO: add info about redeal in case this is a game of a series */
+               " the game has been canceled because ".DB_get_name_by_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.";
              
              $userids = DB_get_all_userid_by_gameid($gameid);
              foreach($userids as $user)
@@ -632,7 +644,7 @@ else if(myisset("me"))
          foreach($userids as $user)
            {
              /* userids are sorted by position... 
-              * so output whatever the firstone has, then whatever the next one has
+              * so output whatever the first one has, then whatever the next one has
               * stop when the sickness is the same as the gametype 
               */
              
@@ -1129,7 +1141,7 @@ else if(myisset("me"))
              else if(ereg("trumpless",$GT))
                echo "<img src=\"pics/button/notrumpsolo_button.png\" class=\"button\" alt=\"$GT\" />";
              else if(ereg("trump",$GT))
-               echo "<img src=\"pics/button/diamandsolo_button.png\" class=\"button\" alt=\"$GT\" />";
+               echo "<img src=\"pics/button/trumpsolo_button.png\" class=\"button\" alt=\"$GT\" />";
            }
 
          /* add point calls */
@@ -1164,12 +1176,28 @@ else if(myisset("me"))
        }
       echo  "</div>\n";
 
+      /* get time from the last action of the game */
+      $result  = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " );
+      $r       = mysql_fetch_array($result,MYSQL_NUM);
+      $gameend = time() - strtotime($r[0]);
+
+      /* handel comments in case player didn't play a card, allow comments a week after the end of the game */
+      if( (!myisset("card") && $mystatus=='play') || ($mystatus=='gameover' && ($gameend < 60*60*24*7)) )
+       if(myisset("comment"))
+         {
+           $comment = $_REQUEST["comment"];
+           $playid = DB_get_current_playid($gameid);
+           
+           if($comment != "")
+             DB_insert_comment($comment,$playid,$myid);
+         };  
+
       /* get everything relevant to display the tricks */
       $result = mysql_query("SELECT Hand_Card.card_id as card,".
                            "       Hand.position as position,".
                            "       Play.sequence as sequence, ".
                            "       Trick.id, ".
-                           "       Comment.comment, ".
+                           "       GROUP_CONCAT(CONCAT('<span>',User.fullname,': ',Comment.comment,'</span>') SEPARATOR '\n' ), ".
                            "       Play.create_date, ".
                            "       Hand.user_id ".
                            "FROM Trick ".
@@ -1177,8 +1205,10 @@ else if(myisset("me"))
                            "LEFT JOIN Hand_Card ON Play.hand_card_id=Hand_Card.id ".
                            "LEFT JOIN Hand ON Hand_Card.hand_id=Hand.id ".
                            "LEFT JOIN Comment ON Play.id=Comment.play_id ".
+                           "LEFT JOIN User On User.id=Comment.user_id ".
                            "WHERE Trick.game_id='".$gameid."' ".
-                           "ORDER BY Trick.id,sequence ASC");
+                           "GROUP BY Trick.id, sequence ".
+                           "ORDER BY Trick.id, sequence  ASC");
       $trickNR   = 1;
       $lasttrick = DB_get_max_trickid($gameid);
       
@@ -1275,7 +1305,7 @@ else if(myisset("me"))
        $myturn = 1;
       else
        $myturn = 0;
-      
+
       /* do we want to play a card? */
       if(myisset("card") && $myturn)
        {
@@ -1291,8 +1321,6 @@ else if(myisset("me"))
          
          if($handcardid) /* everything ok, play card  */
            {
-             $comment = "";
-
              /* update Game timestamp */
              DB_update_game_timestamp($gameid);
 
@@ -1312,26 +1340,26 @@ else if(myisset("me"))
              mysql_query("UPDATE Hand_Card SET played='true' WHERE hand_id='$handid' AND card_id=".
                          DB_quote_smart($card));
 
+             /* get trick id or start new trick */
+             $a = DB_get_current_trickid($gameid);
+             $trickid  = $a[0];
+             $sequence = $a[1];
+             $tricknr  = $a[2];
+             
+             $playid = DB_play_card($trickid,$handcardid,$sequence);
+
              /* check for schweinchen */
-             //echo "schweinchen = ".$GAME["schweinchen"]." --$card-<br />";
              if($card == 19 || $card == 20 )
                {
                  $GAME["schweinchen"]++;
                  if($GAME["schweinchen"]==3 && $RULES["schweinchen"]=="second" )
-                   $comment="Schweinchen! ";
+                   DB_insert_comment("Schweinchen! ",$playid,$myid);
                  if($RULES["schweinchen"]=="both" )
-                   $comment="Schweinchen! ";
-                 if ($debug) echo "schweinchen = ".$GAME["schweinchen"]." ---<br />";
+                   DB_insert_comment("Schweinchen! ",$playid,$myid);
+                 if ($debug) 
+                   echo "schweinchen = ".$GAME["schweinchen"]." ---<br />";
                }
 
-             /* get trick id or start new trick */
-             $a = DB_get_current_trickid($gameid);
-             $trickid  = $a[0];
-             $sequence = $a[1];
-             $tricknr  = $a[2];
-             
-             $playid = DB_play_card($trickid,$handcardid,$sequence);
-             
              /* if sequence == 4 check who one in case of wedding */
              if($sequence == 4 && $GT == "wedding") 
                {
@@ -1367,19 +1395,45 @@ else if(myisset("me"))
                        }
                    }
                }
-             
+
+             /* if sequence == 4, set winner of the trick, count points and set the next player */
+             if($sequence==4)
+               {
+                 $play   = DB_get_cards_by_trick($trickid);
+                 $winner = get_winner($play,$gametype); /* returns the position */
+
+                 if($winner>0)
+                   mysql_query("UPDATE Trick SET winner='$winner' WHERE id='$trickid'");
+                 else
+                   echo "ERROR during scoring";
+
+                 if($debug)
+                   echo "DEBUG: position $winner won the trick <br />";
+
+                 /* who is the next player? */
+                 $next = $winner;
+               }
+             else
+               {
+                 $next = DB_get_pos_by_hash($me)+1;
+               }
+             if($next==5) $next=1;
+
              /* check for coment */
              if(myisset("comment"))
                {
-                 $comment.=$_REQUEST["comment"];
+                 $comment = $_REQUEST["comment"];
+                 if($comment != "")
+                   DB_insert_comment($comment,$playid,$myid);
                };  
-             if($comment != "")
-               DB_insert_comment($comment,$playid,$myid);
-
+             
              /* display played card */
              echo "<div class=\"card\">";
              echo " you played  <br />";
+             /* display comments */
              display_card($card,$PREF["cardset"]);
+             if($comment!="")
+               echo "       <br /> Your comment:<br /><span class=\"comment\">".$comment."</span>\n";
              echo "</div>\n";
              
              /*check if we still have cards left, else set status to gameover */
@@ -1401,40 +1455,45 @@ else if(myisset("me"))
                  $done=0;
              
              if($done)
+               DB_set_game_status_by_gameid($gameid,"gameover");
+
+             /* email next player, if game is still running */
+             if(DB_get_game_status_by_gameid($gameid)=='play')
+               {
+                 $next_hash = DB_get_hash_from_game_and_pos($gameid,$next);
+                 $email     = DB_get_email_by_hash($next_hash);
+                 $who       = DB_get_userid_by_email($email);
+                 DB_set_player_by_gameid($gameid,$who);
+                 
+                 $message = "A card has been played in game $gameid.\n\n".
+                   "It's your turn  now.\n".
+                   "Use this link to play a card: ".$host."?me=".$next_hash."\n\n" ;
+                 mymail($email,$EmailName."a card has been played in game $gameid",$message);
+               }
+             else /* send out final email */
                {
-                 DB_set_game_status_by_gameid($gameid,"gameover");
-                 /* get score for last trick 
-                  * all other tricks are handled a few lines further down*/
-                 $play   = DB_get_cards_by_trick($trickid);
-                 $winner = get_winner($play,$gametype); /* returns the position */
-                 /* get points of last trick and save it */
-                 $points = 0;
-                 foreach($play as $card)
-                   $points = $points + card_value($card["card"]);
-                 $winnerid = DB_get_handid_by_gameid_and_position($gameid,$winner);
-                 if($winnerid>0)
-                   mysql_query("INSERT INTO Score VALUES (NULL, '$gameid', '$winnerid', '$points')");
-                 else
-                   {
-                     myerror("ERROR during scoring");
-                   }             
-                 /* email all players */
                  /* individual score */
-                 $result = mysql_query("SELECT fullname, IFNULL(SUM(score),0), Hand.party FROM Hand".
-                                       " LEFT JOIN Score ON Hand.id=Score.hand_id".
-                                       " LEFT JOIN User ON Hand.user_id=User.id".
-                                       " WHERE Hand.game_id=$gameid".
-                                       " GROUP BY fullname" );
+                 $result = mysql_query("SELECT User.fullname, IFNULL(SUM(Card.points),0), Hand.party FROM Hand".
+                               " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
+                               " LEFT JOIN User ON User.id=Hand.user_id".
+                               " LEFT JOIN Play ON Trick.id=Play.trick_id".
+                               " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
+                               " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
+                               " WHERE Hand.game_id='$gameid'".
+                               " GROUP BY User.fullname" );
                  $message  = "The game is over. Thanks for playing :)\n";
                  $message .= "Final score:\n";
                  while( $r = mysql_fetch_array($result,MYSQL_NUM))
                    $message .= "   ".$r[0]."(".$r[2].") ".$r[1]."\n";
 
-                 $result = mysql_query("SELECT Hand.party, IFNULL(SUM(score),0) FROM Hand".
-                                       " LEFT JOIN Score ON Hand.id=Score.hand_id".
-                                       " LEFT JOIN User ON Hand.user_id=User.id".
-                                       " WHERE Hand.game_id=$gameid".
-                                       " GROUP BY Hand.party" );
+                 $result = mysql_query("SELECT  Hand.party, IFNULL(SUM(Card.points),0) FROM Hand".
+                               " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
+                               " LEFT JOIN User ON User.id=Hand.user_id".
+                               " LEFT JOIN Play ON Trick.id=Play.trick_id".
+                               " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
+                               " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
+                               " WHERE Hand.game_id='$gameid'".
+                               " GROUP BY Hand.party" );
                  $message .= "\nTotals:\n";
                  while( $r = mysql_fetch_array($result,MYSQL_NUM))
                    $message .= "    ".$r[0]." ".$r[1]."\n";
@@ -1458,52 +1517,6 @@ else if(myisset("me"))
                      mymail($To,$EmailName."game over (game $gameid) part 2(2)",$link);
                    }
                }
-             
-             
-             /* email next player */
-             if(DB_get_game_status_by_gameid($gameid)=='play')
-               {
-                 if($sequence==4)
-                   {
-                     $play   = DB_get_cards_by_trick($trickid);
-                     $winner = get_winner($play,$gametype); /* returns the position */
-                     
-                     /* get points of last trick and save it, last trick is handled 
-                      * a few lines further up  */
-                     $points = 0;
-                     foreach($play as $card)
-                       $points = $points + card_value($card["card"]);
-                     
-                     $winnerid = DB_get_handid_by_gameid_and_position($gameid,$winner);
-                     if($winnerid>0)
-                       mysql_query("INSERT INTO Score VALUES (NULL, '$gameid', '$winnerid', '$points')");
-                     else
-                       {
-                         myerror("ERROR during scoring");
-                       };
-                     if($debug)
-                       echo "DEBUG: $winner got $points <br />";
-                     
-                     /* who is the next player? */
-                     $next = $winner;
-                   }
-                 else
-                   {
-                     $next = DB_get_pos_by_hash($me)+1;
-                   }
-                 if($next==5) $next=1;
-                 
-                 /* email next player */
-                 $next_hash = DB_get_hash_from_game_and_pos($gameid,$next);
-                 $email     = DB_get_email_by_hash($next_hash);
-                 $who       = DB_get_userid_by_email($email);
-                 DB_set_player_by_gameid($gameid,$who);
-
-                 $message = "A card has been played in game $gameid.\n\n".
-                   "It's your turn  now.\n".
-                   "Use this link to play a card: ".$host."?me=".$next_hash."\n\n" ;
-                 mymail($email,$EmailName."a card has been played in game $gameid",$message);            
-               }
            }
          else
            {
@@ -1519,7 +1532,7 @@ else if(myisset("me"))
       $mycards = mysort($mycards,$gametype);
       echo "<div class=\"mycards\">\n";
       
-      if($myturn && !myisset("card"))
+      if($myturn && !myisset("card") && $mystatus=='play' )
        {
          echo "Hello ".$myname.", it's your turn!  <br />\n";
          echo "Your cards are: <br />\n";
@@ -1556,19 +1569,40 @@ else if(myisset("me"))
                " no call:".
                " <input type=\"radio\" name=\"call0\" value=\"no\" /> ";
 
-         echo "<br />\nA short comments:<input name=\"comment\" type=\"text\" size=\"30\" maxlength=\"50\" />\n";
+         echo "<br />\nA short comment:<input name=\"comment\" type=\"text\" size=\"30\" maxlength=\"100\" />\n";
          echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
-         echo "<input type=\"submit\" value=\"move\" />\n";
+         echo "<input type=\"submit\" value=\"submit\" />\n";
          echo "</form>\n";
        }
-      else if($mystatus=='play')
-       {
+      else if($mystatus=='play' )
+       {         
          echo "Your cards are: <br />\n";
          foreach($mycards as $card) 
            display_card($card,$PREF["cardset"]);
+
+         echo "<form  action=\"index.php?me=$me\" method=\"post\">\n";
+         echo "<br />\nA short comment:<input name=\"comment\" type=\"text\" size=\"30\" maxlength=\"100\" />\n";
+         echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
+         echo "<input type=\"submit\" value=\"submit\" />\n";
+         echo "</form>\n";
+
        }
       else if($mystatus=='gameover')
        {
+         /* get time from the last action of the game */
+         $result  = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " );
+         $r       = mysql_fetch_array($result,MYSQL_NUM);
+         $gameend = time() - strtotime($r[0]);
+         
+         if( $gameend < 60*60*24*7 )
+           {
+             echo "<form  action=\"index.php?me=$me\" method=\"post\">\n";
+             echo "<br />\nA short comment:<input name=\"comment\" type=\"text\" size=\"30\" maxlength=\"100\" />\n";
+             echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
+             echo "<input type=\"submit\" value=\"submit\" />\n";
+             echo "</form>\n";
+           }
+
          $oldcards = DB_get_all_hand($me);
          $oldcards = mysort($oldcards,$gametype);
          echo "Your cards were: <br />\n";
@@ -1591,13 +1625,14 @@ else if(myisset("me"))
                   foreach($oldcards as $card)
                     display_card($card,$PREF["cardset"]);
                 }
-            }
+            };
        }
       echo "</div>\n";
       
       /* if the game is over do some extra stuff, therefore exit the swtich statement if we are still playing*/
       if($mystatus=='play')
        break;
+
       /* the following happens only when the gamestatus is 'gameover' */
       /* check if game is over, display results */
       if(DB_get_game_status_by_gameid($gameid)=='play')
@@ -1608,21 +1643,28 @@ else if(myisset("me"))
        {
          echo "the game is over now...<br />\n";
          
-         $result = mysql_query("SELECT fullname, IFNULL(SUM(score),0), Hand.party FROM Hand".
-                               " LEFT JOIN Score ON Hand.id=Score.hand_id".
-                               " LEFT JOIN User ON Hand.user_id=User.id".
-                               " WHERE Hand.game_id=$gameid".
-                               " GROUP BY fullname" );
+         $result = mysql_query("SELECT User.fullname, IFNULL(SUM(Card.points),0), Hand.party FROM Hand".
+                               " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
+                               " LEFT JOIN User ON User.id=Hand.user_id".
+                               " LEFT JOIN Play ON Trick.id=Play.trick_id".
+                               " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
+                               " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
+                               " WHERE Hand.game_id='$gameid'".
+                               " GROUP BY User.fullname" );
          echo "Final Score:<br />\n".
            " <table>\n";;
          while( $r = mysql_fetch_array($result,MYSQL_NUM))
            echo "  <tr><td>  ".$r[0]."</td><td>(".$r[2].")</td><td> ".$r[1]."</td></tr>";
          echo "</table>\n";
 
-         $result = mysql_query("SELECT Hand.party, IFNULL(SUM(score),0) FROM Hand".
-                               " LEFT JOIN Score ON Hand.id=Score.hand_id".
-                               " LEFT JOIN User ON Hand.user_id=User.id".
-                               " WHERE Hand.game_id=$gameid".
+
+         $result = mysql_query("SELECT Hand.party, IFNULL(SUM(Card.points),0) FROM Hand".
+                               " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
+                               " LEFT JOIN User ON User.id=Hand.user_id".
+                               " LEFT JOIN Play ON Trick.id=Play.trick_id".
+                               " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
+                               " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
+                               " WHERE Hand.game_id='$gameid'".
                                " GROUP BY Hand.party" );
          echo "Totals:<br />\n".
            " <table> \n";
@@ -1641,9 +1683,14 @@ else if(myisset("me"))
          
          if(!$session || $gameid==$r[0])
            {
-             /* suggest a new game with the same people in it, just rotated once */
+             /* suggest a new game with the same people in it, just rotated once (unless last game was solo) */
              $names = DB_get_all_names_by_gameid($gameid);
-             output_ask_for_new_game($names[1],$names[2],$names[3],$names[0],$gameid);
+             $type  = DB_get_gametype_by_gameid($gameid);
+             
+             if($type=="solo")
+               output_ask_for_new_game($names[0],$names[1],$names[2],$names[3],$gameid);
+             else
+               output_ask_for_new_game($names[1],$names[2],$names[3],$names[0],$gameid);
            }
        }
       break;
@@ -1789,11 +1836,11 @@ else if(myisset("me"))
             }
           else /* output default user page */
             {
-              $time = DB_get_user_timestamp($uid);
-              $unixtime =strtotime($time);
+              $time     = DB_get_user_timestamp($uid);
+              $unixtime = strtotime($time);
               
-              $offset = DB_get_user_timezone($uid);
-              $zone = return_timezone($offset);
+              $offset   = DB_get_user_timezone($uid);
+              $zone     = return_timezone($offset);
               date_default_timezone_set($zone);
               
               /* display links to settings */
@@ -1869,7 +1916,7 @@ else if(myisset("me"))
         }
        else
         {
-          echo "Sorry email and password don't match <br />";
+          echo "Sorry email and password don't match. Please <a href=\"$host\">try again</a>. <br />";
         }
      };
      output_footer();
@@ -1905,7 +1952,7 @@ else if(myisset("me"))
         if($r)
           echo " added you to the database";
         else
-          echo " something went wrong";
+          echo " something went wrong, couldn't add you to the database, please contact $ADMIN_NAME at $ADMIN_EMAIL.";
        }
    }
 /* default login page */