X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fuser.php;h=2c3afeb33b01d4f99f3136c292fae1072c4a895a;hp=54ce3026ce83e12e1883827b347693ea370a72f3;hb=cc95c662be086f71697755fe6939ff4840fe25b1;hpb=448ca16b770c8cfe055f4ffb41cd5c189da3cde0
diff --git a/include/user.php b/include/user.php
index 54ce302..2c3afeb 100644
--- a/include/user.php
+++ b/include/user.php
@@ -1,25 +1,46 @@
+ *
+ * This file is part of e-DoKo.
+ *
+ * e-DoKo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * e-DoKo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with e-DoKo. If not, see
";
+ 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 "The new password will be valid for one day, make sure you reset it to something else.
";
+ echo _('The new password will be valid for one day, make sure you reset it to something else.').'
';
echo "Back to the main page.";
/* 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".
@@ -53,8 +74,8 @@ 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";
+ mymail($myid,0, GAME_RECOVERY, $message);
/* we save these in the database */
DB_set_recovery_password($myid,md5($newpw));
@@ -63,133 +84,251 @@ 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.
".
- "You need to use one of those passwords or wait to get a new one.
";
+ 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.";
}
}
else
{/* can't find user id in the database */
-
+
/* no email given? */
if($email=="")
echo "You need to give me an email address!
".
"Please try again.";
else /* default error message */
echo "Couldn't find a player with this email!
".
- "Please contact Arun, if you think this is a mistake
".
+ "Please contact $ADMIN_NAME, if you think this is a mistake
".
"or else try again.";
}
}
- 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;
- output_status();
-
- $PREF = DB_get_PREF($myid);
-
- DB_update_user_timestamp($myid);
-
- display_user_menu();
-
- /* display all games the user has played */
- echo "
Session:
\n";
- echo " p = pre-game phase ";
- echo "P = game in progess ";
- echo "F = game finished
";
- echo "
\n"; - while( $r = DB_fetch_array($result)) - { - $game = DB_format_gameid($r[1]); - $gamenr = (int) $game; - if($gamenrold < $gamenr) - { - if($gamenrold!=-1) - echo " | |||
$gamenr: | "; - else - echo "$gamenr: | "; - $gamenrold = $gamenr; - } - if($r[4]=='pre') - { - echo "\n p "; - - } - else if ($r[4]=='gameover') - echo "\n F "; - else - { - echo "\n P "; - } - if($r[4] != 'gameover') - { - echo " | \n "; - if($r[3]==$myid || !$r[3]) - echo "(it's your turn)\n"; - else - { - $name = DB_get_name('userid',$r[3]); - $gameid = $r[1]; - if(DB_get_reminder($r[3],$gameid)==0) - if(time()-strtotime($r[2]) > 60*60*24*7) - echo "". - "Send a reminder."; - echo "(it's $name's turn)\n"; - }; - if(time()-strtotime($r[2]) > 60*60*24*30) - echo "". - "Cancel?". - " (clicking here is final and can't be restored)"; - - } - } - echo " |
\n"; - echo implode(", ",$names).",...\n"; - echo "
\n"; - - /* display last 5 users that logged on */ - $names = DB_get_names_of_last_logins(5); - echo "\n"; - echo implode(", ",$names).",...\n"; - echo "
\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 ''._('Games').": \n";
+ echo ' = '._('pre-game phase');
+ echo ' = '._('game in progess');
+ echo 'N = '._('game over (N people played the same hand)').'
';
+ echo ' '._("Reminder: canceling a game can't be reversed!");
+ echo "
'._('You can start new games using the link in the top right corner!')."
\n"; + + /* display last 5 users that have signed up to e-DoKo */ + $names = DB_get_names_of_new_logins(5); + echo '\n"; + echo implode(", ",$names).",...\n"; + echo "
\n"; + + /* display last 5 users that logged on */ + echo '\n"; + + $names = DB_get_names_of_last_logins(7); + $emails = DB_get_emails_of_last_logins(7); + for($i=0;$i<7;$i++) + { + echo "\n"; + } + echo "
\n"; + + echo "