BUGFIX: didn't set next player correctly during startup
[e-DoKo.git] / index.php
index 77c2c2270b739ead0ee4e0d0be7932ddd4f8033c..eb52e4e1d2826467f74476a3ade6cd9c10d0ebf2 100644 (file)
--- a/index.php
+++ b/index.php
@@ -29,18 +29,23 @@ if(myisset("logout"))
     session_unset();
     session_destroy();
     $_SESSION = array();
     session_unset();
     session_destroy();
     $_SESSION = array();
-    echo "you are now logged out!";
+    echo "<div class=\"message\"><span class=\"bigger\">You are now logged out!</span><br />\n".
+      "(<a href=\"$INDEX\">This will take you back to the home-page</a>)</div>";
   }
 else if(myisset("new"))
   {
   }
 else if(myisset("new"))
   {
+    output_status();
     if( isset($_SESSION["name"]) )
       {
        $names = DB_get_all_names();
     if( isset($_SESSION["name"]) )
       {
        $names = DB_get_all_names();
+       echo "<div class=\"user\">\n";
        output_form_for_new_game($names);
        output_form_for_new_game($names);
+       echo "</div>\n";
+       display_user_menu();
       }
     else
       {
       }
     else
       {
-       echo "Please log in.";
+       echo "<div class=\"message\">Please <a href=\"$INDEX\">log in</a>.</div>";
       }
   }
 /*check if everything is ready to set up a new game */
       }
   }
 /*check if everything is ready to set up a new game */
@@ -177,18 +182,21 @@ else if(myisset("new"))
       "$PlayerC\n".
       "$PlayerD\n\n".
       "If you want to join this game, please follow this link:\n\n".
       "$PlayerC\n".
       "$PlayerD\n\n".
       "If you want to join this game, please follow this link:\n\n".
-      "".$host."?me=";
+      "".$HOST.$INDEX."?me=";
 
     mymail($EmailA,"You are invited to a game of DoKo","Hello $PlayerA,\n".$message.$hashA);
     mymail($EmailB,"You are invited to a game of DoKo","Hello $PlayerB,\n".$message.$hashB);
     mymail($EmailC,"You are invited to a game of DoKo","Hello $PlayerC,\n".$message.$hashC);
     mymail($EmailD,"You are invited to a game of DoKo","Hello $PlayerD,\n".$message.$hashD);
 
 
     mymail($EmailA,"You are invited to a game of DoKo","Hello $PlayerA,\n".$message.$hashA);
     mymail($EmailB,"You are invited to a game of DoKo","Hello $PlayerB,\n".$message.$hashB);
     mymail($EmailC,"You are invited to a game of DoKo","Hello $PlayerC,\n".$message.$hashC);
     mymail($EmailD,"You are invited to a game of DoKo","Hello $PlayerD,\n".$message.$hashD);
 
-    echo "You started a new game. The emails have been sent out!";
+    output_status();
+    echo "<div class=\"message\">You started a new game. The emails have been sent out!</div>\n";
   }    /* end set up a new game */
   }    /* end set up a new game */
