X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=a50b247d0adc76e90fdc0b363940950f5393b2a0;hp=3564d9cc382efbdbff0b705a8be1e33cb1505cba;hb=692b2c53acc3d0f8a0205b7aba84938580540df7;hpb=2bd1c94dd7e712bb2cc8e2c16fb317bd0169c59c diff --git a/include/game.php b/include/game.php index 3564d9c..a50b247 100644 --- a/include/game.php +++ b/include/game.php @@ -1,5 +1,5 @@ +/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arun Persaud * * This file is part of e-DoKo. * @@ -27,7 +27,7 @@ if(!isset($HOST)) /* calling game.php only makes sense when we give it a hash for a game */ if(!myisset('me')) { - echo "Hmm, you really shouldn't mess with the urls.
\n"; + echo _("Hmm, you really shouldn't mess with the urls.")."
\n"; return; } $me = $_REQUEST['me']; @@ -36,8 +36,8 @@ $me = $_REQUEST['me']; $myid = DB_get_userid('hash',$me); if(!$myid) { - echo "Can't find you in the database, please check the url.
\n"; - echo "perhaps the game has been canceled, check by login in here."; + echo _('Cannot find you in the database, please check the url.')."
\n"; + printf(_('Perhaps the game has been canceled, check by login in here.'),$INDEX); return; } @@ -49,27 +49,36 @@ global $GAME,$RULES,$CARDS; $gameid = DB_get_gameid_by_hash($me); $myname = DB_get_name('hash',$me); $mystatus = DB_get_status_by_hash($me); -$origmystatus = DB_get_status_by_hash($me); /* to show "it's your turn" menu when game has just finished */ $mypos = DB_get_pos_by_hash($me); $myhand = DB_get_handid('hash',$me); $myparty = DB_get_party_by_hash($me); $session = DB_get_session_by_gameid($gameid); +$playid = DB_get_current_playid($gameid); /* might be -1 at beginning of the game */ /* get prefs and save them in a variable*/ $PREF = DB_get_PREF(isset($_SESSION['id'])?$_SESSION['id']:$myid); +/* set language chosen in preferences */ +$_SESSION['language'] = $PREF['language']; +set_language($PREF['language']); /* get rule set for this game */ $RULES = DB_get_RULES($gameid); /* get some infos about the game */ -$gametype = DB_get_gametype_by_gameid($gameid); -$gamestatus = DB_get_game_status_by_gameid($gameid); -$GT = $gametype; -if($gametype=='solo') - { - $gametype = DB_get_solo_by_gameid($gameid); - $GT = $gametype.' '.$GT; - } +$gametype_raw = DB_get_gametype_by_gameid($gameid); +$gametype_solo = DB_get_solo_by_gameid($gameid); + +/* replace solo with the type of solo */ +$gametype = $gametype_raw; +if($gametype_raw=='solo') + $gametype = $gametype_solo; + +/* gametype for displaying it (hides hidden solo)*/ +$GT = get_display_gametype($gameid); + +$gamestatus = DB_get_game_status_by_gameid($gameid); + + /* do we need to worry about Schweinchen? * check gametype and rules @@ -129,96 +138,135 @@ if( $mystatus!='gameover' ) DB_insert_note($note,$gameid,$myid); }; -/* handle calls, output a comment to show when the call was made */ -/* initialize comments */ -$comment = ''; - -/* get information needed to submit comment */ -$playid = DB_get_current_playid($gameid); - -/* set comment */ -if($comment != '') - DB_insert_comment($comment,$playid,$myid); -/* clear up */ -unset($comment); -/* end check for calls */ +/***************************************************************** + * handle calls part1: check what was called, set everything up + * we only can submit it to the database at the end, since the playid + * might change if a player plays a card + *****************************************************************/ +/* initialize comments */ +$commentCall = ''; /* check for calls, set comment */ -if(myisset('call') && $_REQUEST['call'] == '120' && can_call(120,$me)) +if( myisset('call') ) { - $result = DB_query("UPDATE Hand SET point_call='120' WHERE hash='$me' "); - if($myparty=='re') - $comment .= "Re"; - else if($myparty=='contra') - $comment .= "Contra"; - } -if(myisset('call') && $_REQUEST['call'] == '90' && can_call(90,$me)) - { - $result = DB_query("UPDATE Hand SET point_call='90' WHERE hash='$me' "); - $comment .= "No 90"; + if($_REQUEST['call'] == '120' && can_call(120,$me)) + { + $result = DB_query("UPDATE Hand SET point_call='120' WHERE hash='$me' "); + if($myparty=='re') + $commentCall = 'Re'; + else if($myparty=='contra') + $commentCall = 'Contra'; + } + else if($_REQUEST['call'] == '90' && can_call(90,$me)) + { + $result = DB_query("UPDATE Hand SET point_call='90' WHERE hash='$me' "); + $commentCall = 'No 90'; + } + else if($_REQUEST['call'] == '60' && can_call(60,$me)) + { + $result = DB_query("UPDATE Hand SET point_call='60' WHERE hash='$me' "); + $commentCall = 'No 60'; + } + else if($_REQUEST['call'] == '30' && can_call(30,$me)) + { + $result = DB_query("UPDATE Hand SET point_call='30' WHERE hash='$me' "); + $commentCall = 'No 30'; + } + else if($_REQUEST['call'] == '0' && can_call(0,$me)) + { + $result = DB_query("UPDATE Hand SET point_call='0' WHERE hash='$me' "); + $commentCall = 'Zero'; + } } -if(myisset('call') && $_REQUEST['call'] == '60' && can_call(60,$me)) + +/********************************************************** + * handle comments unless we play a card at the same time * + * (if we play a card, we need to update playid) * + **********************************************************/ + + +/* get time from the last action of the game */ +$r = DB_query_array("SELECT mod_date from Game WHERE id=".DB_quote_smart($gameid)); +$gameend = time() - strtotime($r[0]); + +/* handle comments in case player didn't play a card, allow comments a week after the end of the game */ +if( (!myisset('card') && $mystatus!='gameover') || ($mystatus=='gameover' && ($gameend < 60*60*24*7)) ) + if(myisset('comment')) + { + $comment = $_REQUEST['comment']; + + if($comment != '') + DB_insert_comment($comment,$playid,$gameid,$myid); + }; + + +/***************************************************************** + * output other games where it is the users turn + * make sure that the people looking at old games don't see the wrong games here + *****************************************************************/ + +if( $gamestatus != 'gameover' && isset($_SESSION['id']) ) { - $result = DB_query("UPDATE Hand SET point_call='60' WHERE hash='$me' "); - $comment .= "No 60"; + /* game isn't over, only valid user can get here, so show menu */ + display_user_menu($myid, $me); } -if(myisset('call') && $_REQUEST['call'] == '30' && can_call(30,$me)) +else if( $mystatus == 'gameover' && isset($_SESSION['id']) ) { - $result = DB_query("UPDATE Hand SET point_call='30' WHERE hash='$me' "); - $comment .= "No 30"; + /* user is looking at someone else's game, show the menu for the correct user */ + display_user_menu($_SESSION['id'],$me); } -if(myisset('call') && $_REQUEST['call'] == '0' && can_call(0,$me)) +else { - $result = DB_query("UPDATE Hand SET point_call='0' WHERE hash='$me' "); - $comment .= "Zero"; + echo '
'."\n"; + printf( _("It's your turn in these games:\nPlease log in to see this information.\n") ); + echo "
\n\n"; } - /***************************************************************** * output extra division in case this game is part of a session *****************************************************************/ if($session) { - echo "
\n"; + echo '
'."\n"; /* output rule set */ echo "
\n "._('Rules').":\n"; switch($RULES['dullen']) { case 'none': - echo " \""._('no\n"; break; case 'firstwins': - echo " \""._('ten\n"; break; case 'secondwins': - echo " \""._('second\n"; break; } switch($RULES['schweinchen']) { case 'none': - echo " \""._('no\n"; break; case 'both': - echo " \""._('two\n"; break; case 'second': - echo " \"".('second\n"; break; case 'secondaftercall': - echo " \""._('second\n"; break; } switch($RULES['call']) { case '1st-own-card': - echo " \""._('1st-own-card')."\"\n"; break; + echo ' '._('1st-own-card').\n"; break; case '5th-card': - echo " \""._('5th-card')."\"\n"; break; + echo ' '._('5th-card').\n"; break; case '9-cards': - echo " \""._('9-cards')."\"\n"; break; + echo ' '._('9-cards').\n"; break; } echo "
\n"; echo ' '._('10ofhearts').": {$RULES['dullen']}
\n"; @@ -234,7 +282,7 @@ if($session) $score = generate_score_table($session); /* get the last entry to show on the main page */ - $tmpscore= $score; + $tmpscore = $score; $finalscore = array_pop($tmpscore); $finalscore = $finalscore['players']; @@ -244,13 +292,13 @@ if($session) foreach($finalscore as $user=>$value) { $name = DB_get_name('userid',$user); - echo " ".substr($name,0,2).": $value "; + echo ' '.substr($name,0,2).": $value "; } } else { /* first game, no score yet */ - echo " "; + echo ' '; } /* output all games for the score table */ @@ -261,7 +309,7 @@ if($session) * previous and next game if possible */ $hashes = DB_get_hashes_by_session($session,$myid); - $next = NULL; + $next = NULL; $i = 1; foreach($hashes as $hash) { @@ -282,18 +330,22 @@ if($session) $next = NULL; /* check for solo, add game type to session number */ - echo " Game $session.$j"; - if($GT !='normal') - echo " ($GT)"; + echo ' '._('Game')." $session.$j"; + if($gamestatus != 'pre') + if($gametype_raw != 'normal') /* only show when needed */ + if(!($gametype_raw == 'solo' && $gametyep_solo == 'silent') ) + echo " ($GT)"; + if(isset($_SESSION['id']) && $_SESSION['id']==$myid) { if($previous) echo "   "._('previous')." \n"; if($next) echo "   "._('next')." \n"; + + if($j != $i ) + echo "   "._('last')." \n"; } - if($j != $i ) - echo "   last \n"; echo "\n
\n"; } @@ -308,6 +360,78 @@ if($mystatus!='gameover') DB_update_user_timestamp($_SESSION['id']); +/****************************************************************************** + * Output menu for selecting tricks + ******************************************************************************/ + +switch($mystatus) + { + case 'start': + break; + case 'init': + case 'check': + /* output sickness of other playes, in case they already selected and are sitting in front of the current player */ + echo "\n
    \n"; + echo "
  • Pre\n"; + + echo "
    • \n
\n"; /* end div trick, end li trick , end tricks*/ + /* end displaying sickness */ + break; + case 'poverty': + /* output pre-game trick in case user reloads, + * only needs to be done when a team has been formed */ + if($myparty=='re' || $myparty=='contra') + { + echo "\n
    \n"; + echo "
  • Pre\n"; + echo "
    • \n
\n\n"; /* end div trick, end li trick , end ul tricks */ + } + /* end output pre-game trick */ + break; + case 'play': + case 'gameover': + + echo "\n
    \n"; + + /* output vorbehalte */ + if($gametype_raw != 'normal') /* only show when needed */ + if(!($gametype_raw == 'solo' && $gametyep_solo == 'silent') ) + echo "
  • Pre
    • \n"; + + $result = DB_query('SELECT Trick.id'. + ' FROM Trick'. + ' WHERE Trick.game_id='.DB_quote_smart($gameid). + ' GROUP BY Trick.id'. + ' ORDER BY Trick.id ASC'); + $trickNR = 1; + $lasttrick = DB_get_max_trickid($gameid); + + /* output tricks */ + while($r = DB_fetch_array($result)) + { + $trick=$r[0]; + if($trick!=$lasttrick) + echo "
  • $trickNR
    • \n"; + else if($trick==$lasttrick) + echo "
  • $trickNR
    • \n"; + $trickNR++; + } + + /* if game is over, also output link to Score tab */ + if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' ) + echo "
  • "._('Score')."
    • \n"; + + /* output previous/next buttons */ + echo '
  • '._('prev')."
    • \n"; + echo '
  • '._('next')."
    • \n"; + + echo "
\n\n"; + + break; + default: + } + + /****************************************************************************** * Output tricks played, table, messages, and cards (depending on game status) ******************************************************************************/ @@ -316,7 +440,7 @@ if($mystatus!='gameover') echo "
\n"; /* display the table and the names */ -display_table(); +display_table_begin(); /* mystatus gets the player through the different stages of a game. * start: does the player want to play? @@ -330,8 +454,16 @@ display_table(); /* Depending on the situation we set * cards_status (see functions.php for possible options) + * most of the times we need to just show the cards, so we make this the default + */ +$card_status = CARDS_SHOW; + +/* Also collect message that should be displayed to the user, so that we can show + * them after showing the table. This makes the html flow more consistent and easier + * tournament change layouts, especially for smaller displays, e.g. mobile phones */ -$cards_status = CARDS_EMPTY; +$messages = array(); + switch($mystatus) { @@ -340,7 +472,7 @@ switch($mystatus) * ask if player wants to join the game * ****************************************/ - /* don't ask if user has autosetup set to yest */ + /* don't ask if user has autosetup set to yes */ $skip = 0; if($PREF['autosetup']=='yes') $skip = 1; @@ -348,7 +480,10 @@ switch($mystatus) { /* asks the player, if he wants to join the game */ output_check_want_to_play($me); + + /* don't show the cards before the user joined the game */ $card_status = CARDS_EMPTY; + break; } else @@ -357,14 +492,17 @@ switch($mystatus) if(!$skip && $_REQUEST['in'] == 'no' ) { /* cancel the game */ - $email_message = "Hello, \n\n". - "the game has been canceled due to the request of one of the players.\n\n"; - $userids = DB_get_all_userid_by_gameid($gameid); foreach($userids as $user) - { - mymail($user,$gameid,GAME_CANCELED,$email_message); - } + { + set_language($user,'uid'); + $email_message = _("Hello, \n\n". + "the game has been canceled due to the request of one of the players.")."\n\n"; + mymail($user,$gameid,GAME_CANCELED,$email_message); + }; + set_language($myid,'uid'); + + $card_status = CARDS_EMPTY; /* update game status */ cancel_game('noplay',$gameid); @@ -382,16 +520,16 @@ switch($mystatus) /* check if everyone has reached this stage, set player in game-table to the next player */ $userids = DB_get_all_userid_by_gameid($gameid); - foreach($userids as $user) + foreach($userids as $userid) { - $userstat = DB_get_hand_status_by_userid_and_gameid($user,$gameid); + $userstat = DB_get_hand_status_by_userid_and_gameid($userid,$gameid); if($userstat!='init') { /* whos turn is it? */ - DB_set_player_by_gameid($gameid,$user); + DB_set_player_by_gameid($gameid,$userid); break; } - }; + } } } case 'init': @@ -400,33 +538,9 @@ switch($mystatus) ***************************/ if(!myisset('solo','wedding','poverty','nines','lowtrump') ) { - /* output sickness of other playes, in case they already selected and are sitting in front of the current player */ - echo "\n
    \n"; - echo "
  • Pre\n". - "
    \n"; - - for($pos=1;$pos<5;$pos++) - { - $usersick = DB_get_sickness_by_pos_and_gameid($pos,$gameid); - $userid = DB_get_userid('gameid-position',$gameid,$pos); - $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid); - - if($userstatus=='start' || $userstatus=='init') - echo "
    still needs
    to decide
    \n"; /* show this to everyone */ - else - if($usersick!=NULL && $pos<=$mypos ) /* only show this for people sitting before the player */ - echo "
    sick
    \n"; - else if($usersick==NULL && $pos<=$mypos) - echo "
    healthy
    \n"; - } - echo "
    \n
    • \n
\n"; /* end div trick, end li trick , end tricks*/ - /* end displaying sickness */ - $mycards = DB_get_hand($me); output_check_for_sickness($me,$mycards); - $card_status = CARDS_SHOW; - break; } else @@ -441,20 +555,17 @@ switch($mystatus) if($Nsickness>1) { - echo "

You selected more than one sickness, please go back ". - "and answer the question again.

"; - - $card_status = CARDS_SHOW; - + $messages[] = sprintf(_('You selected more than one sickness, please go back '. + 'and answer the question again.'), + $INDEX.'?action=game&me=$me&in=yes'); break; } else { /* everything is ok, save what user said and proceed */ - echo "

Processing what you selected in the last step..."; + $messages[] = _('Processing what you selected in the last step...'); /* check if this sickness needs to be handled first */ - $gametype = DB_get_gametype_by_gameid($gameid); $startplayer = DB_get_startplayer_by_gameid($gameid); /* need this to check which solo goes first */ if( $_REQUEST['solo']!='No' ) @@ -465,9 +576,11 @@ switch($mystatus) DB_set_solo_by_hash($me,$_REQUEST['solo']); DB_set_sickness_by_hash($me,'solo'); - echo "
Seems like you want to play a {$_REQUEST['solo']} solo. Got it.
\n"; + $messages[] = '
'. + sprintf(_('Seems like you want to play a %s solo. Got it.'),$_REQUEST['solo']). + "
\n"; - if($gametype == 'solo' && $startplayer<$mypos) + if($gametype_raw == 'solo' && $startplayer<$mypos) {}/* do nothing, since someone else already is playing solo */ else { @@ -475,40 +588,41 @@ switch($mystatus) * store info in game table */ DB_set_gametype_by_gameid($gameid,'solo'); + $gametype_raw = 'solo'; DB_set_startplayer_by_gameid($gameid,$mypos); DB_set_solo_by_gameid($gameid,$_REQUEST['solo']); + $gametype_solo = $_REQUEST['solo']; + $gametype = $gametype_solo; }; } else if($_REQUEST['wedding'] == 'yes') { /* silent solo is set further down */ - echo _("Ok, you don't want to play a silent solo...wedding was chosen.")."
\n"; + $messages[] = _("Ok, you don't want to play a silent solo...wedding was chosen.")."
\n"; DB_set_sickness_by_hash($me,'wedding'); } else if($_REQUEST['poverty'] == 'yes') { - echo _("Don't think you can win with just a few trump...? Ok, poverty chosen.")."
\n"; + $messages[] = _("Don't think you can win with just a few trump...? Ok, poverty chosen.")."
\n"; DB_set_sickness_by_hash($me,'poverty'); } else if($_REQUEST['nines'] == 'yes') { - echo _("What? You just don't want to play a game because you have a few nines? Well, if no one". - " is playing solo, this game will be canceled.")."
\n"; + $messages[] = _("What? You just don't want to play a game because you have a few nines? Well, if no one". + ' is playing solo, this game will be canceled.')."
\n"; DB_set_sickness_by_hash($me,'nines'); } else if($_REQUEST['lowtrump'] == 'yes') { if($RULES['lowtrump']=='cancel') - echo _("What? You just don't want to play a game because you have low trump? Well, if no one". - " is playing solo, this game will be canceled.")."
\n"; + $messages[] = _("What? You just don't want to play a game because you have low trump? Well, if no one". + ' is playing solo, this game will be canceled.')."
\n"; else - echo _("Don't think you can win with low trumps...? Ok, poverty chosen.")."
.
\n"; + $messages[] = _("Don't think you can win with low trumps...? Ok, poverty chosen.")."
.
\n"; DB_set_sickness_by_hash($me,'lowtrump'); } - echo "

\n"; - /* move on to the next stage*/ DB_set_hand_status_by_hash($me,'check'); $mystatus='check'; @@ -520,60 +634,33 @@ switch($mystatus) * this can therefore only be handled once all players finished the last stage */ - /* output sickness of other playes, in case they already selected and are sitting in front of the current player */ - echo "\n
    \n"; - echo "
  • Pre\n". - "
    \n"; - - for($pos=1;$pos<5;$pos++) - { - $usersick = DB_get_sickness_by_pos_and_gameid($pos,$gameid); - $userid = DB_get_userid('gameid-position',$gameid,$pos); - $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid); + $messages[] = _('Checking if someone else selected solo, nines, wedding or poverty.'); - if($userstatus=='start' || $userstatus=='init') - echo "
    still needs
    to decide
    \n"; /* show this to everyone */ - else - if($usersick!=NULL) /* in the init-phase we only showed players with $pos<$mypos, now we can show all */ - echo "
    sick
    \n"; - else - echo "
    healthy
    \n"; - } - echo "
    \n
    • \n
\n"; /* end div trick, end li trick , end tricks*/ - /* end displaying sickness */ - - echo "
\n"; - echo '

'._('Checking if someone else selected solo, nines, wedding or poverty.').'

'; + /* in case the user can go do the next stage, we want to skip the break statement at the + * end. We keep track of these cases using this variable + */ + $nobreak=0; /* check if everyone has reached this stage */ $userids = DB_get_all_userid_by_gameid($gameid); $ok = 1; - foreach($userids as $user) + foreach($userids as $userid) { - $userstat = DB_get_hand_status_by_userid_and_gameid($user,$gameid); + $userstat = DB_get_hand_status_by_userid_and_gameid($userid,$gameid); if($userstat!='check') { $ok = 0; - DB_set_player_by_gameid($gameid,$user); + DB_set_player_by_gameid($gameid,$userid); break; } }; if(!$ok) { - echo '

'._('This step can only be handled after everyone finished the last step. '. + $messages[] = _('This step can only be handled after everyone finished the last step. '. 'Seems like this is not the case, so you need to wait a bit... '. 'you will get an email once that is the case, please use the link in '. - 'that email to continue the game.').'

'; - - /* display cards, if player was just at the init-phase he will still see the cards from there - * we can put this one here, since the last player to finish the init state won't get here and - * will still see his card anyway from the init-phase - */ - if($mystatus=='check') - { - $card_status = CARDS_SHOW; - } + 'that email to continue the game.'); } else { @@ -581,9 +668,11 @@ switch($mystatus) * are playing, in case there are any solos this already * will have the correct information in it */ - echo '

'._('Ok, everyone is done... figuring out what kind of game we are playing.').'

'; + $messages[] = _('Ok, everyone is done... figuring out what kind of game we are playing.'); + + /* gametype for displaying it (hides hidden solo)*/ + $GT = get_display_gametype($gameid); - $gametype = DB_get_gametype_by_gameid($gameid); $startplayer = DB_get_startplayer_by_gameid($gameid); /* check for sickness */ @@ -610,7 +699,7 @@ switch($mystatus) } /* now check which sickness comes first and set the gametype to it */ - if($gametype == 'solo') + if($gametype_raw == 'solo') { /* do nothing */ } @@ -619,44 +708,55 @@ switch($mystatus) /* cancel game */ if($cancelsick == 'nines') { - $email_message = "The game has been canceled because ".DB_get_name('userid',$cancel). - " has five or more nines and nobody is playing solo.\n\n". - "To redeal either start a new game or, in case the game was part of a tournament,\n". - "go to the last game and use the link at the bottom of the page to redeal.\n\n"; - /* update game status */ cancel_game('nines',$gameid); - echo "

The game has been canceled because ".DB_get_name('userid',$cancel). - " has five or more nines and nobody is playing solo.

\n"; + $messages[] = sprintf(_('The game has been canceled because %s'. + ' has five or more nines and nobody is playing solo.'),DB_get_name('userid',$cancel) ); } else if ($cancelsick == 'lowtrump') { - $email_message = "The game has been canceled because ".DB_get_name('userid',$cancel). - " has low trump and nobody is playing solo.\n\n". - "To redeal either start a new game or, in case the game was part of a tournament,\n". - "go to the last game and use the link at the bottom of the page to redeal.\n\n"; - /* update game status */ cancel_game('lowtrump',$gameid); - echo "

The game has been canceled because ".DB_get_name('userid',$cancel). - " has low trump and nobody is playing solo.

\n"; + $messages[] = sprintf(_('The game has been canceled because %s'. + ' has low trump and nobody is playing solo.'),DB_get_name('userid',$cancel)); }; $userids = DB_get_all_userid_by_gameid($gameid); foreach($userids as $user) { + set_language($user,'uid'); + if($cancelsick == 'nines') + { + $email_message = sprintf(_('The game has been canceled because %s'. + ' has five or more nines and nobody is playing solo.'),DB_get_name('userid',$cancel) ). + "\n\n". + _("To redeal either start a new game or, in case the game was part of a tournament,\n". + "go to the last game and use the link at the bottom of the page to redeal."). + "\n\n"; + } + else if ($cancelsick == 'lowtrump') + { + $email_message = sprintf(_('The game has been canceled because %s'. + " has low trump and nobody is playing solo."),DB_get_name('userid',$cancel)). + "\n\n". + _("To redeal either start a new game or, in case the game was part of a tournament,\n". + "go to the last game and use the link at the bottom of the page to redeal."). + "\n\n"; + }; + mymail($user,$gameid, GAME_CANCELED, $email_message); } + set_language($myid,'uid'); - echo "
\n"; /* end div message */ break; } else if($poverty==1) /* one person has poverty */ { DB_set_gametype_by_gameid($gameid,'poverty'); - $gametype = 'poverty'; + $gametype_raw = 'poverty'; + $gametype = 'poverty'; $who = DB_get_sickness_by_gameid($gameid); if(!$who) { @@ -670,7 +770,8 @@ switch($mystatus) else if($poverty==2) /* two people have poverty */ { DB_set_gametype_by_gameid($gameid,'dpoverty'); - $gametype = 'dpoverty'; + $gametype_raw = 'dpoverty'; + $gametype = 'dpoverty'; $who = DB_get_sickness_by_gameid($gameid); if(!$who) { @@ -691,10 +792,11 @@ switch($mystatus) { DB_set_gametype_by_gameid($gameid,'wedding'); DB_set_sickness_by_gameid($gameid,'-1'); /* wedding not resolved yet */ - $gametype = 'wedding'; + $gametype_raw = 'wedding'; + $gametype = 'wedding'; }; /* now the gametype is set correctly in the database */ - echo '

'._('Got it').' :)

'; + $messages[] = _('Got it').' :)'; /* loop over all players, set re/contra if possible and start the game if possible */ $userids = DB_get_all_userid_by_gameid($gameid); @@ -702,7 +804,7 @@ switch($mystatus) { $userhash = DB_get_hash_from_gameid_and_userid($gameid,$userid); - switch($gametype) + switch($gametype_raw) { case 'solo': /* are we the solo player? set us to re, else set us to contra */ @@ -750,13 +852,12 @@ switch($mystatus) } } /* check for silent solo, set game type to solo in this case */ - $gametype = DB_get_gametype_by_gameid($gameid); $userids = DB_get_all_userid_by_gameid($gameid); foreach($userids as $userid) { $userhash = DB_get_hash_from_gameid_and_userid($gameid,$userid); - if($gametype=='normal') + if($gametype_raw=='normal') { $userhand = DB_get_all_hand($userhash); if(check_wedding($userhand)) @@ -765,6 +866,9 @@ switch($mystatus) /* keep startplayer, just set gametype to silent solo */ DB_set_gametype_by_gameid($gameid,'solo'); DB_set_solo_by_gameid($gameid,'silent'); + $gametype_raw = 'solo'; + $gametype_solo = 'silent'; + $gametype = 'normal'; } } } @@ -774,21 +878,27 @@ switch($mystatus) { $startplayer = DB_get_startplayer_by_gameid($gameid); $hash = DB_get_hash_from_game_and_pos($gameid,$startplayer); - $who = DB_get_userid('hash',$hash); - DB_set_player_by_gameid($gameid,$who); + $userid = DB_get_userid('hash',$hash); + DB_set_player_by_gameid($gameid,$userid); if($hash!=$me) { if(DB_get_email_pref_by_hash($hash)!='emailaddict') { /* email startplayer */ - $email_message = "It's your turn now in game ".DB_format_gameid($gameid).".\n". - "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ; - mymail($who,$gameid,GAME_READY,$email_message); + set_language($userid,'uid'); + $email_message = sprintf(_("It's your turn now in game %s.\n". + "Use this link to play a card:"),DB_format_gameid($gameid))." ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ; + mymail($userid,$gameid,GAME_READY,$email_message); + set_language($myid,'uid'); } } else - echo "Please, start the game.
\n"; + { + $messages[] = sprintf(_('Please, start the game.'),$INDEX."?action=game&me=$me"). + "
\n"; + $nobreak=1; + } } else { @@ -798,7 +908,11 @@ switch($mystatus) $whoid = DB_get_userid('gameid-position',$gameid,$who); if($whoid==$myid) - echo "Please, start the game.
start the game.'),$INDEX."?action=game&me=$me"). + "
\n"; - $card_status = CARDS_SHOW; } - break; + if(!$nobreak) + break; case 'poverty': /* user only gets here in a poverty game, several things have to be handled here: @@ -835,6 +950,11 @@ switch($mystatus) * it is easier to check B) first */ + /* in case the user can go do the next stage, we want to skip the break statement at the + * end. We keep track of these cases using this variable + */ + $nobreak=0; + set_gametype($gametype); /* this sets the $CARDS variable */ $myparty = DB_get_party_by_hash($me); @@ -851,35 +971,14 @@ switch($mystatus) if($exchange >0) { $result = DB_query("UPDATE Hand_Card SET hand_id='$partnerhand'". - " WHERE hand_id='$myhand' AND card_id=".DB_quote_smart($exchange)); + " WHERE hand_id=".DB_quote_smart($myhand)." AND card_id=".DB_quote_smart($exchange)); DB_add_exchanged_card(DB_quote_smart($exchange),$myhand,$partnerhand); }; } - /* output pre-game trick in case user reloads, - * only needs to be done when a team has been formed */ - if($myparty=='re' || $myparty=='contra') - { - echo "\n
    \n"; - - $mygametype = DB_get_gametype_by_gameid($gameid); - - echo "
  • Pre\n". - "
    \n"; - - /* get information so show the cards that have been handed over in a poverty game */ - output_exchanged_cards(); - - echo "
    \n
    • \n
\n\n"; /* end div trick, end li trick , end ul tricks */ - } - /* end output pre-game trick */ - /* get hand */ $mycards = DB_get_hand($me); - /* default: show cards, will be overwritten, if we need to give back cards */ - $card_status = CARDS_SHOW; - /* check if user need to give more cards back */ if( ($myparty=='re' || $myparty=='contra') && count($mycards)>12) { @@ -893,21 +992,23 @@ switch($mystatus) /* email start player */ $startplayer = DB_get_startplayer_by_gameid($gameid); $hash = DB_get_hash_from_game_and_pos($gameid,$startplayer); - $who = DB_get_userid('hash',$hash); - DB_set_player_by_gameid($gameid,$who); + $userid = DB_get_userid('hash',$hash); + DB_set_player_by_gameid($gameid,$userid); if($hash!=$me) { if(DB_get_email_pref_by_hash($hash)!='emailaddict') { /* email startplayer */ - $email_message = "It's your turn now in game ".DB_format_gameid($gameid).".\n". - "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ; - mymail($who,$gameid,GAME_READY,$email_message); + set_language($userid,'uid'); + $email_message = sprintf(_("It's your turn now in game %s.\n". + 'Use this link to play a card: '),DB_format_gameid($gameid)).$HOST.$INDEX."?action=game&me=".$hash."\n\n" ; + mymail($userid,$gameid,GAME_READY,$email_message); + set_language($myid,'uid'); } } else - echo "
Please, start the game.
\n"; + $messages[]= sprintf(_('Please, start the game.'),$INDEX."?action=game&me=$me"); } /* the following is part A) of what needs to be done */ @@ -934,13 +1035,16 @@ switch($mystatus) if($card<27) $nrtrump++; $low=''; if($usersick=='lowtrump') - $low='low'; - echo "Player $name has $nrtrump $low trump. Do you want to take them?". - "Yes
\n"; + $low=_('low'); + /// TRANSLATORS: first %s=name, %d=number of trump, second %s= '' or 'low' for trumpfarmut + printf(_('Player %s has %d %s trump. Do you want to take them?'. + 'Yes')."
\n", + $name,$nrtrump,$low,"index.php?action=game&me=$me&trump=$user"); } } - echo "No way
\n"; - echo "
\n"; + /// TRANSLATORS: answer to question about taking trump in poverty game + echo ""._("No way")."
\n"; + echo "
\n"; } break; } @@ -974,19 +1078,21 @@ switch($mystatus) /* no more people to ask, need to cancel the game */ if($mypos+$next>4) { - $email_message = "Hello, \n\n". - "Game ".DB_format_gameid($gameid)." has been canceled since nobody wanted to take the trump.\n\n"; - $userids = DB_get_all_userid_by_gameid($gameid); foreach($userids as $user) { + set_language($user,'uid'); + $email_message = sprintf("Hello, \n\n". + 'Game %s has been canceled since nobody wanted to take the trump.',DB_format_gameid($gameid)). + "\n\n"; mymail($user, $gameid, GAME_CANCELED_POVERTY, $email_message); } + set_language($myid,'uid'); /* update game status */ cancel_game('trump',$gameid); - echo "

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

"; + $messages[] = sprintf(_('Game %s has been canceled.'),DB_format_gameid($gameid)); break; } else @@ -998,9 +1104,11 @@ switch($mystatus) DB_set_player_by_gameid($gameid,$userid); DB_set_hand_status_by_hash($userhash,'poverty'); - $email_message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:". + set_language($userid,'uid'); + $email_message = _("Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:"). " ".$HOST.$INDEX."?action=game&me=".$userhash."\n\n" ; mymail($userid,$gameid, GAME_POVERTY, $email_message); + set_language($myid,'uid'); } $cards_status = CARDS_SHOW; @@ -1021,7 +1129,7 @@ switch($mystatus) DB_add_exchanged_card($card,$userhand,$myhand); /* copy trump from player A to B */ - $result = DB_query("UPDATE Hand_Card SET hand_id='$myhand' WHERE hand_id='$userhand' AND card_id<'27'" ); + $result = DB_query("UPDATE Hand_Card SET hand_id='$myhand' WHERE hand_id=".DB_quote_smart($userhand)." AND card_id<'27'" ); /* reload cards */ $mycards = DB_get_hand($me); @@ -1083,7 +1191,7 @@ switch($mystatus) $next=2; if($mypos+$next>4) - echo "
Error in poverty, please contact the Admin
\n"; + $messages[] = "Error in poverty, please contact the Admin ($ADMIN_NAME at $ADMIN_EMAIL)"; $userhash = DB_get_hash_from_game_and_pos($gameid,$mypos+$next); $userid = DB_get_userid('hash',$userhash); @@ -1091,16 +1199,19 @@ switch($mystatus) DB_set_player_by_gameid($gameid,$userid); DB_set_hand_status_by_hash($userhash,'poverty'); - $email_message = "Two people have poverty, it's your turn to decide, if you want to take the trump. Please visit:". + set_langauge($userid,'uid'); + $email_message = _("Two people have poverty, it's your turn to decide, if you want to take the trump. Please visit:"). " ".$HOST.$INDEX."?action=game&me=".$userhash."\n\n" ; mymail($userid,$gameid, GAME_DPOVERTY, $email_message); + set_language($myid,'uid'); } } - echo "
Please, continue here.
\n"; + $messages[] = sprintf(_('Please, continue here'),$INDEX."?action=game&me=$me"); + $nobreak = 1; } } - echo "
\n"; - break; + if(!$nobreak) + break; case 'play': case 'gameover': @@ -1112,19 +1223,19 @@ switch($mystatus) switch($gamestatus) { case 'cancel-noplay': - echo "

The game has been canceled due to the request of one player.

If this was a mistake all 4 players need to send an Email to $ADMIN_NAME at $ADMIN_EMAIL requesting that the game should be restarted.

"; + $messages[] = _("The game has been canceled due to the request of one player.

If this was a mistake all 4 players need to send an Email to $ADMIN_NAME at $ADMIN_EMAIL requesting that the game should be restarted."); break; case 'cancel-timedout': - echo "

The game has been canceled because one player wasn't responding.

If this was a mistake all 4 players need to send an Email to $ADMIN_NAME at $ADMIN_EMAIL requesting that the game should be restarted.

"; + $messages[] = _("The game has been canceled because one player wasn't responding.
If this was a mistake all 4 players need to send an Email to $ADMIN_NAME at $ADMIN_EMAIL requesting that the game should be restarted."); break; case 'cancel-nines': - echo "

The game has been canceled because one player had too many nines.

"; + $messages[] = _('The game has been canceled because one player had too many nines.'); break; case 'cancel-lowtrump': - echo "

The game has been canceled because one player had low trump.

"; + $messages[] = _('The game has been canceled because one player had low trump.'); break; case 'cancel-trump': - echo "

The game has been canceled because nobody wanted to take the trump.

"; + $messages[] = _('The game has been canceled because nobody wanted to take the trump.'); break; } /* for these two types, we shouldn't show the cards, since we might want to restart the game */ @@ -1140,13 +1251,13 @@ switch($mystatus) { $ok = 1; $userids = DB_get_all_userid_by_gameid($gameid); - foreach($userids as $user) + foreach($userids as $userid) { - $userstatus = DB_get_hand_status_by_userid_and_gameid($user,$gameid); + $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid); if($userstatus !='play' && $userstatus!='gameover') { $ok = 0; - DB_set_player_by_gameid($gameid,$user); + DB_set_player_by_gameid($gameid,$userid); break; } } @@ -1158,15 +1269,17 @@ switch($mystatus) /* email startplayer */ $startplayer = DB_get_startplayer_by_gameid($gameid); $hash = DB_get_hash_from_game_and_pos($gameid,$startplayer); - $who = DB_get_userid('hash',$hash); - DB_set_player_by_gameid($gameid,$who); + $userid = DB_get_userid('hash',$hash); + DB_set_player_by_gameid($gameid,$userid); if($hash!=$me && DB_get_email_pref_by_hash($hash)!='emailaddict') { /* email startplayer) */ - $email_message = "It's your turn now in game ".DB_format_gameid($gameid).".\n". - "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ; - mymail($who,$gameid, GAME_READY, $email_message); + set_language($userid,'uid'); + $email_message = sprintf(_("It's your turn now in game %s.\n". + 'Use this link to play a card: '),DB_format_gameid($gameid)).$HOST.$INDEX."?action=game&me=".$hash."\n\n" ; + mymail($userid,$gameid, GAME_READY, $email_message); + set_language($myid,'uid'); } } } @@ -1176,19 +1289,6 @@ switch($mystatus) * accordingly */ - $gametype = DB_get_gametype_by_gameid($gameid); - $GT = $gametype; - if($gametype=='solo') - { - $gametype = DB_get_solo_by_gameid($gameid); - if($gametype=='silent') - $GT = 'normal'; - else - $GT = $gametype.' '.$GT; - } - else - $gametype = 'normal'; - set_gametype($gametype); /* this sets the $CARDS variable */ /* get some infos about the game, need to reset this, since it might have changed */ @@ -1197,49 +1297,31 @@ switch($mystatus) /* has the game started? No, then just wait here...*/ if($gamestatus == 'pre') { - echo '

'._('You finished the setup, but not everyone else finished it... '. - 'You need to wait for the others. Just wait for an email.').'

'; - - $card_status = CARDS_SHOW; + $messages[] = _('You finished the setup, but not everyone else finished it... '. + 'You need to wait for the others. Just wait for an email.'); break; /* not sure this works... the idea is that you can * only play a card after everyone is ready to play */ } - - /* get time from the last action of the game */ - $r = DB_query_array("SELECT mod_date from Game WHERE id='$gameid' " ); - $gameend = time() - strtotime($r[0]); - - /* handle 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']; - $playid = DB_get_current_playid($gameid); - - if($comment != '') - DB_insert_comment($comment,$playid,$myid); - }; - /* get everything relevant to display the tricks */ - $result = DB_query("SELECT Hand_Card.card_id as card,". - " Hand.position as position,". - " Play.sequence as sequence, ". - " Trick.id, ". + $result = DB_query('SELECT Hand_Card.card_id as card,'. + ' Hand.position as position,'. + ' Play.sequence as sequence, '. + ' Trick.id,'. " GROUP_CONCAT(CONCAT('',User.fullname,': ',Comment.comment,'')". " SEPARATOR '\n' ), ". - " Play.create_date, ". - " Hand.user_id ". - "FROM Trick ". - "LEFT JOIN Play ON Trick.id=Play.trick_id ". - "LEFT JOIN Hand_Card ON Play.hand_card_id=Hand_Card.id ". - "LEFT JOIN Hand ON Hand_Card.hand_id=Hand.id ". - "LEFT JOIN Comment ON Play.id=Comment.play_id ". - "LEFT JOIN User On User.id=Comment.user_id ". - "WHERE Trick.game_id='".$gameid."' ". - "GROUP BY Trick.id, sequence ". - "ORDER BY Trick.id, sequence ASC"); + ' Play.create_date,'. + ' Hand.user_id'. + ' FROM Trick'. + ' LEFT JOIN Play ON Trick.id=Play.trick_id'. + ' LEFT JOIN Hand_Card ON Play.hand_card_id=Hand_Card.id'. + ' LEFT JOIN Hand ON Hand_Card.hand_id=Hand.id'. + ' LEFT JOIN Comment ON Play.id=Comment.play_id'. + ' LEFT JOIN User On User.id=Comment.user_id'. + " WHERE Trick.game_id=".DB_quote_smart($gameid). + ' GROUP BY Trick.id, sequence'. + ' ORDER BY Trick.id, sequence ASC'); $trickNR = 0; $lasttrick = DB_get_max_trickid($gameid); @@ -1248,22 +1330,39 @@ switch($mystatus) $pos = DB_get_startplayer_by_gameid($gameid)-1; $firstcard = ''; /* first card in a trick */ - echo "\n\n"; /* end ul tricks*/ + echo "\n"; /* end ul tricks*/ - if($myturn && !myisset('card') && $mystatus=='play' ) + if( ($myturn && !myisset('card') && $mystatus=='play') /* it's my turn*/ + || ($myturn && myisset('card') && $next==$mypos && $mystatus=='play') /* a card has been played and player won the trick*/) { $card_status = CARDS_MYTURN; } @@ -1958,13 +2080,85 @@ switch($mystatus) /* 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'); + $messages[] = _('The game is over for you... other people still need to play though'); } break; default: - myerror("error in testing the status"); + myerror('error in testing the status'); } /*end of output: tricks, table, messages, card */ +/* display the 2nd half of table and the names */ + +/*********************************** + * Output pre-trick if needed * + * this outputs status of healthy, * + * sick, etc during pre-game phase * + **********************************/ +switch($mystatus) + { + case 'start': + break; + case 'init': + case 'check': + /* output sickness of other playes, in case they already selected and are sitting in front of the current player */ + echo "\n".'
'."\n"; + echo '
'."\n"; + + for($pos=1;$pos<5;$pos++) + { + $usersick = DB_get_sickness_by_pos_and_gameid($pos,$gameid); + $userid = DB_get_userid('gameid-position',$gameid,$pos); + $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid); + + if($userstatus=='start' || $userstatus=='init') + echo '
'._('still needs
to decide')."
\n"; /* show this to everyone */ + else + if($usersick!=NULL) /* in the init-phase we only showed players with $pos<$mypos, now we can show all */ + echo '
'._('sick')."
\n"; + else + echo '
'._('healthy')."
\n"; + } + + /* display all comments on the top right (card1)*/ + $comments = DB_get_pre_comment($gameid); + /* display card */ + echo '
'."\n"; + /* display comments */ + foreach( $comments as $comment ) + echo ' '.$comment[1].': '.$comment[0]."\n"; + echo "
\n"; /* end div card */ + + + echo "
\n
\n"; /* end div trick, end li trick , end tricks*/ + /* end displaying sickness */ + + break; + case 'poverty': + /* output pre-game trick in case user reloads, + * only needs to be done when a team has been formed */ + if($myparty=='re' || $myparty=='contra') + { + echo "\n
\n"; + + echo "
\n"; + + /* get information so show the cards that have been handed over in a poverty game */ + output_exchanged_cards($gametype); + + echo "
\n
\n\n"; /* end div trick, end li trick , end ul tricks */ + } + /* end output pre-game trick */ + break; + case 'play': + case 'gameover': + + /* already taken care of */ + break; + default: + } + +display_table_end(); + /************** * show cards * **************/ @@ -1972,6 +2166,7 @@ switch($mystatus) $mycards = DB_get_hand($me); $mycards = mysort($mycards,$gametype); +echo "\n"; echo '
'; switch ($card_status) { case CARDS_SHOW: @@ -1986,10 +2181,11 @@ switch ($card_status) { $type='exchange'; foreach($mycards as $card) display_link_card($card,$PREF['cardset'],$type); - echo ' '."\n"; + echo ' '."\n"; break; case CARDS_MYTURN: - echo 'Hello '.$myname.", it's your turn!
\n"; + printf (_("Hello %s, it's your turn!"),$myname); + echo "
\n"; echo _('Your cards are').":
\n"; /* do we have to follow suite? */ @@ -2059,7 +2255,8 @@ switch ($card_status) { else { $name = DB_get_name('userid',$myid); - echo "$name's were:
\n"; + printf (_("%s's were:"),$name); + echo "
\n"; } $oldcards = DB_get_all_hand($me); $oldcards = mysort($oldcards,$gametype); @@ -2080,7 +2277,8 @@ switch ($card_status) { $name = DB_get_name('userid',$user); $oldcards = DB_get_all_hand($userhash); $oldcards = mysort($oldcards,$gametype); - echo "$name's cards were:
\n"; + printf(_("%s's cards were:"),$name); + echo "
\n"; foreach($oldcards as $card) display_card($card,$PREF['cardset']); } @@ -2090,39 +2288,37 @@ switch ($card_status) { default: break; } -echo '
'; - +echo "\n"; -/*********************************************** - * Comments, re/contra calls, user menu - ***********************************************/ +/***************** + * show messages * + *****************/ -/* output other games where it is the users turn - * make sure that the people looking at old games don't see the wrong games here - */ -if( $gamestatus != 'gameover' ) +if( sizeof($messages) ) { - /* game isn't over, only valid user can get here, so show menu */ - display_user_menu($myid); - } -else if( $origmystatus != 'gameover' ) - { - /* user just played the very last card, game is now over, it's still ok to show the menu though */ - display_user_menu($myid); - } -else if( $mystatus == 'gameover' - && isset($_SESSION['id']) ) - { - /* user is looking at someone else's game, show the menu for the correct user */ - display_user_menu($_SESSION['id']); + echo "\n
\n"; + foreach($messages as $message) + { + echo "
$message
"._("close")."
\n"; + } + echo "
\n\n"; } -else + +/**************************** + * commit commentCall to DB * + ****************************/ + +if($commentCall != '') { - echo "
\n"; - echo "It's your turn in these games:
\n"; - echo "Please log in to see this information.\n"; - echo "
\n"; + /* treat before game calls special, so that we can show them on the first trick and not the pre-phase */ + if($playid == -1) + $playid = -2; + + DB_insert_comment($commentCall,$playid,$gameid,$myid); } +/*********************************************** + * Comments, re/contra calls, user menu + ***********************************************/ /* * display gameinfo: re/contra, comment-box, play-card button, games played by others @@ -2131,11 +2327,11 @@ else echo "
\n"; /* get time from the last action of the game */ -$r = DB_query_array("SELECT mod_date from Game WHERE id='$gameid' " ); +$r = DB_query_array("SELECT mod_date from Game WHERE id=".DB_quote_smart($gameid)); $gameend = time() - strtotime($r[0]); /* comment box */ -if($gamestatus == 'play' || $gameend < 60*60*24*7) +if($gamestatus == 'play' || $gamestatus == 'pre' || $gameend < 60*60*24*7) { echo ' '._('A short comment').":\n"; } @@ -2148,9 +2344,9 @@ if($gamestatus == 'play' ) } /* play-card button */ -if($gamestatus == 'play' || $gameend < 60*60*24*7) +if($gamestatus == 'play' || $gamestatus == 'pre' || $gameend < 60*60*24*7) { - echo " \n"; + echo ' \n"; } /* has this hand been played by others? */ @@ -2158,7 +2354,7 @@ $other_game_ids = DB_played_by_others($gameid); if(sizeof($other_game_ids)>0 && $mystatus=='gameover') { $mypos = DB_get_pos_by_hash($me); - echo "

See how other played the same hand: \n"; + echo '

'._('See how other played the same hand:')." \n"; foreach($other_game_ids as $id) { $otherhash = DB_get_hash_from_game_and_pos($id,$mypos); @@ -2168,7 +2364,7 @@ if(sizeof($other_game_ids)>0 && $mystatus=='gameover') echo "

\n"; } -echo "
\n"; /* end gameinfo */ +echo "\n\n"; /* end gameinfo */ /* make sure that we don't show the notes to the wrong person * (e.g. other people looking at an old game) @@ -2191,10 +2387,10 @@ if($mystatus=='gameover' && isset($_SESSION['id']) && $_SESSION['id']==$myid) { $session = DB_get_session_by_gameid($gameid); - $result = DB_query("SELECT id,create_date FROM Game". + $result = DB_query('SELECT id,create_date FROM Game'. " WHERE session=$session". - " ORDER BY create_date DESC". - " LIMIT 1"); + ' ORDER BY create_date DESC'. + ' LIMIT 1'); $r = -1; if($result) $r = DB_fetch_array($result); @@ -2203,13 +2399,10 @@ if($mystatus=='gameover' && { /* suggest a new game with the same people in it, just rotated once (unless last game was solo) */ $names = DB_get_all_names_by_gameid($gameid); - $type = DB_get_gametype_by_gameid($gameid); - if($type=='solo') + if($gametype_raw=='solo') { - $solo = DB_get_solo_by_gameid($gameid); - - if($solo!='silent') /* repeat game with same first player */ + if($gametype_solo!='silent') /* repeat game with same first player */ output_ask_for_new_game($names[0],$names[1],$names[2],$names[3],$gameid); else /* rotate normally */ output_ask_for_new_game($names[1],$names[2],$names[3],$names[0],$gameid);