X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fuser.php;h=0273183d0ba5a99b909f8319362ac91c82881527;hp=3b5303c2cf4a73fc2b8b3fa02dc249ea327f1612;hb=4cbc3848a891ac9addf10264d24a9f4273c5e355;hpb=b22032b3181b49cf01ef66217316a7b78b5045c9

diff --git a/include/user.php b/include/user.php
index 3b5303c..0273183 100644
--- 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 = $EmailName.' Recovery';
+	    sendmail($email,$subject,$message);
 
 	    /* we save these in the database */
 	    DB_set_recovery_password($myid,md5($newpw));
@@ -107,6 +108,15 @@ else
 
 	/* 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";
@@ -144,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)
@@ -155,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])
@@ -164,14 +174,23 @@ 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";