X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=index.php;h=eb52e4e1d2826467f74476a3ade6cd9c10d0ebf2;hp=cf14fbd6b616daf3a5e2b93804d59e2ed48851ae;hb=2264646817a59a6e3aefa835c492938dde4f25ee;hpb=a5684ef10fbd20dd335b99a0d53555498842268a diff --git a/index.php b/index.php index cf14fbd..eb52e4e 100644 --- a/index.php +++ b/index.php @@ -29,18 +29,23 @@ if(myisset("logout")) session_unset(); session_destroy(); $_SESSION = array(); - echo "you are now logged out!"; + echo "
You are now logged out!
\n". + "(This will take you back to the home-page)
"; } else if(myisset("new")) { + output_status(); if( isset($_SESSION["name"]) ) { $names = DB_get_all_names(); + echo "
\n"; output_form_for_new_game($names); + echo "
\n"; + display_user_menu(); } else { - echo "Please log in."; + echo "
Please log in.
"; } } /*check if everything is ready to set up a new game */ @@ -177,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")) +/* cancel a game, if nothing has happend in the last N minutes */ +else if(myisset("cancel","me")) { + output_status(); + $me = $_REQUEST["me"]; /* test for valid ID */ @@ -196,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 canceled, check by login in here."; output_footer(); DB_close(); exit(); @@ -215,27 +223,29 @@ else if(myisset("cancle","me")) { $message = "Hello, \n\n". "Game ".DB_format_gameid($gameid). - " has been cancled since nothing happend for a while and $myname requested it.\n"; + " has been canceled 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 ".DB_format_gameid($gameid)." cancled (timed out)",$message); + mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled (timed out)",$message); } /* delete everything from the dB */ DB_cancel_game($me); echo "

Game ".DB_format_gameid($gameid). - " has been cancled.

"; + " has been canceled.

"; } else - echo "

You need to wait longer before you can cancle a game...

\n"; + echo "

You need to wait longer before you can cancel a game...

\n"; } /* send out a reminder */ else if(myisset("remind","me")) { + output_status(); + $me = $_REQUEST["me"]; /* test for valid ID */ @@ -243,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 canceled, check by login in here."; output_footer(); DB_close(); exit(); @@ -268,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) { @@ -297,7 +307,7 @@ 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 canceled, check by login in here."; output_footer(); DB_close(); exit(); @@ -371,7 +381,7 @@ else if(myisset("me")) if($hash == $me) echo "$i \n"; else - echo "$i \n"; + echo "$i \n"; $i++; } echo "\n"; @@ -409,7 +419,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 @@ -437,7 +447,7 @@ else if(myisset("me")) output_check_for_sickness($me,$mycards); - echo "

your cards are:
\n"; + echo "

Your cards are:
\n"; foreach($mycards as $card) display_card($card,$PREF["cardset"]); echo "

\n"; @@ -459,7 +469,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 @@ -474,7 +484,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 @@ -525,7 +535,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'); @@ -555,7 +565,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); } }; @@ -764,7 +774,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; @@ -823,10 +833,11 @@ else if(myisset("me")) { $To = DB_get_email_by_pos_and_gameid($who,$gameid); $userhash = DB_get_hash_from_game_and_pos($gameid,$who); - DB_set_player_by_gameid($gameid,$who); + $userid = DB_get_userid_by_email($To); + DB_set_player_by_gameid($gameid,$userid); $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); } @@ -903,11 +914,12 @@ else if(myisset("me")) { $To = DB_get_email_by_pos_and_gameid($who,$gameid); $userhash = DB_get_hash_from_game_and_pos($gameid,$who); - DB_set_player_by_gameid($gameid,$who); + $userid = DB_get_userid_by_email($To); + DB_set_player_by_gameid($gameid,$userid); $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); } } @@ -990,7 +1002,7 @@ else if(myisset("me")) echo "Your cards are:
\n"; $mycards = DB_get_hand($me); sort($mycards); - echo "

your cards are:
\n"; + echo "

Your cards are:
\n"; foreach($mycards as $card) display_card($card,$PREF["cardset"]); echo "

\n"; @@ -1009,19 +1021,19 @@ else if(myisset("me")) if($who==5 || $who==50) { $message = "Hello, \n\n". - "Game ".DB_format_gameid($gameid)." has been cancled since nobody wanted to take the trump.\n"; + "Game ".DB_format_gameid($gameid)." has been canceled since nobody wanted to take the trump.\n"; $userids = DB_get_all_userid_by_gameid($gameid); foreach($userids as $user) { $To = DB_get_email_by_userid($user); - mymail($To,$EmailName."game ".DB_format_gameid($gameid)." cancled (poverty not resolved)",$message); + mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled (poverty not resolved)",$message); } /* delete everything from the dB */ DB_cancel_game($me); - echo "

Game ".DB_format_gameid($gameid)." has been cancled.

"; + echo "

Game ".DB_format_gameid($gameid)." has been canceled.

"; output_footer(); DB_close(); exit(); @@ -1048,15 +1060,15 @@ else if(myisset("me")) $who = DB_get_userid_by_email($email); DB_set_player_by_gameid($gameid,$who); - if($hash!=$me) + if($hash!=$me && DB_get_email_pref_by_hash($hash)!="emailaddict") { /* 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
"; @@ -1104,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"]; @@ -1143,19 +1156,39 @@ else if(myisset("me")) echo "\n