-/* cancle a game, if nothing has happend in the last N minutes */
-else if(myisset("cancle","me"))
+/* cancel a game, if nothing has happend in the last N minutes */
+else if(myisset("cancel","me"))
   {
   {
+    output_status();
+
     $me = $_REQUEST["me"];
 
     /* test for valid ID */
     $me = $_REQUEST["me"];
 
     /* test for valid ID */
@@ -196,7 +204,7 @@ else if(myisset("cancle","me"))
     if(!$myid)
       {
        echo "Can't find you in the database, please check the url.<br />\n";
     if(!$myid)
       {
        echo "Can't find you in the database, please check the url.<br />\n";
-       echo "perhaps the game has been cancled, check by login in <a href=\"$host\">here</a>.";
+       echo "perhaps the game has been canceled, check by login in <a href=\"$INDEX\">here</a>.";
        output_footer();
        DB_close();
        exit();
        output_footer();
        DB_close();
        exit();
@@ -215,27 +223,29 @@ else if(myisset("cancle","me"))
       {
        $message = "Hello, \n\n".
          "Game ".DB_format_gameid($gameid).
       {
        $message = "Hello, \n\n".
          "Game ".DB_format_gameid($gameid).
-         " has been cancled since nothing happend for a while and $myname requested it.\n";
+         " has been canceled since nothing happend for a while and $myname requested it.\n";
 
        $userids = DB_get_all_userid_by_gameid($gameid);
        foreach($userids as $user)
          {
            $To = DB_get_email_by_userid($user);
 
        $userids = DB_get_all_userid_by_gameid($gameid);
        foreach($userids as $user)
          {
            $To = DB_get_email_by_userid($user);
-           mymail($To,$EmailName."game ".DB_format_gameid($gameid)." cancled (timed out)",$message);
+           mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled (timed out)",$message);
          }
 
        /* delete everything from the dB */
        DB_cancel_game($me);
 
        echo "<p style=\"background-color:red\";>Game ".DB_format_gameid($gameid).
          }
 
        /* delete everything from the dB */
        DB_cancel_game($me);
 
        echo "<p style=\"background-color:red\";>Game ".DB_format_gameid($gameid).
-         " has been cancled.<br /><br /></p>";
+         " has been canceled.<br /><br /></p>";
       }
     else
       }
     else
-      echo "<p>You need to wait longer before you can cancle a game...</p>\n";
+      echo "<p>You need to wait longer before you can cancel a game...</p>\n";
   }
 /* send out a reminder */
 else if(myisset("remind","me"))
   {
   }
 /* send out a reminder */
 else if(myisset("remind","me"))
   {
+    output_status();
+
     $me = $_REQUEST["me"];
 
     /* test for valid ID */
     $me = $_REQUEST["me"];
 
     /* test for valid ID */
@@ -243,7 +253,7 @@ else if(myisset("remind","me"))
     if(!$myid)
       {
        echo "Can't find you in the database, please check the url.<br />\n";
     if(!$myid)
       {
        echo "Can't find you in the database, please check the url.<br />\n";
-       echo "perhaps the game has been cancled, check by login in <a href=\"$host\">here</a>.";
+       echo "perhaps the game has been canceled, check by login in <a href=\"$INDEX\">here</a>.";
        output_footer();
        DB_close();
        exit();
        output_footer();
        DB_close();
        exit();
@@ -268,7 +278,7 @@ else if(myisset("remind","me"))
          "It's your turn in game ".DB_format_gameid($gameid)." \n".
          "Actually everyone else is waiting for you for more than a week now ;)\n\n".
          "Please visit this link now to continue: \n".
          "It's your turn in game ".DB_format_gameid($gameid)." \n".
          "Actually everyone else is waiting for you for more than a week now ;)\n\n".
          "Please visit this link now to continue: \n".
-         " ".$host."?me=".$userhash."\n\n" ;
+         " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
 
        if(DB_get_reminder($r[1],$gameid)>0)
          {
 
        if(DB_get_reminder($r[1],$gameid)>0)
          {
@@ -297,7 +307,7 @@ else if(myisset("me"))
     if(!$myid)
       {
        echo "Can't find you in the database, please check the url.<br />\n";
     if(!$myid)
       {
        echo "Can't find you in the database, please check the url.<br />\n";
-       echo "perhaps the game has been cancled, check by login in <a href=\"$host\">here</a>.";
+       echo "perhaps the game has been canceled, check by login in <a href=\"$INDEX\">here</a>.";
        output_footer();
        DB_close();
        exit();
        output_footer();
        DB_close();
        exit();
@@ -371,7 +381,7 @@ else if(myisset("me"))
            if($hash == $me)
              echo "$i \n";
            else
            if($hash == $me)
              echo "$i \n";
            else
-             echo "<a href=\"".$host."?me=".$hash."\">$i</a> \n";
+             echo "<a href=\"".$INDEX."?me=".$hash."\">$i</a> \n";
            $i++;
          }
        echo "</div>\n";
            $i++;
          }
        echo "</div>\n";
@@ -409,7 +419,7 @@ else if(myisset("me"))
         */
        if( !myisset("in") )
          {
         */
        if( !myisset("in") )
          {
-           echo "<p class=\"message\"> You need to answer the <a href=\"$host?me=$me\">question</a>.</p>";
+           echo "<p class=\"message\"> You need to answer the <a href=\"$INDEX?me=$me\">question</a>.</p>";
            DB_set_hand_status_by_hash($me,'start');
          }
        else
            DB_set_hand_status_by_hash($me,'start');
          }
        else
@@ -437,7 +447,7 @@ else if(myisset("me"))
 
                output_check_for_sickness($me,$mycards);
 
 
                output_check_for_sickness($me,$mycards);
 
-               echo "<p class=\"mycards\">your cards are: <br />\n";
+               echo "<p class=\"mycards\">Your cards are: <br />\n";
                foreach($mycards as $card)
                  display_card($card,$PREF["cardset"]);
                echo "</p>\n";
                foreach($mycards as $card)
                  display_card($card,$PREF["cardset"]);
                echo "</p>\n";
@@ -459,7 +469,7 @@ else if(myisset("me"))
           * unless a user tries to cheat ;)
           * can also happen if user reloads the page!
           */
           * unless a user tries to cheat ;)
           * can also happen if user reloads the page!
           */
-         echo "<p class=\"message\"> You need to answer the <a href=\"$host?me=$me&in=yes\">questions</a>.</p>";
+         echo "<p class=\"message\"> You need to answer the <a href=\"$INDEX?me=$me&in=yes\">questions</a>.</p>";
          DB_set_hand_status_by_hash($me,'init');
        }
       else
          DB_set_hand_status_by_hash($me,'init');
        }
       else
@@ -474,7 +484,7 @@ else if(myisset("me"))
          if($Nvorbehalt>1)
            {
              echo "<p class=\"message\"> You selected more than one vorbehalt, please go back ".
          if($Nvorbehalt>1)
            {
              echo "<p class=\"message\"> You selected more than one vorbehalt, please go back ".
-               "and answer the <a href=\"$host?me=$me&in=yes\">question</a> again.</p>";
+               "and answer the <a href=\"$INDEX?me=$me&in=yes\">question</a> again.</p>";
              DB_set_hand_status_by_hash($me,'init');
            }
          else
              DB_set_hand_status_by_hash($me,'init');
            }
          else
@@ -525,7 +535,7 @@ else if(myisset("me"))
                  DB_set_sickness_by_hash($me,"nines");
                }
 
                  DB_set_sickness_by_hash($me,"nines");
                }
 
-             echo " Ok, done with checking, please go to the <a href=\"$host?me=$me\">next step of the setup</a>.</p>";
+             echo " Ok, done with checking, please go to the <a href=\"$INDEX?me=$me\">next step of the setup</a>.</p>";
 
              /* move on to the next stage*/
              DB_set_hand_status_by_hash($me,'poverty');
 
              /* move on to the next stage*/
              DB_set_hand_status_by_hash($me,'poverty');
@@ -555,7 +565,7 @@ else if(myisset("me"))
                        {
                          $message = "Everyone finish the questionary in game ".DB_format_gameid($gameid).", ".
                            "please visit this link now to continue: \n".
                        {
                          $message = "Everyone finish the questionary in game ".DB_format_gameid($gameid).", ".
                            "please visit this link now to continue: \n".
-                           " ".$host."?me=".$userhash."\n\n" ;
+                           " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
                          mymail($To,$EmailName." finished setup in game ".DB_format_gameid($gameid),$message);
                        }
                    };
                          mymail($To,$EmailName." finished setup in game ".DB_format_gameid($gameid),$message);
                        }
                    };
