Merge branch 'master' of /home/arun/nubati.net/git/e-DoKo

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

diff --git a/include/user.php b/include/user.php
index 8855fc070502bade79e253dd5d6b054502415ee7..1f2ae74fd7f70eb42e117042a227704e6cd652aa 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -1,4 +1,23 @@
 <?php
+/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+ *
+ *   This file is part of e-DoKo.
+ *
+ *   e-DoKo is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   e-DoKo is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with e-DoKo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 /* make sure that we are not called from outside the scripts,
  * use a variable defined in config.php to check this
  */
@@ -54,8 +73,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 +173,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 +184,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 +209,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 +225,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";