X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fuser.php;h=6169495e1c54b6fd0ef7e309e06947993bb20283;hp=e8d38f7c3770026b7915b444222101058d157e91;hb=64586775883969c933517edc541b6f5a0878bd7d;hpb=615fb7c0fec9ec6f187a3c568cf1e2e6c1572b1e
diff --git a/include/user.php b/include/user.php
index e8d38f7..6169495 100644
--- a/include/user.php
+++ b/include/user.php
@@ -1,5 +1,5 @@
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arun Persaud '._("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. '._("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.")." '._('Games').": \n";
- echo ' = '._('pre-game phase');
- echo ' = '._('game in progess');
- echo 'N = '._('game over (N people played the same hand)').' \n";
+ echo ' '._('pre-game phase');
+ echo ' '._('game in progess');
+ echo ' N '._('game over (N people played this hand)').'
';
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.
";
+ echo sprintf(_("N.B. You tried this already %s times during the last day and it will only work".
+ " 5 times during a day."),$number)."
\n";
echo _('The new password will be valid for one day, make sure you reset it to something else.').'
';
- echo "Back to the main page.";
+ echo sprintf(_('Back to the main page.'),$INDEX);
/* create temporary password, use the fist 8 letters of a md5 hash */
$TIME = (string) time(); /* to avoid collisions */
$hash = md5('Anewpassword'.$email.$TIME);
$newpw = substr($hash,1,8);
- $message = "Someone (hopefully you) requested a new password. \n".
- "You can use this email and the following password: \n".
- " $newpw \n".
+ $message = sprintf( _("Someone (hopefully you) requested a new password.\n".
+ "You can use this email and the following password:\n".
+ " %s\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";
- $subject = 'Recovery';
- mymail($myid,$subject,$message);
+ "also still be valid until you set a new one.\n"), $newpw);
+ mymail($myid,0, GAME_RECOVERY, $message);
/* we save these in the database */
DB_set_recovery_password($myid,md5($newpw));
@@ -87,7 +83,7 @@ if(myisset('forgot'))
* and spam a user this way */
echo _('Sorry you already tried 5 times during the last 24h.
'.
'You need to use one of those passwords or wait to get a new one.').'
';
- echo "Back to the main page.";
+ echo sprintf(_('Back to the main page.'),$INDEX);
}
}
else
@@ -95,24 +91,26 @@ if(myisset('forgot'))
/* no email given? */
if($email=="")
- echo "You need to give me an email address!
".
- "Please try again.";
+ echo _('You need to give me an email address!')."
".
+ sprintf(_('Please try again.'),$INDEX);
else /* default error message */
- echo "Couldn't find a player with this email!
".
- "Please contact $ADMIN_NAME, if you think this is a mistake
".
- "or else try again.";
+ echo _("Couldn't find a player with this email!")."
".
+ sprintf(_('Please contact %s, if you think this is a mistake '.
+ 'or else try again.'),$ADMIN_NAME, $INDEX );
}
}
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)
+ if(isset($email, $password))
+ {
+ $myid = DB_get_userid('email-password',$email,$password);
+ if(!$myid)
+ $ok = 0;
+ }
+ else
$ok = 0;
if($ok)
@@ -122,6 +120,9 @@ else
$_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'];
+ set_language($PREF['language']);
DB_update_user_timestamp($myid);
@@ -135,16 +136,16 @@ else
$vac_start = $myvacation[0];
$vac_stop = $myvacation[1];
$vac_comment = $myvacation[2];
- echo ''._('These are all your games').":
\n";
+ echo ''._('These are your games').":
\n";
/* output legend */
- echo '
';
+ echo "
';
echo ' '._("Reminder: canceling a game can't be reversed!");
echo "