@@ -764,7 +774,7 @@ else if(myisset("me"))
                DB_set_party_by_hash($me,"contra");
 
              echo "Whoever will make the first trick will be on the re team. <br />\n";
                DB_set_party_by_hash($me,"contra");
 
              echo "Whoever will make the first trick will be on the re team. <br />\n";
-             echo " Ok, the game can start now, please finish <a href=\"$host?me=$me\">the setup</a>.<br />";
+             echo " Ok, the game can start now, please finish <a href=\"$INDEX?me=$me\">the setup</a>.<br />";
              DB_set_hand_status_by_hash($me,'play');
              break;
 
              DB_set_hand_status_by_hash($me,'play');
              break;
 
@@ -823,10 +833,11 @@ else if(myisset("me"))
                    {
                      $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
                      $userhash = DB_get_hash_from_game_and_pos($gameid,$who);
                    {
                      $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
                      $userhash = DB_get_hash_from_game_and_pos($gameid,$who);
-                     DB_set_player_by_gameid($gameid,$who);
+                     $userid   = DB_get_userid_by_email($To);
+                     DB_set_player_by_gameid($gameid,$userid);
 
                      $message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
 
                      $message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
-                       " ".$host."?me=".$userhash."\n\n" ;
+                       " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
                      mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
                    }
 
                      mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
                    }
 
@@ -903,11 +914,12 @@ else if(myisset("me"))
                            {
                              $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
                              $userhash = DB_get_hash_from_game_and_pos($gameid,$who);
                            {
                              $To       = DB_get_email_by_pos_and_gameid($who,$gameid);
                              $userhash = DB_get_hash_from_game_and_pos($gameid,$who);
-                             DB_set_player_by_gameid($gameid,$who);
+                             $userid   = DB_get_userid_by_email($To);
+                             DB_set_player_by_gameid($gameid,$userid);
 
                              $message = "Someone has poverty, it's your turn to decide, ".
                                         "if you want to take the trump. Please visit:".
 
                              $message = "Someone has poverty, it's your turn to decide, ".
                                         "if you want to take the trump. Please visit:".
-                                        " ".$host."?me=".$userhash."\n\n" ;
+                                        " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
                              mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
                            }
                        }
                              mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
                            }
                        }
@@ -990,7 +1002,7 @@ else if(myisset("me"))
                  echo "Your cards are: <br />\n";
                  $mycards = DB_get_hand($me);
                  sort($mycards);
                  echo "Your cards are: <br />\n";
                  $mycards = DB_get_hand($me);
                  sort($mycards);
-                 echo "<p class=\"mycards\">your cards are: <br />\n";
+                 echo "<p class=\"mycards\">Your cards are: <br />\n";
                  foreach($mycards as $card)
                    display_card($card,$PREF["cardset"]);
                  echo "</p>\n";
                  foreach($mycards as $card)
                    display_card($card,$PREF["cardset"]);
                  echo "</p>\n";
