NEW FEATURE: provide an RSS feed for each user showing in which games it's his turn

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

diff --git a/include/user.php b/include/user.php
index 8855fc070502bade79e253dd5d6b054502415ee7..a027f40ee18cf3a173ffcb185ce30e66a119555f 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -54,8 +54,8 @@ if(myisset("forgot"))
              "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";
-           $subject = $EmailName.' Recovery';
-           sendmail($email,$subject,$message);
+           $subject = 'Recovery';
+           mymail($myid,$subject,$message);
 
            /* we save these in the database */
            DB_set_recovery_password($myid,md5($newpw));
@@ -154,7 +154,7 @@ 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)
@@ -165,7 +165,7 @@ else
            }
            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])
@@ -190,8 +190,7 @@ 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";
@@ -207,9 +206,14 @@ else
        echo "</p>\n";
 
        /* display last 5 users that logged on */
-       $names = DB_get_names_of_last_logins(5);
        echo "<h4>Players last logged in:</h4>\n<p>\n";
-       echo implode(", ",$names).",...\n";
+
+       $names  = DB_get_names_of_last_logins(7);
+       $emails = DB_get_emails_of_last_logins(7);
+       for($i=0;$i<7;$i++)
+         {
+           echo "<img class=\"gravatar\" title=\"".$names[$i]."\" src=\"http://www.gravatar.com/avatar/".md5(strtolower(trim($emails[$i])))."?d=identicon\" />\n";
+         }
        echo "</p>\n";
 
        echo "</div>\n";