X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=index.php;h=fe674be6b6af6c05cbc87335490c7bf7ad233701;hp=1a26347df718ca35155013e20e48b3914effa758;hb=8dccaf34a82b441f9170c556771163e7b4c4e050;hpb=1efa2d0cb31f06eb7893ce816e5b0f27ba354a64 diff --git a/index.php b/index.php index 1a26347..fe674be 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,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 canceled, check by login in here."; output_footer(); DB_close(); exit(); } + output_status(); + if(isset($_SESSION["name"])) output_status($_SESSION["name"]); @@ -371,7 +383,7 @@ else if(myisset("me")) if($hash == $me) echo "$i \n"; else - echo "$i \n"; + echo "$i \n"; $i++; } echo "\n"; @@ -409,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 @@ -437,7 +449,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 +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 @@ -474,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 @@ -525,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'); @@ -555,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); } }; @@ -764,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; @@ -826,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); } @@ -907,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); } } @@ -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(); @@ -1052,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
"; @@ -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"]; @@ -1149,13 +1162,8 @@ else if(myisset("me")) $seq = $r[2]; $trick = $r[3]; $comment = $r[4]; - $timeplayed = strtotime($r[5]); $user = $r[6]; - $offset = DB_get_user_timezone($user); - $zone = return_timezone($offset); - date_default_timezone_set($zone); - /* check if first schweinchen has been played */ if( $GAME["schweinchen"] && ($r[0] == 19 || $r[0] == 20) ) $GAME["schweinchen"]++; @@ -1401,13 +1409,13 @@ else if(myisset("me")) " \"table\"\n"; } - echo "
"; + echo "
\n "; /* display comments */ display_card($card,$PREF["cardset"]); if($comment!="") - echo " ".$comment."\n"; - echo "
\n"; + echo "\n ".$comment."\n"; + echo " \n"; /*check if we still have cards left, else set status to gameover */ if(sizeof(DB_get_hand($me))==0) @@ -1440,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); } @@ -1634,6 +1642,30 @@ else if(myisset("me")) } + /* add score points to email */ + $message .= "\n"; + $Tpoint = 0; + $message .= " Points Re: \n"; + $queryresult = mysql_query("SELECT score FROM Score ". + " WHERE game_id=$gameid AND party='re'". + " "); + while($r = mysql_fetch_array($queryresult,MYSQL_NUM) ) + { + $message .= " ".$r[0]."\n"; + $Tpoint ++; + } + $message .= " Points Contra: \n"; + $queryresult = mysql_query("SELECT score FROM Score ". + " WHERE game_id=$gameid AND party='contra'". + " "); + while($r = mysql_fetch_array($queryresult,MYSQL_NUM) ) + { + $message .= " ".$r[0]."\n"; + $Tpoint --; + } + $message .= " Total Points (from the Re point of view): $Tpoint\n"; + $message .= "\n"; + /* send out final email */ $all = array(); @@ -1649,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); } @@ -1686,7 +1719,7 @@ else if(myisset("me")) " GROUP BY User.fullname" ); while( $r = mysql_fetch_array($result,MYSQL_NUM)) echo "
\n". - " ".$r[2]."
".$r[1]."\n". + "
".$r[2]."
".$r[1]."
\n". "
\n"; echo " \n \n"; /* end div trick, end li trick */ @@ -1759,7 +1792,7 @@ else if(myisset("me")) /* check if game is over, display results */ if(DB_get_game_status_by_gameid($gameid)=='play') { - echo "the game is over for you.. other people still need to play though"; + echo "The game is over for you.. other people still need to play though"; } else { @@ -1774,8 +1807,26 @@ else if(myisset("me")) echo "
Totals:
\n"; while( $r = mysql_fetch_array($result,MYSQL_NUM)) echo " ".$r[0]." ".$r[1]."
\n"; + + echo "
\n Points Re:
\n"; + $queryresult = mysql_query("SELECT score FROM Score ". + " WHERE game_id=$gameid AND party='re'". + " "); + while($r = mysql_fetch_array($queryresult,MYSQL_NUM) ) + echo " ".$r[0]."
\n"; echo "
\n"; + echo "
\n Points Contra:
\n"; + $queryresult = mysql_query("SELECT score FROM Score ". + " WHERE game_id=$gameid AND party='contra'". + " "); + while($r = mysql_fetch_array($queryresult,MYSQL_NUM) ) + echo " ".$r[0]."
\n"; + echo "
\n"; + + echo "
\n"; + + } break; default: @@ -1892,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); @@ -1912,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 @@ -1939,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")) @@ -2011,24 +2066,9 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) } else /* output default user page */ { - $time = DB_get_user_timestamp($myid); - $unixtime = strtotime($time); - - $offset = DB_get_user_timezone($myid); - $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(); - echo "
last login: ".date("r",$unixtime)."
"; - DB_update_user_timestamp($myid); display_user_menu(); @@ -2062,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') { @@ -2085,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)"; } @@ -2105,7 +2145,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) } else { - echo "Sorry email and password don't match. Please try again.
"; + echo "
Sorry email and password don't match. Please try again.
"; } }; output_footer();