BUGFIX: reload during the setup could mess up the state machine
[e-DoKo.git] / index.php
index 83ada9ad8080b2482582b2cd135c8829bc0033d4..f5060a077601ea63c1253d5798a04de4b39d3031 100644 (file)
--- a/index.php
+++ b/index.php
@@ -13,6 +13,23 @@ if(isset($EMAIL_REPLY))
   {
     ini_set("sendmail_from",$EMAIL_REPLY);
   }
+if(!isset($ADMIN_NAME))
+  {
+    output_header();
+    echo "<h1>Setup not completed</h1>";
+    echo "You need to set \$ADMIN_NAME in config.php.";
+    output_footer(); 
+    exit(); 
+  }    
+if(!isset($ADMIN_EMAIL))
+  {
+    output_header();
+    echo "<h1>Setup not completed</h1>";
+    echo "You need to set \$ADMIN_EMAIL in config.php. ".
+      "If something goes wrong an email will send to this address.";
+    output_footer(); 
+    exit(); 
+  }
 
 /* in case work has to be done on the database or other section we can
  * shut down the server and tell people to come back later 
@@ -28,7 +45,8 @@ if(0)
 if(DB_open()<0)
   {
     output_header();
-    echo "Database error, can't connect...";
+    echo "Database error, can't connect... Please wait a while and try again. ".
+      "If the problem doesn't go away feel free to contact $ADMIN_NAME at $ADMIN_EMAIL.";
     output_footer(); 
     exit(); 
   }
@@ -43,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"];
@@ -52,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);
@@ -74,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) 
-      {
-       echo "Error defining ruleset: $ruleset";
-       output_footer();
-       DB_close();
-       exit();
-      };
-    
+        
     /* create game */
     $followup = NULL;
     if(myisset("followup") )
@@ -94,7 +103,7 @@ if(myisset("new"))
        $ruleset = DB_get_ruleset_by_gameid($followup); /* just copy ruleset from old game, 
                                                         this way no manipulation is possible */
        if($session)
-         mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1','1','pre',".
+         mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre',".
                      "'$ruleset','$session' ,NULL)");
        else
          {
@@ -102,13 +111,25 @@ if(myisset("new"))
            $max = DB_get_max_session();
            $max++;
            mysql_query("UPDATE Game SET session='".$max."' WHERE id=".DB_quote_smart($followup));
-           mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1','1','pre',".
+           mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre',".
                        "'$ruleset','$max' ,NULL)");
          }
       }
     else
-      mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1','1','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 */
@@ -318,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") )
+         {
+           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";
                
@@ -351,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);
@@ -372,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...please contact the admin.";
+          * 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);
@@ -439,21 +469,29 @@ else if(myisset("me"))
            {
              $userstat = DB_get_hand_status_by_userid_and_gameid($user,$gameid);
              if($userstat!='poverty' && $userstat!='play')
-               $ok = 0;
+               {
+                 $ok = 0;
+                 DB_set_player_by_gameid($gameid,$user);
+               }
            };
          if($ok)
-           foreach($userids as $user)
-             {
-               $To       = DB_get_email_by_userid($user);
-               $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);
-               if($userhash != $me)
-                 {
-                   $message = "Everyone finish the questionary in game $gameid, ".
-                     "please visit this link now to continue: \n".
-                     " ".$host."?me=".$userhash."\n\n" ;
-                   mymail($To,$EmailName." finished setup in game $gameid",$message);
-                 }
-             };
+           {
+             /* reset player = everyone has to do something now */
+             DB_set_player_by_gameid($gameid,NULL);
+             
+             foreach($userids as $user)
+               {
+                 $To       = DB_get_email_by_userid($user);
+                 $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user);
+                 if($userhash != $me)
+                   {
+                     $message = "Everyone finish the questionary in game $gameid, ".
+                       "please visit this link now to continue: \n".
+                       " ".$host."?me=".$userhash."\n\n" ;
+                     mymail($To,$EmailName." finished setup in game $gameid",$message);
+                   }
+               };
+           };
        };
 
       break;
@@ -464,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);
@@ -532,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)
@@ -606,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 
               */
              
@@ -763,7 +801,8 @@ else if(myisset("me"))
                  $r      = mysql_fetch_array($result,MYSQL_NUM);
                  if(!$r)
                    {
-                     die("error in poverty");
+                     myerror("error in poverty");
+                     die();
                    };
                  if($r[0]==12)
                    {
@@ -803,7 +842,6 @@ else if(myisset("me"))
                                         " ".$host."?me=".$userhash."\n\n" ;
                              mymail($To,$EmailName." poverty (game $gameid)",$message);
                            }
-
                        }
                      
                      /* this user is done */
@@ -896,63 +934,64 @@ else if(myisset("me"))
                  else
                    echo "it's not your turn yet to decide if you want to take the trump or not.";
                }
-
            };