@@ -1009,19 +1021,19 @@ else if(myisset("me"))
          if($who==5 || $who==50)
            {
              $message = "Hello, \n\n".
          if($who==5 || $who==50)
            {
              $message = "Hello, \n\n".
-               "Game ".DB_format_gameid($gameid)." has been cancled since nobody wanted to take the trump.\n";
+               "Game ".DB_format_gameid($gameid)." has been canceled 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);
 
              $userids = DB_get_all_userid_by_gameid($gameid);
              foreach($userids as $user)
                {
                  $To = DB_get_email_by_userid($user);
-                 mymail($To,$EmailName."game ".DB_format_gameid($gameid)." cancled (poverty not resolved)",$message);
+                 mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled (poverty not resolved)",$message);
                }
 
              /* delete everything from the dB */
              DB_cancel_game($me);
 
                }
 
              /* delete everything from the dB */
              DB_cancel_game($me);
 
-             echo "<p style=\"background-color:red\";>Game ".DB_format_gameid($gameid)." has been cancled.<br /><br /></p>";
+             echo "<p style=\"background-color:red\";>Game ".DB_format_gameid($gameid)." has been canceled.<br /><br /></p>";
              output_footer();
              DB_close();
              exit();
              output_footer();
              DB_close();
              exit();
@@ -1048,15 +1060,15 @@ else if(myisset("me"))
              $who         = DB_get_userid_by_email($email);
              DB_set_player_by_gameid($gameid,$who);
 
              $who         = DB_get_userid_by_email($email);
              DB_set_player_by_gameid($gameid,$who);
 
-             if($hash!=$me)
+             if($hash!=$me && DB_get_email_pref_by_hash($hash)!="emailaddict")
                {
                  /* email startplayer) */
                  $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
                {
                  /* email startplayer) */
                  $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
-                   "Use this link to play a card: ".$host."?me=".$hash."\n\n" ;
+                   "Use this link to play a card: ".$HOST.$INDEX."?me=".$hash."\n\n" ;
                  mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
                }
              else
                  mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
                }
              else
-               echo " Please, <a href=\"$host?me=$me\">start</a> the game.<br />";
+               echo " Please, <a href=\"$INDEX?me=$me\">start</a> the game.<br />";
            }
          else
            echo "\n <br />";
            }
          else
            echo "\n <br />";
@@ -1104,7 +1116,8 @@ else if(myisset("me"))
       $r       = mysql_fetch_array($result,MYSQL_NUM);
       $gameend = time() - strtotime($r[0]);
 
       $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)) )
+      /* 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"];
        if(myisset("comment"))
          {
            $comment = $_REQUEST["comment"];
@@ -1143,19 +1156,39 @@ else if(myisset("me"))
       echo "\n<ul class=\"tricks\">\n";
       echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
 
       echo "\n<ul class=\"tricks\">\n";
       echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
 
+      /* output vorbehalte */
+      $mygametype =  DB_get_gametype_by_gameid($gameid);
+      if($mygametype != "normal") /* only show when needed */
+       {
+         echo "  <li onclick=\"hl('0');\" class=\"current\"><a href=\"#\">Pre</a>\n".
+           "    <div class=\"trick\" id=\"trick0\">\n";
+         $show = 1;
+         for($mypos=1;$mypos<5;$mypos++)
+           {
+             $usersick = DB_get_sickness_by_pos_and_gameid($mypos,$gameid);
+             if($usersick!=NULL)
+               {
+                 echo "      <div class=\"vorbehalt".($mypos-1)."\"> Vorbehalt <br />";
+                 if($show)
+                   echo " $usersick <br />";
+                 echo  " </div>\n";
+
+                 if($mygametype == $usersick)
+                   $show = 0;
+               }
+           }
+         echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
+       }
+
+      /* output tricks */
       while($r = mysql_fetch_array($result,MYSQL_NUM))
        {
          $pos     = $r[1];
          $seq     = $r[2];
          $trick   = $r[3];
          $comment = $r[4];
       while($r = mysql_fetch_array($result,MYSQL_NUM))
        {
          $pos     = $r[1];
          $seq     = $r[2];
          $trick   = $r[3];
          $comment = $r[4];
-         $timeplayed = strtotime($r[5]);
          $user    = $r[6];
 
          $user    = $r[6];
 
-         $offset = DB_get_user_timezone($user);
-         $zone   = return_timezone($offset);
-         date_default_timezone_set($zone);
-
          /* check if first schweinchen has been played */
          if( $GAME["schweinchen"] && ($r[0] == 19 || $r[0] == 20) )
            $GAME["schweinchen"]++;
          /* check if first schweinchen has been played */
          if( $GAME["schweinchen"] && ($r[0] == 19 || $r[0] == 20) )
            $GAME["schweinchen"]++;
@@ -1401,13 +1434,13 @@ else if(myisset("me"))
                    "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
                }
 
                    "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
                }
 
