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=19eb27bc6745da85544254d34e7acd1c632d11a4;hb=6206ef89ad9a9a1a541ecb67971815d11f12199b;hpb=cd4cbd4a1cce2c35a6a78b1b957c17389001b4b1

diff --git a/include/user.php b/include/user.php
index 19eb27b..0273183 100644
--- a/include/user.php
+++ b/include/user.php
@@ -1,12 +1,12 @@
 <?php
-/* make sure that we are not called from outside the scripts, 
+/* make sure that we are not called from outside the scripts,
  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))
   exit;
 
 /* test id and password, should really be done in one step */
-if(!isset($_SESSION["name"])) 
+if(!isset($_SESSION["name"]))
   {
     $email     = $_REQUEST["email"];
     $password  = $_REQUEST["password"];
@@ -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));
@@ -70,7 +71,7 @@ if(myisset("forgot"))
       }
     else
       {/* can't find user id in the database */
-	     
+
 	/* no email given? */
 	if($email=="")
 	  echo "You need to give me an email address! <br />".
@@ -81,48 +82,64 @@ if(myisset("forgot"))
 	    "or else try <a href=\"$INDEX\">again</a>.";
       }
   }
-else 
+else
   { /* normal user page */
-    
+
     /* verify password and email */
     if(strlen($password)!=32)
       $password = md5($password);
-    
+
     $ok  = 1;
     $myid = DB_get_userid('email-password',$email,$password);
     if(!$myid)
       $ok = 0;
-    
+
     if($ok)
       {
 	/* user information is ok */
 	$myname = DB_get_name('email',$email);
 	$_SESSION["name"] = $myname;
-	
+
 	$PREF = DB_get_PREF($myid);
-	
+
 	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 <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();
-	$result = DB_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player,Game.status from Hand".
-			   " LEFT JOIN Game ON Game.id=Hand.game_id".
+	$result = DB_query("SELECT Hand.hash,Hand.game_id,G.mod_date,G.player,G.status, ".
+			   " (SELECT count(H.randomnumbers) FROM Game H WHERE H.randomnumbers=G.randomnumbers) AS count ".
+			   " FROM Hand".
+			   " LEFT JOIN Game G ON G.id=Hand.game_id".
 			   " WHERE user_id='$myid'".
-			   " ORDER BY Game.session,Game.create_date" );
+			   " 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)
@@ -134,13 +151,21 @@ else
 		$gamenrold = $gamenr;
 		echo "<td class=\"usergames\">\n";
 	      }
+	    $Multi = ($r[5]>1) ? "multi" : "";
 	    if($r[4]=='pre')
-	      echo "   <span class=\"gamestatuspre\"><a href=\"".$INDEX."?action=game&amp;me=".$r[0]."\">p </a></span>\n";
-	    else if ($r[4]=='gameover')
-	      echo "   <span class=\"gamestatusover\"><a href=\"".$INDEX."?action=game&amp;me=".$r[0]."\">F </a></span>\n";
+	      echo "   <span class=\"gamestatuspre $Multi\"><a href=\"".$INDEX."?action=game&amp;me=".$r[0]."\">p </a></span>\n";
+	    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 "E ";
+	      else
+		echo $r[5];
+	      echo "</a></span>\n";
+	    }
 	    else
-	      echo "   <span class=\"gamestatusplay\"><a href=\"".$INDEX."?action=game&amp;me=".$r[0]."\">P </a></span>\n";
-	    if($r[4] != 'gameover')
+	      echo "   <span class=\"gamestatusplay $Multi\"><a href=\"".$INDEX."?action=game&amp;me=".$r[0]."\">P </a></span>\n";
+	    if($r[4] == 'pre' || $r[4] == 'play')
 	      {
 		echo "</td>\n<td>\n    ";
 		if($r[3]==$myid || !$r[3])
@@ -149,30 +174,43 @@ 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";
 	echo implode(", ",$names).",...\n";
 	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";
 	echo "</p>\n";
-	
+
 	echo "</div>\n";
       }
     else