BUFIX: fixed a typo

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

diff --git a/include/user.php b/include/user.php
index 67c720a2b6562ecc841f39e5cae218b4ade78871..bac439895098d170ba6c86f12fdb93e4631b27ff 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -53,8 +53,9 @@ if(myisset("forgot"))
              "   $newpw    \n".
              "to log into the server. The new password is valid for 24h, so make\n".
              "sure you reset your password to something new. Your old password will\n".
-             " also still be valid until you set a new one\n";
-           mymail($email,$EmailName."recovery ",$message);
+             "also still be valid until you set a new one.\n";
+           $subject = 'Recovery';
+           mymail($myid,$subject,$message);
 
            /* we save these in the database */
            DB_set_recovery_password($myid,md5($newpw));
@@ -103,16 +104,26 @@ else
 
        DB_update_user_timestamp($myid);
 
-       display_user_menu();
+       display_user_menu($myid);
 
        /* display all games the user has played */
        echo "<div class=\"user\">";
+
+       if($myvacation = check_vacation($myid))
+         {
+           $vac_start   = $myvacation[0];
+           $vac_stop    = $myvacation[1];
+           $vac_comment = $myvacation[2];
+           echo "<p class=\"vacation\">Enjoy your vacation (don't forgot to change your settings once you're back). Between $vac_start and $vac_stop other users will see the following message: $vac_comment.</p>\n";
+         }
+
        echo "<h4>These are all your games:</h4>\n";
+       /* output legend */
        echo "<p>Session: <br />\n";
        echo "<span class=\"gamestatuspre\"> p </span> =  pre-game phase ";
        echo "<span class=\"gamestatusplay\">P </span> =  game in progess ";
-       echo "<span class=\"gamestatusover\">F </span> =  game finished ";
-       echo "<span class=\"gamestatusover multi\"><a> N</a> </span> =  game finished, hand played by others too <br />";
+       echo "<span class=\"gamestatusover\">E </span> =  game ended ";
+       echo "<span class=\"gamestatusover multi\"><a>N</a> </span> =  N games with same hand <br />";
        echo "</p>\n";
 
        $output = array();
@@ -124,9 +135,11 @@ else
                           " ORDER BY G.session,G.create_date" );
 
        $gamenrold = -1;
+       $count = 0;
        echo "<table>\n <tr><td>\n";
        while( $r = DB_fetch_array($result))
          {
+           $count++;
            $game = DB_format_gameid($r[1]);
            $gamenr = (int) $game;
            if($gamenrold < $gamenr)
@@ -141,18 +154,18 @@ else
            $Multi = ($r[5]>1) ? "multi" : "";
            if($r[4]=='pre')
              echo "   <span class=\"gamestatuspre $Multi\"><a href=\"".$INDEX."?action=game&amp;me=".$r[0]."\">p </a></span>\n";
-           else if ($r[4]=='gameover')
+           else if (in_array($r[4],array('gameover','cancel-timedout','cancel-nines','cancel-noplay','cancel-trump')))
            {
              echo "   <span class=\"gamestatusover $Multi\"><a href=\"".$INDEX."?action=game&amp;me=".$r[0]."\">";
              if($r[5]<2)
-               echo "F ";
+               echo "E ";
              else
                echo $r[5];
              echo "</a></span>\n";
            }
            else
              echo "   <span class=\"gamestatusplay $Multi\"><a href=\"".$INDEX."?action=game&amp;me=".$r[0]."\">P </a></span>\n";
-           if($r[4] != 'gameover')
+           if($r[4] == 'pre' || $r[4] == 'play')
              {
                echo "</td>\n<td>\n    ";
                if($r[3]==$myid || !$r[3])
@@ -161,18 +174,31 @@ else
                  {
                    $name = DB_get_name('userid',$r[3]);
                    $gameid = $r[1];
+                   /* check if we need to send out a reminder */
                    if(DB_get_reminder($r[3],$gameid)==0)
                      if(time()-strtotime($r[2]) > 60*60*24*7)
                        echo "<a href=\"$INDEX?action=reminder&amp;me=".$r[0]."\">Send a reminder.</a>";
-                   echo "(it's $name's turn)\n";
+
+                   /* check vacaction status of this user */
+                   if($vacation=check_vacation($r[3]))
+                     {
+                       $stop = substr($vacation[1],0,10);
+                       $title = 'begin:'.substr($vacation[0],0,10).' end:'.$vacation[1].' '.$vacation[2];
+                       echo "(it's <span class=\"vacation\" title=\"$title\">$name's (on vacation until $stop)</span> turn)\n";
+                     }
+                   else
+                     echo "(it's $name's turn)\n";
                  };
                if(time()-strtotime($r[2]) > 60*60*24*30)
-                 echo "<a href=\"$INDEX?action=cancel&amp;me=".$r[0]."\">Cancel?</a>".
-                   " (clicking here is final and can't be restored)";
+                 echo "<a href=\"$INDEX?action=cancel&amp;me=".$r[0]."\">Cancel?</a> ";
              }
          }
        echo "</td></tr>\n</table>\n";
 
+       /* give a hint for new players */
+       if($count<10)
+         echo "<p class=\"newbiehint\">You can start new games using the link in the top right corner!</p>\n";
+
        /* display last 5 users that have signed up to e-DoKo */
        $names = DB_get_names_of_new_logins(5);
        echo "<h4>New Players:</h4>\n<p>\n";