-             echo "<div class=\"card".($pos-1)."\">";
+             echo "      <div class=\"card".($pos-1)."\">\n        ";
 
              /* display comments */
              display_card($card,$PREF["cardset"]);
              if($comment!="")
 
              /* display comments */
              display_card($card,$PREF["cardset"]);
              if($comment!="")
-               echo "  <span class=\"comment\"> ".$comment."</span>\n";
-             echo "</div></div></li>\n";
+               echo "\n        <span class=\"comment\"> ".$comment."</span>\n";
+             echo "      </div>\n";
 
              /*check if we still have cards left, else set status to gameover */
              if(sizeof(DB_get_hand($me))==0)
 
              /*check if we still have cards left, else set status to gameover */
              if(sizeof(DB_get_hand($me))==0)
@@ -1440,8 +1473,9 @@ else if(myisset("me"))
 
                  $message = "A card has been played in game ".DB_format_gameid($gameid).".\n\n".
                    "It's your turn  now.\n".
 
                  $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."?me=".$next_hash."\n\n" ;
-                 mymail($email,$EmailName."a card has been played in game ".DB_format_gameid($gameid),$message);
+                   "Use this link to play a card: ".$HOST.$INDEX."?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);
                }
              else /* send out final email */
                {
                }
              else /* send out final email */
                {
@@ -1478,8 +1512,13 @@ else if(myisset("me"))
                      else if($r[0] == "contra")
                        $contra = $r[1];
                    }
                      else if($r[0] == "contra")
                        $contra = $r[1];
                    }
-                 /* save score in database */
-                 // get calls from re/contra
+
+                 /*
+                  * save score in database
+                  *
+                  */
+
+                 /* get calls from re/contra */
                  $call_re     = NULL;
                  $call_contra = NULL;
                  foreach($userids as $user)
                  $call_re     = NULL;
                  $call_contra = NULL;
                  foreach($userids as $user)
@@ -1508,85 +1547,150 @@ else if(myisset("me"))
                            }
                        }
                    }
                            }
                        }
                    }