-       }
-      /* check if no one wanted to take trump, in that case the gamesickness would be set to 5 or 50 */
-      $who = DB_get_sickness_by_gameid($gameid);
-      if($who==5 || $who==50)
-       {
-         $message = "Hello, \n\n".
-           "Game $gameid has been cancled since nobody wanted to take the trump.\n";
-         
-         $userids = DB_get_all_userid_by_gameid($gameid);
-         foreach($userids as $user)
+         /* check if no one wanted to take trump, in that case the gamesickness would be set to 5 or 50 */
+         $who = DB_get_sickness_by_gameid($gameid);
+         if($who==5 || $who==50)
            {
-             $To = DB_get_email_by_userid($user);
-             mymail($To,$EmailName."game $gameid cancled (poverty not resolved)",$message);
+             $message = "Hello, \n\n".
+               "Game $gameid has been cancled since nobody wanted to take the trump.\n";
+             
+             $userids = DB_get_all_userid_by_gameid($gameid);
+             foreach($userids as $user)
+               {
+                 $To = DB_get_email_by_userid($user);
+                 mymail($To,$EmailName."game $gameid cancled (poverty not resolved)",$message);
+               }
+             
+             /* delete everything from the dB */
+             DB_cancel_game($me);
+             
+             echo "<p style=\"background-color:red\";>Game $gameid has been cancled.<br /><br /></p>";
+             output_footer();
+             DB_close();
+             exit();
            }
          
-         /* delete everything from the dB */
-         DB_cancel_game($me);
-         
-         echo "<p style=\"background-color:red\";>Game $gameid has been cancled.<br /><br /></p>";
-         output_footer();
-         DB_close();
-         exit();
-       }
-
-      /* check if all players are ready to play */
-      $ok = 1;
-      foreach($userids as $user)
-       if(DB_get_hand_status_by_userid_and_gameid($user,$gameid)!='play')
-         $ok = 0;
-
-      if($ok)
-       {
-         /* only set this after all poverty, etc. are handled*/
-         DB_set_game_status_by_gameid($gameid,'play');
-
-         /* email startplayer */
-         $startplayer = DB_get_startplayer_by_gameid($gameid);
-         $email       = DB_get_email_by_pos_and_gameid($startplayer,$gameid);
-         $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
-         $who         = DB_get_userid_by_email($email);
-         DB_set_player_by_gameid($gameid,$who);
+         /* check if all players are ready to play */
+         $ok = 1;
+         foreach($userids as $user)
+           if(DB_get_hand_status_by_userid_and_gameid($user,$gameid)!='play')
+             {
+               $ok = 0;
+               DB_set_player_by_gameid($gameid,$user);
+             }
          
-         if($hash!=$me)
+         if($ok)
            {
-             /* email startplayer) */
-             $message = "It's your turn now in game $gameid.\n".
-               "Use this link to play a card: ".$host."?me=".$hash."\n\n" ;
-             mymail($email,$EmailName."ready, set, go... (game $gameid) ",$message);
+             /* only set this after all poverty, etc. are handled*/
+             DB_set_game_status_by_gameid($gameid,'play');
+             
+             /* email startplayer */
+             $startplayer = DB_get_startplayer_by_gameid($gameid);
+             $email       = DB_get_email_by_pos_and_gameid($startplayer,$gameid);
+             $hash        = DB_get_hash_from_game_and_pos($gameid,$startplayer);
+             $who         = DB_get_userid_by_email($email);
+             DB_set_player_by_gameid($gameid,$who);
+             
+             if($hash!=$me)
+               {
+                 /* email startplayer) */
+                 $message = "It's your turn now in game $gameid.\n".
+                   "Use this link to play a card: ".$host."?me=".$hash."\n\n" ;
+                 mymail($email,$EmailName."ready, set, go... (game $gameid) ",$message);
+               }
+             else
+               echo " Please, <a href=\"$host?me=$me\">start</a> the game.<br />";      
            }
          else
-           echo " Please, <a href=\"$host?me=$me\">start</a> the game.<br />";  
+           echo "\n <br />";    
        }
-      else
-       echo "\n <br />";        
-
       break;
     case 'play':
     case 'gameover': 
@@ -1102,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 */
@@ -1340,6 +1379,30 @@ 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"))
@@ -1374,39 +1437,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')
                {
-                 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
-                   echo "ERROR during scoring";
+                 $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);
                  
-                 /* email all players */
+                 $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 */
+               {
                  /* 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 User.fullname" );
                  $message .= "\nTotals:\n";
                  while( $r = mysql_fetch_array($result,MYSQL_NUM))
                    $message .= "    ".$r[0]." ".$r[1]."\n";
@@ -1430,51 +1499,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
-                       echo "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
            {
@@ -1579,21 +1603,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";
@@ -1612,14 +1643,19 @@ 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;
     default:
-      echo "error in testing the status";
+      myerror("error in testing the status");
     }
     output_footer();
     DB_close();
@@ -1781,16 +1817,14 @@ else if(myisset("me"))
               while( $r = mysql_fetch_array($result,MYSQL_NUM))
                 {
                   echo "<a href=\"".$host."?me=".$r[0]."\">game #".$r[1]." </a>";
-                  if($r[3])
+                  if($r[3]==$uid || $r[3]==NULL)
+                    echo "(it's <strong>your</strong> turn)\n";
+                  else
                     {
-                      if($r[3]==$uid)
-                        echo "(it's <strong>your</strong> turn)\n";
-                      else
-                        {
-                          $name = DB_get_name_by_userid($r[3]);
-                          echo "(it's $name's turn)\n";
-                        };
-                    }
+                      $name = DB_get_name_by_userid($r[3]);
+                      echo "(it's $name's turn)\n";
+                    };
+                    
                   if(time()-strtotime($r[2]) > 60*60*24*30)
                     echo " The game has been running for over a month.".
                       " Do you want to cancel it? <a href=\"$host?cancle=1&amp;me=".$r[0]."\">yes</a>".