X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fuser.php;h=1b3d83e69d2b20d95ef01cf6a6bd25addd244fcc;hp=3046b346e483015be7675830d08e9b9c9174f297;hb=4ace44d3bfa9a4ec099a3a3bf56d6971f054eb5b;hpb=5e3f5fe45c7d05a85f5e36637b3dd937e1ac3596

diff --git a/include/user.php b/include/user.php
index 3046b34..1b3d83e 100644
--- a/include/user.php
+++ b/include/user.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -25,20 +25,22 @@ 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"];
+    $email     = $_REQUEST['email'];
+    $password  = $_REQUEST['password'];
   }
 else
   {
-    $name = $_SESSION["name"];
+    $name = $_SESSION['name'];
     $email     = DB_get_email('name',$name);
     $password  = DB_get_passwd_by_name($name);
   };
 
+global  $ADMIN_NAME;
+
 /* user has forgotten his password */
-if(myisset("forgot"))
+if(myisset('forgot'))
   {
     /* check if player is in the database */
     $ok = 1;
@@ -55,16 +57,16 @@ if(myisset("forgot"))
 	/* if less than N recent ones, add a new one and send out email */
 	if( $number < 5 )
 	  {
-	    echo "Ok, I send you a new password. <br />";
+	    echo _('Ok, I will send you a new password.').' <br />';
 	    if($number >1)
 	      echo "N.B. You tried this already $number times during the last day and it will only work ".
 		" 5 times during a day.<br />";
-	    echo "The new password will be valid for one day, make sure you reset it to something else.<br />";
+	    echo _('The new password will be valid for one day, make sure you reset it to something else.').'<br />';
 	    echo "Back to the  <a href=\"$INDEX\">main page</a>.";
 
 	    /* create temporary password, use the fist 8 letters of a md5 hash */
 	    $TIME  = (string) time(); /* to avoid collisions */
-	    $hash  = md5("Anewpassword".$email.$TIME);
+	    $hash  = md5('Anewpassword'.$email.$TIME);
 	    $newpw = substr($hash,1,8);
 
 	    $message = "Someone (hopefully you) requested a new password. \n".
@@ -73,8 +75,7 @@ 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 = 'Recovery';
-	    mymail($myid,$subject,$message);
+	    mymail($myid,0, GAME_RECOVERY, $message);
 
 	    /* we save these in the database */
 	    DB_set_recovery_password($myid,md5($newpw));
@@ -83,8 +84,8 @@ if(myisset("forgot"))
 	  {
 	    /* make it so that people (or a robot) can request thousands of passwords within a short time
 	     * and spam a user this way */
-	    echo "Sorry you already tried 5 times during the last 24h.<br />".
-	      "You need to use one of those passwords or wait to get a new one.<br />";
+	    echo _('Sorry you already tried 5 times during the last 24h.<br />'.
+		   'You need to use one of those passwords or wait to get a new one.').'<br />';
 	    echo "Back to the <a href=\"$INDEX\">main page</a>.";
 	  }
       }
@@ -97,7 +98,7 @@ if(myisset("forgot"))
 	    "Please try <a href=\"$INDEX\">again</a>.";
 	else /* default error message */
 	  echo "Couldn't find a player with this email! <br />".
-	    "Please contact Arun, if you think this is a mistake <br />".
+	    "Please contact $ADMIN_NAME, if you think this is a mistake <br />".
 	    "or else try <a href=\"$INDEX\">again</a>.";
       }
   }
@@ -117,16 +118,18 @@ else
       {
 	/* user information is ok */
 	$myname = DB_get_name('email',$email);
-	$_SESSION["name"] = $myname;
+	$_SESSION['name'] = $myname;
 
 	$PREF = DB_get_PREF($myid);
+	/* set language chosen in preferences, will become active on the next reload (see index.php)*/
+	$_SESSION['language'] = $PREF['language'];
 
 	DB_update_user_timestamp($myid);
 
 	display_user_menu($myid);
 
 	/* display all games the user has played */
-	echo "<div class=\"user\">";
+	echo '<div class="user">';
 
 	if($myvacation = check_vacation($myid))
 	  {
@@ -137,12 +140,12 @@ else
 	      " 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";
+	echo '<h4>'._('These are your games').":</h4>\n";
 	/* output legend */
-	echo '<p>'._('Games').": \n";
-	echo '<span class="gamestatuspre"> &nbsp; </span> =  '._('pre-game phase');
-	echo '<span class="gamestatusplay"> &nbsp; </span> =  '._('game in progess');
-	echo '<span class="gamestatusover "><a>N</a> </span> = '._('game over (N people played the same hand)').' <br />';
+	echo "<p>\n";
+	echo ' <span class="gamestatuspre"> &nbsp; </span> &nbsp;'._('pre-game phase');
+	echo ' <span class="gamestatusplay"> &nbsp; </span> &nbsp;'._('game in progess');
+	echo ' <span class="gamestatusover "><a>N</a> </span> &nbsp;'._('game over (N people played this hand)').' <br />';
 	echo ' '._("Reminder: canceling a game can't be reversed!");
 	echo "</p>\n";
 
@@ -327,7 +330,7 @@ else
       }
     else
       {
-	echo "<div class=\"message\">Sorry email and password don't match. Please <a href=\"$INDEX\">try again</a>. </div>";
+	echo '<div class="message">'."Sorry email and password don't match. Please <a href=\"$INDEX\">try again</a>.".' </div>';
       }
   };
 ?>
\ No newline at end of file