X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=index.php;h=bfa517c4e7abb758172d02b88990c358e94861df;hp=6584f0e5b9b229199b18f03b1160a6880b7ea304;hb=ad48a970a52fc44b65176b951a15b9846a290bab;hpb=a28cbfa660f2ff982f1cdcee41c09cec772d84af
diff --git a/index.php b/index.php
index 6584f0e..bfa517c 100644
--- a/index.php
+++ b/index.php
@@ -30,10 +30,11 @@ if(myisset("logout"))
session_destroy();
$_SESSION = array();
echo "";
+ "(This will take you back to the home-page)";
}
else if(myisset("new"))
{
+ output_status();
if( isset($_SESSION["name"]) )
{
$names = DB_get_all_names();
@@ -44,7 +45,7 @@ else if(myisset("new"))
}
else
{
- echo "";
+ echo "";
}
}
/*check if everything is ready to set up a new game */
@@ -181,18 +182,21 @@ else if(myisset("new"))
"$PlayerC\n".
"$PlayerD\n\n".
"If you want to join this game, please follow this link:\n\n".
- "".$host."?me=";
+ "".$HOST.$INDEX."?me=";
mymail($EmailA,"You are invited to a game of DoKo","Hello $PlayerA,\n".$message.$hashA);
mymail($EmailB,"You are invited to a game of DoKo","Hello $PlayerB,\n".$message.$hashB);
mymail($EmailC,"You are invited to a game of DoKo","Hello $PlayerC,\n".$message.$hashC);
mymail($EmailD,"You are invited to a game of DoKo","Hello $PlayerD,\n".$message.$hashD);
- echo "You started a new game. The emails have been sent out!";
+ output_status();
+ echo "You started a new game. The emails have been sent out!
\n";
} /* end set up a new game */
/* cancle a game, if nothing has happend in the last N minutes */
else if(myisset("cancle","me"))
{
+ output_status();
+
$me = $_REQUEST["me"];
/* test for valid ID */
@@ -200,7 +204,7 @@ else if(myisset("cancle","me"))
if(!$myid)
{
echo "Can't find you in the database, please check the url.
\n";
- echo "perhaps the game has been cancled, check by login in here.";
+ echo "perhaps the game has been cancled, check by login in here.";
output_footer();
DB_close();
exit();
@@ -240,6 +244,8 @@ else if(myisset("cancle","me"))
/* send out a reminder */
else if(myisset("remind","me"))
{
+ output_status();
+
$me = $_REQUEST["me"];
/* test for valid ID */
@@ -247,7 +253,7 @@ else if(myisset("remind","me"))
if(!$myid)
{
echo "Can't find you in the database, please check the url.
\n";
- echo "perhaps the game has been cancled, check by login in here.";
+ echo "perhaps the game has been cancled, check by login in here.";
output_footer();
DB_close();
exit();
@@ -272,7 +278,7 @@ else if(myisset("remind","me"))
"It's your turn in game ".DB_format_gameid($gameid)." \n".
"Actually everyone else is waiting for you for more than a week now ;)\n\n".
"Please visit this link now to continue: \n".
- " ".$host."?me=".$userhash."\n\n" ;
+ " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
if(DB_get_reminder($r[1],$gameid)>0)
{
@@ -301,12 +307,14 @@ else if(myisset("me"))
if(!$myid)
{
echo "Can't find you in the database, please check the url.
\n";
- echo "perhaps the game has been cancled, check by login in here.";
+ echo "perhaps the game has been cancled, check by login in here.";
output_footer();
DB_close();
exit();
}
+ output_status();
+
if(isset($_SESSION["name"]))
output_status($_SESSION["name"]);
@@ -375,7 +383,7 @@ else if(myisset("me"))
if($hash == $me)
echo "$i \n";
else
- echo "$i \n";
+ echo "$i \n";
$i++;
}
echo "\n";
@@ -413,7 +421,7 @@ else if(myisset("me"))
*/
if( !myisset("in") )
{
- echo " You need to answer the question.
";
+ echo " You need to answer the question.
";
DB_set_hand_status_by_hash($me,'start');
}
else
@@ -463,7 +471,7 @@ else if(myisset("me"))
* unless a user tries to cheat ;)
* can also happen if user reloads the page!
*/
- echo " You need to answer the questions.
";
+ echo " You need to answer the questions.
";
DB_set_hand_status_by_hash($me,'init');
}
else
@@ -478,7 +486,7 @@ else if(myisset("me"))
if($Nvorbehalt>1)
{
echo " You selected more than one vorbehalt, please go back ".
- "and answer the question again.
";
+ "and answer the question again.";
DB_set_hand_status_by_hash($me,'init');
}
else
@@ -529,7 +537,7 @@ else if(myisset("me"))
DB_set_sickness_by_hash($me,"nines");
}
- echo " Ok, done with checking, please go to the next step of the setup.";
+ echo " Ok, done with checking, please go to the next step of the setup.";
/* move on to the next stage*/
DB_set_hand_status_by_hash($me,'poverty');
@@ -559,7 +567,7 @@ else if(myisset("me"))
{
$message = "Everyone finish the questionary in game ".DB_format_gameid($gameid).", ".
"please visit this link now to continue: \n".
- " ".$host."?me=".$userhash."\n\n" ;
+ " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
mymail($To,$EmailName." finished setup in game ".DB_format_gameid($gameid),$message);
}
};
@@ -768,7 +776,7 @@ else if(myisset("me"))
DB_set_party_by_hash($me,"contra");
echo "Whoever will make the first trick will be on the re team.
\n";
- echo " Ok, the game can start now, please finish the setup.
";
+ echo " Ok, the game can start now, please finish the setup.
";
DB_set_hand_status_by_hash($me,'play');
break;
@@ -830,7 +838,7 @@ else if(myisset("me"))
DB_set_player_by_gameid($gameid,$who);
$message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
- " ".$host."?me=".$userhash."\n\n" ;
+ " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
}
@@ -911,7 +919,7 @@ else if(myisset("me"))
$message = "Someone has poverty, it's your turn to decide, ".
"if you want to take the trump. Please visit:".
- " ".$host."?me=".$userhash."\n\n" ;
+ " ".$HOST.$INDEX."?me=".$userhash."\n\n" ;
mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
}
}
@@ -1056,11 +1064,11 @@ else if(myisset("me"))
{
/* email startplayer) */
$message = "It's your turn now in game ".DB_format_gameid($gameid).".\n".
- "Use this link to play a card: ".$host."?me=".$hash."\n\n" ;
+ "Use this link to play a card: ".$HOST.$INDEX."?me=".$hash."\n\n" ;
mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message);
}
else
- echo " Please, start the game.
";
+ echo " Please, start the game.
";
}
else
echo "\n
";
@@ -1108,7 +1116,8 @@ else if(myisset("me"))
$r = mysql_fetch_array($result,MYSQL_NUM);
$gameend = time() - strtotime($r[0]);
- /* handel comments in case player didn't play a card, allow comments a week after the end of the game */ if( (!myisset("card") && $mystatus=='play') || ($mystatus=='gameover' && ($gameend < 60*60*24*7)) )
+ /* handel comments in case player didn't play a card, allow comments a week after the end of the game */
+ if( (!myisset("card") && $mystatus=='play') || ($mystatus=='gameover' && ($gameend < 60*60*24*7)) )
if(myisset("comment"))
{
$comment = $_REQUEST["comment"];
@@ -1439,7 +1448,7 @@ else if(myisset("me"))
$message = "A card has been played in game ".DB_format_gameid($gameid).".\n\n".
"It's your turn now.\n".
- "Use this link to play a card: ".$host."?me=".$next_hash."\n\n" ;
+ "Use this link to play a card: ".$HOST.$INDEX."?me=".$next_hash."\n\n" ;
if( DB_get_email_pref_by_uid($who)!="emailaddict" )
mymail($email,$EmailName."a card has been played in game ".DB_format_gameid($gameid),$message);
}
@@ -1672,7 +1681,8 @@ else if(myisset("me"))
$To = DB_get_email_by_userid($user);
$hash = DB_get_hash_from_gameid_and_userid($gameid,$user);
- $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ".$host."?me=".$hash."\n\n" ;
+ $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ".
+ $HOST.$INDEX."?me=".$hash."\n\n" ;
if( DB_get_email_pref_by_uid($user) != "emailaddict" )
mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 2(2)",$link);
}
@@ -1933,7 +1943,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
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.";
+ echo "Back to the main page.";
$TIME = (string) time(); /* to avoid collisions */
$hash = md5("Anewpassword".$email.$TIME);
@@ -1953,18 +1963,18 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
{
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 "Back to the main page.";
}
}
else
{
if($email=="")
echo "You need to give me an email address!
".
- "Please try again.";
+ "Please try again.";
else
echo "Couldn't find a player with this email!
".
"Please contact Arun, if you think this is a mistake
".
- "or else try again.";
+ "or else try again.";
}
}
else
@@ -1980,6 +1990,10 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
if($ok)
{
+ $myname = DB_get_name_by_email($email);
+ $_SESSION["name"] = $myname;
+ output_status();
+
DB_get_PREF($myid);
if(myisset("setpref"))
@@ -2052,9 +2066,6 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
}
else /* output default user page */
{
- $myname = DB_get_name_by_email($email);
- $_SESSION["name"] = $myname;
-
/* display links to settings */
output_user_settings();
@@ -2091,14 +2102,14 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
}
if($r[4]=='pre')
{
- echo "\n p ";
+ echo "\n p ";
}
else if ($r[4]=='gameover')
- echo "\n F ";
+ echo "\n F ";
else
{
- echo "\n P ";
+ echo "\n P ";
}
if($r[4] != 'gameover')
{
@@ -2114,13 +2125,13 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
if(DB_get_reminder($r[3],$gameid)==0)
if(time()-strtotime($r[2]) > 60*60*24*7)
echo "".
- "Send a reminder.";
+ "Send a reminder.";
echo "(it's $name's turn)\n";
};
}
if(time()-strtotime($r[2]) > 60*60*24*30)
echo "".
- "Cancel?".
+ "Cancel?".
" (clicking here is final and can't be restored)";
}
@@ -2134,7 +2145,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
}
else
{
- echo "Sorry email and password don't match. Please
try again.
Sorry email and password don't match. Please
try again.