X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fuser.php;h=65544f56fc020999d9b0c29d576d9c9dbc8515ab;hp=55b84f4e5e3379b4f4debab91ef6330c9bf0bea9;hb=ef0fd1178c4f9e5bea92dac7d02a12ce0d523547;hpb=46140faa11b97252647178a811da22509256d6c4
diff --git a/include/user.php b/include/user.php
index 55b84f4..65544f5 100644
--- a/include/user.php
+++ b/include/user.php
@@ -25,11 +25,15 @@ if(!isset($HOST))
exit;
/* test id and password, should really be done in one step */
-if(isset($_SESSION['name']))
+if(isset($_SESSION['id']))
{
- $name = $_SESSION['name'];
- $email = DB_get_email('name',$name);
- $password = DB_get_passwd_by_name($name);
+ $myid = $_SESSION['id'];
+ $r = DB_query_array("SELECT email,password FROM User WHERE id=".DB_quote_smart($myid)."");
+ if($r)
+ {
+ $email = $r[0];
+ $password = $r[1];
+ };
};
global $ADMIN_NAME;
@@ -46,6 +50,8 @@ if(myisset('forgot'))
if($ok)
{
+ set_language($myid,'uid');
+
/* check how many entries in recovery table */
$number = DB_get_number_of_passwords_recovery($myid);
@@ -54,10 +60,10 @@ if(myisset('forgot'))
{
echo _('Ok, I will send you a new password.').'
';
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 */
@@ -81,7 +87,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
@@ -89,12 +95,12 @@ 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
@@ -134,8 +140,8 @@ else
$vac_start = $myvacation[0];
$vac_stop = $myvacation[1];
$vac_comment = $myvacation[2];
- echo '
'._("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.
\n"; + echo ''._("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.")."
\n"; } echo '