X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fuser.php;h=19eb27bc6745da85544254d34e7acd1c632d11a4;hp=7b4880dec49a91b8a2585a73e7ab57b54bcccc6d;hb=afdd753932734c300c2edc1a7e0b91e4f44564a0;hpb=6437c15bdaac379a15d7e6392122f027d8254ec6 diff --git a/include/user.php b/include/user.php index 7b4880d..19eb27b 100644 --- a/include/user.php +++ b/include/user.php @@ -6,17 +6,17 @@ 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"]; } - else - { - $name = $_SESSION["name"]; - $email = DB_get_email('name',$name); - $password = DB_get_passwd_by_name($name); - }; +else + { + $name = $_SESSION["name"]; + $email = DB_get_email('name',$name); + $password = DB_get_passwd_by_name($name); + }; /* user has forgotten his password */ if(myisset("forgot")) @@ -81,111 +81,103 @@ if(myisset("forgot")) "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(); +else + { /* normal user page */ - $PREF = DB_get_PREF($myid); + /* verify password and email */ + if(strlen($password)!=32) + $password = md5($password); - DB_update_user_timestamp($myid); - - display_user_menu(); - - /* display all games the user has played */ - echo "
"; - echo "

These are all your games:

\n"; - echo "

Session:
\n"; - echo " p = pre-game phase "; - echo "P = game in progess "; - echo "F = game finished
"; - echo "

\n"; - - $output = array(); - $result = DB_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player,Game.status from Hand". - " LEFT JOIN Game ON Game.id=Hand.game_id". - " WHERE user_id='$myid'". - " ORDER BY Game.session,Game.create_date" ); - $gamenrold = -1; - echo "\n \n \n"; - else - echo "$gamenr:\n"; - $gamenrold = $gamenr; - echo "\n\n
\n"; - while( $r = DB_fetch_array($result)) - { - $game = DB_format_gameid($r[1]); - $gamenr = (int) $game; - if($gamenrold < $gamenr) - { - if($gamenrold!=-1) - echo "
$gamenr:\n"; - } - 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"; - - /* 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 implode(", ",$names).",...\n"; - echo "

\n"; - - /* display last 5 users that logged on */ - $names = DB_get_names_of_last_logins(5); - echo "

Players last logged in:

\n

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

\n"; - - echo "
\n"; - } - else - { - echo "
Sorry email and password don't match. Please try again.
"; - } - }; -output_footer(); -DB_close(); -exit(); - + $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; + + $PREF = DB_get_PREF($myid); + + DB_update_user_timestamp($myid); + + display_user_menu(); + + /* display all games the user has played */ + echo "
"; + echo "

These are all your games:

\n"; + echo "

Session:
\n"; + echo " p = pre-game phase "; + echo "P = game in progess "; + echo "F = game finished
"; + echo "

\n"; + + $output = array(); + $result = DB_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player,Game.status from Hand". + " LEFT JOIN Game ON Game.id=Hand.game_id". + " WHERE user_id='$myid'". + " ORDER BY Game.session,Game.create_date" ); + $gamenrold = -1; + echo "\n \n \n"; + else + echo "$gamenr:\n"; + $gamenrold = $gamenr; + echo "\n\n
\n"; + while( $r = DB_fetch_array($result)) + { + $game = DB_format_gameid($r[1]); + $gamenr = (int) $game; + if($gamenrold < $gamenr) + { + if($gamenrold!=-1) + echo "
$gamenr:\n"; + } + if($r[4]=='pre') + echo " p \n"; + else if ($r[4]=='gameover') + echo " F \n"; + else + echo " P \n"; + 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"; + + /* 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 implode(", ",$names).",...\n"; + echo "

\n"; + + /* display last 5 users that logged on */ + $names = DB_get_names_of_last_logins(5); + echo "

Players last logged in:

\n

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

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