-                 // no call, check 120:120
-                 if($call_re == NULL && $call_contra==NULL)
-                   if($re==120)
-                     mysql_query("INSERT INTO Score".
-                                 " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'againstqueens')");
 
 
-                 // no call or one call do scoring
-                 if($call_re != NULL && $call_contra!=NULL)
-                   {
-                     // two calls: not sure what to do yet
-                   }
+                 /* figure out who one */
+                 $winning_party = NULL;
+
+                 if($call_re == NULL && $call_contra==NULL)
+                   if($re>120)
+                     $winning_party="re";
+                   else
+                     $winning_party="contra";
                  else
                    {
                  else
                    {
-                     $offset = 0;
+                     if($call_re)
+                       {
+                         $offset = 120 - $call_re;
+                         if($call_re == 0)
+                           $offset--; /* since we use a > in the next equation */
+
+                         if($re > 120+$offset)
+                           $winning_party="re";
+                         else if ( $call_contra == NULL )
+                           $winning_party="contra";
+                       }
 
 
-                     if($call_re!=NULL)
-                       $offset = 120 - $call_re;
-                     else if($call_contra!=NULL)
-                       $offset = -1*(120 - $call_contra)-1;
+                     if($call_contra)
+                       {
+                         $offset = 120 - $call_contra;
+                         if($call_contra == 0)
+                           $offset--; /* since we use a > in the next equation */
+
+                         if($contra > 120+$offset)
+                           $winning_party="contra";
+                         else if ( $call_contra == NULL )
+                           $winning_party="re";
+                       }
+                   }
 
 
-                     if($call_re==0)
-                       $offset -= 1;
+                 /* one point for each call of the other party in case the other party didn't win
+                  * and one point each in case the party made more than points than one of the calls
+                  */
+                 if($winning_party!="contra" && $call_contra!=NULL)
+                   {
+                     for( $p=$call_contra;$p<=120; $p+=30 )
+                       {
+                         mysql_query("INSERT INTO Score".
+                                     " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'against$p')");
+                       }
 
 
-                     if($call_contra==0)
-                       $offset += 1;
+                     for( $p=$call_contra; $p<120; $p+=30)
+                       {
+                         if( $re >= $p )
+                           mysql_query("INSERT INTO Score".
+                                       " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'made$p')");
+                       }
+                   }
+                 if($winning_party!="re" and $call_re!=NULL)
+                   {
+                     for( $p=$call_re;$p<=120; $p+=30 )
+                       {
+                         mysql_query("INSERT INTO Score".
+                                     " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'against$p')");
+                       }
 
 
-                     if($re > 120 + $offset)
+                     for( $p=$call_re; $p<120; $p+=30)
                        {
                        {
-                         /* re won */
+                         if( $contra>=$p )
+                           mysql_query("INSERT INTO Score".
+                                       " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'made$p')");
+                       }
+                   }
 
 
-                         /* normal win */
-                         foreach(array(120,150,180,210,240) as $p)
-                           {
-                             $offset = 0;
-                             if($p==240)
-                               $offset = 1;
+                 /* point in case contra won */
+                 if($winning_party=="contra")
+                   {
+                     mysql_query("INSERT INTO Score".
+                                 " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'againstqueens')");
+                   }
 
 
-                             if($re>$p-$offset)
-                               mysql_query("INSERT INTO Score".
-                                           " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'$p')");
-                           }
+                 /* one point each for winning and each 30 points + calls */
+                 if($winning_party=="re")
+                   {
+                     foreach(array(120,150,180,210,240) as $p)
+                       {
+                         $offset = 0;
+                         if($p==240 || $call_contra!=NULL)
+                           $offset = 1;
 
 
-                         /* re called something and won */
-                         if($call_re!=NULL)
-                           foreach(array(0,30,60,90,120) as $p)
-                             {
-                               if($call_re<$p+1)
-                                 mysql_query("INSERT INTO Score".
-                                             " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'call$p')");
-                             }
+                         if($re>$p-$offset)
+                           mysql_query("INSERT INTO Score".
+                                       " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'".(240-$p)."')");
                        }
                        }
-                     else
+                     /* re called something and won */
+                     foreach(array(0,30,60,90,120) as $p)
                        {
                        {
-                         /* contra won */
-                         mysql_query("INSERT INTO Score".
-                                     " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'againstqueens')");
+                         if($call_re!=NULL && $call_re<$p+1)
+                           mysql_query("INSERT INTO Score".
+                                       " VALUES( NULL,NULL,$gameid,'re',NULL,NULL,'call$p')");
+                       }
+                   }
+                 else if( $winning_party=="contra")
+                   {
+                     foreach(array(120,150,180,210,240) as $p)
+                       {
+                         $offset = 0;
+                         if($p==240 || $call_re!=NULL)
+                           $offset = 1;
 
 
-                         /* normal win */
-                         foreach(array(120,150,180,210,240) as $p)
-                           {
-                             $offset = 0;
-                             if($p==240)
-                               $offset = 1;
+                         if($contra>$p-$offset)
+                           mysql_query("INSERT INTO Score".
+                                       " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'".(240-$p)."')");
+                       }
+                     /* re called something and won */
+                     foreach(array(0,30,60,90,120) as $p)
+                       {
+                         if($call_contra!=NULL && $call_contra<$p+1)
+                           mysql_query("INSERT INTO Score".
+                                       " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'call$p')");
+                       }
+                   }
 
 
-                             if($re>$p-$offset)
-                               mysql_query("INSERT INTO Score".
-                                           " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'$p')");
-                           }
 
 
-                         /* re called something and won */
-                         if($call_re!=NULL)
-                           foreach(array(0,30,60,90,120) as $p)
-                             {
-                               if($call_contra<$p+1)
-                                 mysql_query("INSERT INTO Score".
-                                             " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'call$p')");
-                             }
-                       }
+                 /* add score points to email */
+                 $message .= "\n";
+                 $Tpoint = 0;
+                 $message .= " Points Re: \n";
+                 $queryresult = mysql_query("SELECT score FROM Score ".
+                                            "  WHERE game_id=$gameid AND party='re'".
+                                            " ");
+                 while($r = mysql_fetch_array($queryresult,MYSQL_NUM) )
+                   {
+                     $message .= "   ".$r[0]."\n";
+                     $Tpoint ++;
+                   }
+                 $message .= " Points Contra: \n";
+                 $queryresult = mysql_query("SELECT score FROM Score ".
+                                            "  WHERE game_id=$gameid AND party='contra'".
+                                            " ");
+                 while($r = mysql_fetch_array($queryresult,MYSQL_NUM) )
+                   {
+                     $message .= "   ".$r[0]."\n";
+                     $Tpoint --;
                    }
                    }
+                 $message .= " Total Points (from the Re point of view): $Tpoint\n";
+                 $message .= "\n";
+
                  /* send out final email */
                  $all = array();
 
                  /* send out final email */
                  $all = array();
 
@@ -1602,8 +1706,10 @@ else if(myisset("me"))
                      $To   = DB_get_email_by_userid($user);
                      $hash = DB_get_hash_from_gameid_and_userid($gameid,$user);
 
                      $To   = DB_get_email_by_userid($user);
                      $hash = DB_get_hash_from_gameid_and_userid($gameid,$user);
 
-                     $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ".$host."?me=".$hash."\n\n" ;
-                     mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 2(2)",$link);
+                     $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ".
+                       $HOST.$INDEX."?me=".$hash."\n\n" ;
+                     if( DB_get_email_pref_by_uid($user) != "emailaddict" )
+                       mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 2(2)",$link);
                    }
                }
            }
                    }
                }
            }
