X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=index.php;h=57145c6d978ff2669a42a2497aba474d288806a6;hp=8e4f17f1293c03ed309c597b52629b4f08de9a7c;hb=2e9d5e97305ccbd1b975013511922f924d53fffd;hpb=337229f87e4507dd1ea9fa80cfc981f19822b726
diff --git a/index.php b/index.php
index 8e4f17f..57145c6 100644
--- a/index.php
+++ b/index.php
@@ -1,49 +1,50 @@
60*60*24*30) /* = 1 month */
{
$message = "Hello, \n\n".
- "Game $gameid has been cancled since nothing happend for a while and $myname requested it.\n";
+ "Game ".DB_format_gameid($gameid)." has been cancled since nothing happend for a while and $myname requested it.\n";
$userids = DB_get_all_userid_by_gameid($gameid);
foreach($userids as $user)
{
$To = DB_get_email_by_userid($user);
- mymail($To,$EmailName."game $gameid cancled (timed out)",$message);
+ mymail($To,$EmailName."game ".DB_format_gameid($gameid)." cancled (timed out)",$message);
}
/* delete everything from the dB */
DB_cancel_game($me);
- echo "
Game $gameid has been cancled.
";
+ echo "Game ".DB_format_gameid($gameid)." has been cancled.
";
}
else
echo "You need to wait longer before you can cancle a game...
\n";
@@ -224,6 +231,9 @@ else if(myisset("me"))
exit();
}
+ if(isset($_SESSION["name"]))
+ output_status($_SESSION["name"]);
+
/* the user had done something, update the timestamp */
DB_update_user_timestamp($myid);
@@ -233,12 +243,12 @@ else if(myisset("me"))
$mystatus = DB_get_status_by_hash($me);
$mypos = DB_get_pos_by_hash($me);
$myhand = DB_get_handid_by_hash($me);
+ $session = DB_get_session_by_gameid($gameid);
/* get prefs and save them */
DB_get_PREF($myid);
/* end set pref */
-
/* get rule set for this game */
$result = mysql_query("SELECT * FROM Rulesets".
" LEFT JOIN Game ON Game.ruleset=Rulesets.id ".
@@ -247,8 +257,7 @@ else if(myisset("me"))
$RULES["dullen"] = $r[2];
$RULES["schweinchen"] = $r[3];
- $RULES["call"] = "1st-own-card";
-
+ $RULES["call"] = $r[4];
/* get some infos about the game */
$gametype = DB_get_gametype_by_gameid($gameid);
@@ -259,17 +268,6 @@ else if(myisset("me"))
$gametype = DB_get_solo_by_gameid($gameid);
$GT = $gametype." ".$GT;
}
-
- /* display rule set for this game */
- echo "\n";
-
- if($gamestatus != 'pre')
- echo " Gametype: $GT
\n";
-
- echo "Rules:
\n";
- echo "10ofhearts : ".$r[2]."
\n";
- echo "schweinchen: ".$r[3]."
\n";
- echo "
\n";
/* does anyone have both foxes */
$GAME["schweinchen"]=0;
@@ -284,6 +282,89 @@ else if(myisset("me"))
}
};
+ /* put everyting in a form */
+ echo "\n";
output_footer();
DB_close();
exit();
}
/* user status page */
- else if(myisset("email","password"))
+else if( myisset("email","password") || isset($_SESSION["name"]) )
{
/* test id and password, should really be done in one step */
- $email = $_REQUEST["email"];
- $password = $_REQUEST["password"];
+ if(!isset($_SESSION["name"]))
+ {
+ $email = $_REQUEST["email"];
+ $password = $_REQUEST["password"];
+ }
+ else
+ {
+ $name = $_SESSION["name"];
+ $email = DB_get_email_by_name($name);
+ $password = DB_get_passwd_by_name($name);
+ };
-
if(myisset("forgot"))
{
- $ok=1;
+ $ok = 1;
$uid = DB_get_userid_by_email($email);
if(!$uid)
- $ok=0;
+ $ok = 0;
if($ok)
{
- echo "Hmm, you forgot your passwort...nothing I can do at the moment:( ";
- echo " you need to email Arun for now... in the future it will be all automated and an ";
- echo "email with a new password will go to $email.";
+ /* check how many entries in recovery table */
+ $number = DB_get_number_of_passwords_recovery($uid);
+
+ /* 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.
";
+ 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 "Back to the main page.";
+
+ $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".
+ "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);
+
+ DB_set_recovery_password($uid,md5($newpw));
+ }
+ else
+ {
+ 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
{
if($email=="")
- echo "you need to give me an email address!";
+ echo "You need to give me an email address!
".
+ "Please try again.";
else
- echo "couldn't find a player with this email, please contact Arun, if you think this is a mistake";
+ echo "Couldn't find a player with this email!
".
+ "Please contact Arun, if you think this is a mistake
".
+ "or else try again.";
}
}
else
@@ -1584,10 +1631,10 @@ else if(myisset("me"))
if(strlen($password)!=32)
$password = md5($password);
- $ok=1;
+ $ok = 1;
$uid = DB_get_userid_by_email_and_password($email,$password);
if(!$uid)
- $ok=0;
+ $ok = 0;
if($ok)
{
@@ -1606,34 +1653,63 @@ else if(myisset("me"))
$result = mysql_query("UPDATE User_Prefs SET value=".DB_quote_smart($setpref).
" WHERE user_id='$uid' AND pref_key='cardset'" );
else
- $result = mysql_query("INSERT INTO User_Prefs VALUES(NULL,'$uid','cardset',".DB_quote_smart($setpref).")");
+ $result = mysql_query("INSERT INTO User_Prefs VALUES(NULL,'$uid','cardset',".
+ DB_quote_smart($setpref).")");
echo "Ok, changed you preferences for the cards.\n";
break;
- case "ccemail":
- $result = mysql_query("SELECT * from User_Prefs".
- " WHERE user_id='$uid' AND pref_key='ccemail'" );
- if( mysql_fetch_array($result,MYSQL_NUM))
- if($PREF["ccemail"]=="yes")
- $result = mysql_query("UPDATE User_Prefs SET value=".DB_quote_smart("no").
- " WHERE user_id='$uid' AND pref_key='ccemail'" );
- else
- $result = mysql_query("UPDATE User_Prefs SET value=".DB_quote_smart("yes").
- " WHERE user_id='$uid' AND pref_key='ccemail'" );
- else
- $result = mysql_query("INSERT INTO User_Prefs VALUES(NULL,'$uid','ccemail',".DB_quote_smart("yes").")");
- echo "Ok, changed you preferences for being CC'ed on emails.\n";
- break;
-
+ }
+ }
+ 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;
+
+ /* 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;
+
+ 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.
";
+ mysql_query("UPDATE User SET password='".md5($_REQUEST["password1"]).
+ "' WHERE id=".DB_quote_smart($uid));
+ break;
+ }
+ /* set password */
}
}
else /* output default user page */
{
- $time = DB_get_user_timestamp($uid);
- $unixtime =strtotime($time);
+ $time = DB_get_user_timestamp($uid);
+ $unixtime = strtotime($time);
- $offset = DB_get_user_timezone($uid);
- $zone = return_timezone($offset);
+ $offset = DB_get_user_timezone($uid);
+ $zone = return_timezone($offset);
date_default_timezone_set($zone);
+
+ $myname = DB_get_name_by_email($email);
+ $_SESSION["name"] = $myname;
+
+ if(isset($_SESSION["name"]))
+ output_status($_SESSION["name"]);
/* display links to settings */
output_user_settings($email,$password);
@@ -1642,13 +1718,21 @@ else if(myisset("me"))
DB_update_user_timestamp($uid);
- echo "these are your games that haven't started yet:
\n";
- $result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.mod_date from Hand".
+ echo "
These are your games that haven't started yet:
\n";
+ $result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player from Hand".
" LEFT JOIN Game On Hand.game_id=Game.id".
" WHERE Hand.user_id='$uid' AND Game.status='pre'" );
while( $r = mysql_fetch_array($result,MYSQL_NUM))
{
- echo "game #".$r[1]." ";
+ echo "game".DB_format_gameid($r[1])." ";
+ if($r[3]==$uid || $r[3]==NULL)
+ echo "(it's your turn)\n";
+ else
+ {
+ $name = DB_get_name_by_userid($r[3]);
+ echo "(it's $name's turn)\n";
+ };
+
if(time()-strtotime($r[2]) > 60*60*24*30)
echo " The game has been running for over a month.".
" Do you want to cancel it? yes".
@@ -1657,13 +1741,23 @@ else if(myisset("me"))
}
echo "
\n";
- echo "these are the games you are playing in:
\n";
- $result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.mod_date from Hand".
+ echo "
These are the games you are playing in:
\n";
+ $result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player from Hand".
" LEFT JOIN Game On Hand.game_id=Game.id".
" WHERE Hand.user_id='$uid' AND Game.status='play'" );
while( $r = mysql_fetch_array($result,MYSQL_NUM))
{
- echo "game #".$r[1]." ";
+ echo "game ".DB_format_gameid($r[1])." ";
+ if($r[3])
+ {
+ if($r[3]==$uid)
+ echo "(it's your turn)\n";
+ else
+ {
+ $name = DB_get_name_by_userid($r[3]);
+ echo "(it's $name's turn)\n";
+ };
+ }
if(time()-strtotime($r[2]) > 60*60*24*30)
echo " The game has been running for over a month.".
" Do you want to cancel it? yes".
@@ -1673,15 +1767,15 @@ else if(myisset("me"))
echo "
\n";
- echo "and these are your games that are already done:
Game: \n";
- $output=array();
+ echo "
And these are your games that are already done:
Game: \n";
+ $output = array();
$result = mysql_query("SELECT hash,game_id from Hand WHERE user_id='$uid' AND status='gameover'" );
while( $r = mysql_fetch_array($result,MYSQL_NUM))
- $output[]= "#".$r[1]." ";
+ $output[] = "".DB_format_gameid($r[1])." ";
echo implode(", ",$output)."
\n";
$names = DB_get_all_names();
- echo "registered players:
\n";
+ echo "
Registered players:
\n";
echo implode(", ",$names)."\n";
echo "
\n";
@@ -1690,45 +1784,13 @@ else if(myisset("me"))
}
else
{
- echo "sorry email and password don't match
";
+ echo "Sorry email and password don't match. Please try again.
";
}
};
output_footer();
DB_close();
exit();
}
-/* page for registration */
- else if(myisset("register") )
- {
- output_register();
- }
-/* new user wants to register */
- else if(myisset("Rfullname","Remail","Rpassword","Rtimezone") )
- {
- $ok=1;
- if(DB_get_userid_by_name($_REQUEST["Rfullname"]))
- {
- echo "please chose another name
";
- $ok=0;
- }
- if(DB_get_userid_by_email($_REQUEST["Remail"]))
- {
- echo "this email address is already used ?!
";
- $ok=0;
- }
- if($ok)
- {
- $r=mysql_query("INSERT INTO User VALUES(NULL,".DB_quote_smart($_REQUEST["Rfullname"]).
- ",".DB_quote_smart($_REQUEST["Remail"]).
- ",".DB_quote_smart(md5($_REQUEST["Rpassword"])).
- ",".DB_quote_smart($_REQUEST["Rtimezone"]).",NULL)");
-
- if($r)
- echo " added you to the database";
- else
- echo " something went wrong";
- }
- }
/* default login page */
else
{