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=eb4f6c4c33dd8160c066491811546b3328bb75ae;hb=725eee244ea7a03b60ac20998f2dfc8677cdbcf2;hpb=8ce1e61f4b254ee07466503dc5a193d227123005 diff --git a/include/user.php b/include/user.php index eb4f6c4..2c3afeb 100644 --- a/include/user.php +++ b/include/user.php @@ -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.
"; + 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". @@ -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.
". - "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."; } } @@ -97,7 +98,7 @@ if(myisset("forgot")) "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."; } } @@ -117,7 +118,7 @@ else { /* user information is ok */ $myname = DB_get_name('email',$email); - $_SESSION["name"] = $myname; + $_SESSION['name'] = $myname; $PREF = DB_get_PREF($myid); @@ -126,23 +127,24 @@ else display_user_menu($myid); /* display all games the user has played */ - echo "
"; + echo '
'; if($myvacation = check_vacation($myid)) { $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 "

These are all your games:

\n"; + echo '

'._('These are all your games').":

\n"; /* output legend */ - 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 '

'._('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 "

\n"; /* get all games */ @@ -225,7 +227,7 @@ else { $output_active .= ''; if($userid==$myid || !$userid) - $output_active .= " your turn\n"; + $output_active .= ' '._('your turn')."\n"; else { $name = DB_get_name('userid',$userid); @@ -243,7 +245,7 @@ else /* check if we need to send out a reminder */ if(DB_get_reminder($userid,$gameid)==0) if(time()-strtotime($gamemoddate) > 60*60*24*7) - $output_active .= "Send a reminder? "; + $output_active .= ""._('Send a reminder?').' '; }; $output_active .= ''; @@ -254,7 +256,8 @@ else if($maxgame>1) { - $output_active .= ' (hide/show) old
'."\n"; + $output_active .= ' '._('show old').''. + ' '._('hide old').'
'."\n"; $output_active .= ' '.$sessionoutput.''; } @@ -295,23 +298,23 @@ else } echo "\n"; /* give a hint for new players */ if($count<10) - echo "

You can start new games using the link in the top right corner!

\n"; + 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 "

New Players:

\n

\n"; + echo '

'._('New Players').":

\n

\n"; echo implode(", ",$names).",...\n"; echo "

\n"; /* display last 5 users that logged on */ - echo "

Players last logged in:

\n

\n"; + echo '

'._('Players last logged in').":

\n

\n"; $names = DB_get_names_of_last_logins(7); $emails = DB_get_emails_of_last_logins(7); @@ -325,7 +328,7 @@ else } else { - echo "

Sorry email and password don't match. Please try again.
"; + echo '
'."Sorry email and password don't match. Please try again.".'
'; } }; ?> \ No newline at end of file