@@ -1638,7 +1744,7 @@ else if(myisset("me"))
                                " GROUP BY User.fullname" );
          while( $r = mysql_fetch_array($result,MYSQL_NUM))
            echo "      <div class=\"card".($r[3]-1)."\">\n".
                                " GROUP BY User.fullname" );
          while( $r = mysql_fetch_array($result,MYSQL_NUM))
            echo "      <div class=\"card".($r[3]-1)."\">\n".
-                "        <span class=\"score\">".$r[2]."<br /> ".$r[1]."</span>\n".
+                "        <div class=\"score\">".$r[2]."<br /> ".$r[1]."</div>\n".
                 "      </div>\n";
 
          echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
                 "      </div>\n";
 
          echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
@@ -1711,7 +1817,7 @@ else if(myisset("me"))
       /* check if game is over, display results */
       if(DB_get_game_status_by_gameid($gameid)=='play')
        {
       /* check if game is over, display results */
       if(DB_get_game_status_by_gameid($gameid)=='play')
        {
-         echo "the game is over for you.. other people still need to play though";
+         echo "The game is over for you.. other people still need to play though";
        }
       else
        {
        }
       else
        {
@@ -1726,8 +1832,26 @@ else if(myisset("me"))
          echo "<div class=\"total\"> Totals:<br />\n";
          while( $r = mysql_fetch_array($result,MYSQL_NUM))
            echo "  ".$r[0]." ".$r[1]."<br />\n";
          echo "<div class=\"total\"> Totals:<br />\n";
          while( $r = mysql_fetch_array($result,MYSQL_NUM))
            echo "  ".$r[0]." ".$r[1]."<br />\n";
+
+         echo "<div class=\"re\">\n Points Re: <br />\n";
+         $queryresult = mysql_query("SELECT score FROM Score ".
+                                    "  WHERE game_id=$gameid AND party='re'".
+                                    " ");
+         while($r = mysql_fetch_array($queryresult,MYSQL_NUM) )
+           echo "   ".$r[0]."<br />\n";
          echo "</div>\n";
 
          echo "</div>\n";
 
+         echo "<div class=\"contra\">\n Points Contra: <br />\n";
+         $queryresult = mysql_query("SELECT score FROM Score ".
+                                    "  WHERE game_id=$gameid AND party='contra'".
+                                    " ");
+         while($r = mysql_fetch_array($queryresult,MYSQL_NUM) )
+           echo "   ".$r[0]."<br />\n";
+         echo "</div>\n";
+
+         echo "</div>\n";
+
+
        }
       break;
     default:
        }
       break;
     default:
@@ -1844,7 +1968,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
                   echo "N.B. You tried this already $number times during the last day and it will only work ".
                     " 5 times during a day.<br />";
                 echo "The new password will be valid for one day, make sure you reset it to something else.<br />";
                   echo "N.B. You tried this already $number times during the last day and it will only work ".
                     " 5 times during a day.<br />";
                 echo "The new password will be valid for one day, make sure you reset it to something else.<br />";
-                echo "Back to the  <a href=\"$host\">main page</a>.";
+                echo "Back to the  <a href=\"$INDEX\">main page</a>.";
 
                 $TIME  = (string) time(); /* to avoid collisions */
                 $hash  = md5("Anewpassword".$email.$TIME);
 
                 $TIME  = (string) time(); /* to avoid collisions */
                 $hash  = md5("Anewpassword".$email.$TIME);
@@ -1864,18 +1988,18 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
               {
                 echo "Sorry you already tried 5 times during the last 24h.<br />".
                   "You need to use one of those passwords or wait to get a new one.<br />";
               {
                 echo "Sorry you already tried 5 times during the last 24h.<br />".
                   "You need to use one of those passwords or wait to get a new one.<br />";
-                echo "Back to the <a href=\"$host\">main page</a>.";
+                echo "Back to the <a href=\"$INDEX\">main page</a>.";
               }
           }
         else
           {
             if($email=="")
               echo "You need to give me an email address! <br />".
               }
           }
         else
           {
             if($email=="")
               echo "You need to give me an email address! <br />".
-                "Please try <a href=\"$host\">again</a>.";
+                "Please try <a href=\"$INDEX\">again</a>.";
             else
               echo "Couldn't find a player with this email! <br />".
                 "Please contact Arun, if you think this is a mistake <br />".
             else
               echo "Couldn't find a player with this email! <br />".
                 "Please contact Arun, if you think this is a mistake <br />".
-                "or else try <a href=\"$host\">again</a>.";
+                "or else try <a href=\"$INDEX\">again</a>.";
           }
        }
      else
           }
        }
      else
@@ -1891,6 +2015,10 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
 
        if($ok)
         {
 
        if($ok)
         {
+          $myname = DB_get_name_by_email($email);
+          $_SESSION["name"] = $myname;
+          output_status();
+
           DB_get_PREF($myid);
 
           if(myisset("setpref"))
           DB_get_PREF($myid);
 
           if(myisset("setpref"))
@@ -1910,6 +2038,18 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
                                           DB_quote_smart($setpref).")");
                   echo "Ok, changed you preferences for the cards.\n";
                   break;
                                           DB_quote_smart($setpref).")");
                   echo "Ok, changed you preferences for the cards.\n";
                   break;
