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=d486b0746b96021d1c9f6b79f83bb2e2227c889b;hb=e6a828bc2f742e617842ff2ca3a9dbb812dab16a;hpb=14f6017a5b84d70320bde9d6e074ea8ac948a85e diff --git a/include/user.php b/include/user.php index d486b07..65544f5 100644 --- a/include/user.php +++ b/include/user.php @@ -1,5 +1,5 @@ +/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arun Persaud * * This file is part of e-DoKo. * @@ -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,22 +60,22 @@ 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 */ $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"; + "also still be valid until you set a new one.\n"), $newpw); mymail($myid,0, GAME_RECOVERY, $message); /* we save these in the database */ @@ -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,22 +95,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 */ - $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) @@ -116,6 +126,7 @@ else $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); @@ -129,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 '

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

\n"; @@ -149,7 +160,7 @@ else " G.session". " FROM Hand". " LEFT JOIN Game G ON G.id=Hand.game_id". - " WHERE user_id='$myid'". + " WHERE user_id=".DB_quote_smart($myid). " ORDER BY G.session,G.create_date" ); /* sort into active and passive sessions */ @@ -231,11 +242,12 @@ else if($vacation=check_vacation($userid)) { $stop = substr($vacation[1],0,10); - $title = 'begin:'.substr($vacation[0],0,10).' end:'.$vacation[1].' '.$vacation[2]; - $output_active .= " $name's (on vacation until $stop) turn\n"; + $title = _('begin:').substr($vacation[0],0,10).' '._('end:').$vacation[1].' '.$vacation[2]; + $output_active .= " ". + sprintf(_("%s's turn"),$name).' '._("(on vacation until $stop)")."\n"; } else - $output_active .= "$name's turn\n"; + $output_active .= sprintf(_("%s's turn"),$name)."\n"; /* check if we need to send out a reminder */ if(DB_get_reminder($userid,$gameid)==0) @@ -246,7 +258,7 @@ else $output_active .= ''; if(time()-strtotime($gamemoddate) > 60*60*24*30) - $output_active .= "Cancel? "; + $output_active .= ""._('Cancel?').' '; } if($maxgame>1) @@ -315,7 +327,9 @@ else $emails = DB_get_emails_of_last_logins(7); for($i=0;$i<7;$i++) { - echo "\n"; + echo '\n"; } echo "

\n"; @@ -323,7 +337,9 @@ else } else { - echo '
'."Sorry email and password don't match. Please try again.".'
'; + echo '
'."\n"; + echo sprintf(_("Sorry email and password don't match. Please try again."),$INDEX); + echo '
'."\n"; } }; ?> \ No newline at end of file