X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fuser.php;h=6cc96370bac78718f1e1a8510cecd5be7213e339;hp=00426aa03e503b51a907f396acd62036978bc93a;hb=c1585e23cb3ea757674c234c9193889b4f2f2090;hpb=9239ba22c382383cd258ad3f36b2bc0dc99664b2
diff --git a/include/user.php b/include/user.php
index 00426aa..6cc9637 100644
--- a/include/user.php
+++ b/include/user.php
@@ -1,5 +1,5 @@
".
@@ -81,192 +81,141 @@ if(myisset("forgot"))
"or else try again.";
}
}
- else
- { /* normal user page */
-
-
- /* verify password and email */
- if(strlen($password)!=32)
- $password = md5($password);
+else
+ { /* normal user page */
- $ok = 1;
- $myid = DB_get_userid('email-password',$email,$password);
- if(!$myid)
- $ok = 0;
+ /* verify password and email */
+ if(strlen($password)!=32)
+ $password = md5($password);
- if($ok)
- {
- /* user information is ok */
- $myname = DB_get_name('email',$email);
- $_SESSION["name"] = $myname;
- output_status();
-
- $PREF = DB_get_PREF($myid);
-
- /* does the user want to change some preferences? */
- if(myisset("setpref"))
- {
- $setpref=$_REQUEST["setpref"];
- switch($setpref)
- {
- case "germancards":
- case "englishcards":
- $result = DB_query("SELECT * from User_Prefs".
- " WHERE user_id='$myid' AND pref_key='cardset'" );
- if( DB_fetch_array($result))
- $result = DB_query("UPDATE User_Prefs SET value=".DB_quote_smart($setpref).
- " WHERE user_id='$myid' AND pref_key='cardset'" );
- else
- $result = DB_query("INSERT INTO User_Prefs VALUES(NULL,'$myid','cardset',".
- DB_quote_smart($setpref).")");
- echo "Ok, changed you preferences for the cards.\n";
- break;
- case "emailaddict":
- case "emailnonaddict":
- $result = DB_query("SELECT * from User_Prefs".
- " WHERE user_id='$myid' AND pref_key='email'" );
- if( DB_fetch_array($result))
- $result = DB_query("UPDATE User_Prefs SET value=".DB_quote_smart($setpref).
- " WHERE user_id='$myid' AND pref_key='email'" );
- else
- $result = DB_query("INSERT INTO User_Prefs VALUES(NULL,'$myid','email',".
- DB_quote_smart($setpref).")");
- echo "Ok, changed you preferences for sending out emails.\n";
- break;
- }
- }
- /* user wants to change his password or request a temporary one */
- else if(myisset("passwd"))
- {
- if( $_REQUEST["passwd"]=="ask" )
- {
- /* reset password form*/
- output_password_recovery($email,$password);
- }
- else if($_REQUEST["passwd"]=="set")
- {
- /* reset password */
- $ok = 1;
+ $ok = 1;
+ $myid = DB_get_userid('email-password',$email,$password);
+ if(!$myid)
+ $ok = 0;
- /* check if old password matches */
- $oldpasswd = md5($_REQUEST["password0"]);
- if(!( ($password == $oldpasswd) || DB_check_recovery_passwords($oldpasswd,$email) ))
- $ok = -1;
- /* check if new passwords are types the same twice */
- if($_REQUEST["password1"] != $_REQUEST["password2"] )
- $ok = -2;
+ if($ok)
+ {
+ /* user information is ok */
+ $myname = DB_get_name('email',$email);
+ $_SESSION["name"] = $myname;
- switch($ok)
- {
- case '-2':
- echo "The new passwords don't match.
";
- break;
- case '-1':
- echo "The old password is not correct.
";
- break;
- case '1':
- echo "Changed the password.
";
- DB_query("UPDATE User SET password='".md5($_REQUEST["password1"]).
- "' WHERE id=".DB_quote_smart($myid));
- break;
- }
- /* set password */
- }
- }
- else /* output default user page */
- {
- /* display links to settings */
- output_user_settings();
+ $PREF = DB_get_PREF($myid);
- DB_update_user_timestamp($myid);
+ DB_update_user_timestamp($myid);
- display_user_menu();
+ display_user_menu($myid);
- /* 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 ";
+ 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"; + } - } - 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 "These are all your games:\n"; + /* output legend */ + echo "Session:
|
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 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 */ - $names = DB_get_names_of_last_logins(5); - echo "\n"; - echo implode(", ",$names).",...\n"; - echo "
\n"; - - echo "\n"; + echo implode(", ",$names).",...\n"; + echo "
\n"; + echo "