+                case "emailaddict":
+                case "emailnonaddict":
+                  $result = mysql_query("SELECT * from User_Prefs".
+                                        " WHERE user_id='$myid' AND pref_key='email'" );
+                  if( mysql_fetch_array($result,MYSQL_NUM))
+                    $result = mysql_query("UPDATE User_Prefs SET value=".DB_quote_smart($setpref).
+                                          " WHERE user_id='$myid' AND pref_key='email'" );
+                  else
+                    $result = mysql_query("INSERT INTO User_Prefs VALUES(NULL,'$myid','email',".
+                                          DB_quote_smart($setpref).")");
+                  echo "Ok, changed you preferences for sending out emails.\n";
+                  break;
                 }
             }
           else if(myisset("passwd"))
                 }
             }
           else if(myisset("passwd"))
@@ -1951,24 +2091,9 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
             }
           else /* output default user page */
             {
             }
           else /* output default user page */
             {
-              $time     = DB_get_user_timestamp($myid);
-              $unixtime = strtotime($time);
-
-              $offset   = DB_get_user_timezone($myid);
-              $zone     = return_timezone($offset);
-              date_default_timezone_set($zone);
-
-              $myname = DB_get_name_by_email($email);
-              $_SESSION["name"] = $myname;
-
-              if(isset($_SESSION["name"]))
-                output_status($_SESSION["name"]);
-
               /* display links to settings */
               output_user_settings();
 
               /* display links to settings */
               output_user_settings();
 
-              echo "<div class=\"lastlogin\">last login: ".date("r",$unixtime)."</div>";
-
               DB_update_user_timestamp($myid);
 
               display_user_menu();
               DB_update_user_timestamp($myid);
 
               display_user_menu();
@@ -2002,14 +2127,14 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
                     }
                   if($r[4]=='pre')
                     {
                     }
                   if($r[4]=='pre')
                     {
-                      echo "\n   <span class=\"gamestatuspre\"><a href=\"".$host."?me=".$r[0]."\">p </a></span> ";
+                      echo "\n   <span class=\"gamestatuspre\"><a href=\"".$INDEX."?me=".$r[0]."\">p </a></span> ";
 
                     }
                   else if ($r[4]=='gameover')
 
                     }
                   else if ($r[4]=='gameover')
-                    echo "\n   <span class=\"gamestatusover\"><a href=\"".$host."?me=".$r[0]."\">F </a></span> ";
+                    echo "\n   <span class=\"gamestatusover\"><a href=\"".$INDEX."?me=".$r[0]."\">F </a></span> ";
                   else
                     {
                   else
                     {
-                      echo "\n   <span class=\"gamestatusplay\"><a href=\"".$host."?me=".$r[0]."\">P </a></span> ";
+                      echo "\n   <span class=\"gamestatusplay\"><a href=\"".$INDEX."?me=".$r[0]."\">P </a></span> ";
                     }
                   if($r[4] != 'gameover')
                     {
                     }
                   if($r[4] != 'gameover')
                     {
@@ -2025,13 +2150,13 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
                               if(DB_get_reminder($r[3],$gameid)==0)
                                 if(time()-strtotime($r[2]) > 60*60*24*7)
                                   echo "".
                               if(DB_get_reminder($r[3],$gameid)==0)
                                 if(time()-strtotime($r[2]) > 60*60*24*7)
                                   echo "".
-                                    "<a href=\"$host?remind=1&amp;me=".$r[0]."\">Send a reminder.</a>";
+                                    "<a href=\"$INDEX?remind=1&amp;me=".$r[0]."\">Send a reminder.</a>";
                               echo "(it's $name's turn)\n";
                             };
                         }
                       if(time()-strtotime($r[2]) > 60*60*24*30)
                         echo "".
                               echo "(it's $name's turn)\n";
                             };
                         }
                       if(time()-strtotime($r[2]) > 60*60*24*30)
                         echo "".
-                          "<a href=\"$host?cancle=1&amp;me=".$r[0]."\">Cancel?</a>".
+                          "<a href=\"$INDEX?cancel=1&amp;me=".$r[0]."\">Cancel?</a>".
                           " (clicking here is final and can't be restored)";
 
                     }
                           " (clicking here is final and can't be restored)";
 
                     }
@@ -2045,7 +2170,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
         }
        else
         {
         }
        else
         {
-          echo "Sorry email and password don't match. Please <a href=\"$host\">try again</a>. <br />";
+          echo "<div class=\"message\">Sorry email and password don't match. Please <a href=\"$INDEX\">try again</a>. </div>";
         }
      };
      output_footer();
         }
      };
      output_footer();