X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=38cf7e3b9c34bc81a191045532798515db4bbe14;hp=b339c03c38bb410f6b280e93ddd044ac9776ad22;hb=e930c23ac2a2571ed9cc2a42334321ce150a6dbf;hpb=029a068c5ccaac8e5ff3d7e9d7f7f435976b4bc5 diff --git a/include/game.php b/include/game.php index b339c03..38cf7e3 100644 --- a/include/game.php +++ b/include/game.php @@ -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; } @@ -184,7 +184,7 @@ if( myisset('call') ) /* 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]); /* handle comments in case player didn't play a card, allow comments a week after the end of the game */ @@ -215,9 +215,8 @@ else if( $mystatus == 'gameover' && isset($_SESSION['id']) ) } else { - echo "
\n"; - echo "It's your turn in these games: \n"; - echo "Please log in to see this information.\n"; + echo '
'."\n"; + printf( _("It's your turn in these games:\nPlease log in to see this information.\n") ); echo "
\n\n"; } @@ -226,7 +225,7 @@ else *****************************************************************/ if($session) { - echo "
\n"; + echo '
'."\n"; /* output rule set */ echo "
\n "._('Rules').":\n"; @@ -398,11 +397,11 @@ switch($mystatus) if(!( $mygametype == 'solo' && $mygamesolo == 'silent') ) echo "
  • Pre
    • \n"; - $result = DB_query('SELECT Trick.id '. - 'FROM Trick '. - "WHERE Trick.game_id='".$gameid."' ". - 'GROUP BY Trick.id '. - 'ORDER BY Trick.id ASC'); + $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); @@ -710,7 +709,7 @@ switch($mystatus) /* update game status */ cancel_game('lowtrump',$gameid); - $messages[] = sprintf(('The game has been canceled because %s'. + $messages[] = sprintf(_('The game has been canceled because %s'. ' has low trump and nobody is playing solo.'),DB_get_name('userid',$cancel)); }; @@ -945,7 +944,7 @@ 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); }; } @@ -1009,12 +1008,15 @@ 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"; + /// TRANSLATORS: answer to question about taking trump in poverty game + echo ""._("No way")."
    \n"; echo "
    \n"; } break; @@ -1100,7 +1102,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); @@ -1290,20 +1292,20 @@ switch($mystatus) $result = DB_query('SELECT Hand_Card.card_id as card,'. ' Hand.position as position,'. ' Play.sequence as sequence, '. - ' Trick.id, '. + ' 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); @@ -1457,7 +1459,7 @@ switch($mystatus) DB_update_game_timestamp($gameid); /* mark card as played */ - DB_query("UPDATE Hand_Card SET played='true' WHERE hand_id='$handid' AND card_id=". + DB_query("UPDATE Hand_Card SET played='true' WHERE hand_id=".DB_quote_smart($handid)." AND card_id=". DB_quote_smart($card)); /* get trick id or start new trick */ @@ -1623,7 +1625,7 @@ switch($mystatus) */ if($winner>0) - DB_query("UPDATE Trick SET winner='$winner' WHERE id='$trickid'"); + DB_query("UPDATE Trick SET winner='$winner' WHERE id=".DB_quote_smart($trickid)); else $messages[] = "ERROR during scoring"; @@ -1717,12 +1719,11 @@ switch($mystatus) ' LEFT JOIN Play ON Trick.id=Play.trick_id'. ' LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id'. ' LEFT JOIN Card ON Card.id=Hand_Card.card_id'. - " WHERE Hand.game_id='$gameid'". + " WHERE Hand.game_id=".DB_quote_smart($gameid). ' GROUP BY User.fullname' ); - $email_message = _("The game is over. Thanks for playing :)")."\n"; - $email_message .= _("Final score:")."\n"; + $email_final_score=""; while( $r = DB_fetch_array($result) ) - $email_message .= ' '.$r[0].'('.$r[2].') '.$r[1]."\n"; + $email_final_score .= ' '.$r[0].'('.$r[2].') '.$r[1]."\n"; $result = DB_query('SELECT Hand.party, IFNULL(SUM(Card.points),0) FROM Hand'. ' LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id'. @@ -1730,14 +1731,14 @@ switch($mystatus) ' LEFT JOIN Play ON Trick.id=Play.trick_id'. ' LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id'. ' LEFT JOIN Card ON Card.id=Hand_Card.card_id'. - " WHERE Hand.game_id='$gameid'". + " WHERE Hand.game_id=".DB_quote_smart($gameid). ' GROUP BY Hand.party' ); - $email_message .= "\n"._("Totals:")."\n"; + $email_totals=""; $re = 0; $contra = 0; while( $r = DB_fetch_array($result) ) { - $email_message .= ' '.$r[0].' '.$r[1]."\n"; + $email_totals .= ' '.$r[0].' '.$r[1]."\n"; if($r[0] == 're') $re = $r[1]; else if($r[0] == 'contra') @@ -1902,39 +1903,36 @@ switch($mystatus) DB_query('INSERT INTO Score'. " VALUES( NULL,NULL,$gameid,'contra',NULL,NULL,'call$p')"); } - } - + }; /* add score points to email */ - $email_message .= "\n"; $Tpoint = 0; - $email_message .= " "._("Points Re:")." \n"; + + $email_points_re=""; $queryresult = DB_query('SELECT score FROM Score '. - " WHERE game_id=$gameid AND party='re'"); + " WHERE game_id=".DB_quote_smart($gameid)." AND party='re'"); while($r = DB_fetch_array($queryresult) ) { - $email_message .= ' '.$r[0]."\n"; + $email_points_re .= ' '.$r[0]."\n"; $Tpoint ++; } - $email_message .= " "._("Points Contra:")." \n"; + + $email_points_contra=""; $queryresult = DB_query('SELECT score FROM Score '. - " WHERE game_id=$gameid AND party='contra'"); + " WHERE game_id=".DB_quote_smart($gameid)." AND party='contra'"); while($r = DB_fetch_array($queryresult) ) { - $email_message .= ' '.$r[0]."\n"; + $email_points_contra .= ' '.$r[0]."\n"; $Tpoint --; } - $email_message .= " "._("Total Points (from the Re point of view):")." $Tpoint\n"; - $email_message .= "\n"; $session = DB_get_session_by_gameid($gameid); $score = generate_score_table($session); - $email_message .= _("Score Table:")."\n"; - $email_message .= format_score_table_ascii($score); - $email_message .= "\n"._("Use these links to have a look at game")." ".DB_format_gameid($gameid).": \n"; + $email_score_table = format_score_table_ascii($score); - /* send out final email */ + /* add user links */ + $email_user_links=""; foreach($userids as $user) { /* add links for all players */ @@ -1942,10 +1940,35 @@ switch($mystatus) $name = DB_get_name('userid',$user); $link = "$name: ".$HOST.$INDEX."?action=game&me=".$hash."\n" ; - $email_message .= $link; + $email_user_links .= $link; + } + + foreach($userids as $user) + { + /* set correct language for this user */ + set_language($user,'uid'); + + /* generate message */ + $email_message = _("The game is over. Thanks for playing :)")."\n"; + $email_message .= _("Final score:")."\n"; + $email_message .= $email_final_score; + $email_message .= "\n"._("Totals:")."\n"; + $email_message .= $email_totals; + $email_message .= "\n "._("Points Re:")." \n"; + $email_message .= $email_points_re; + $email_message .= " "._("Points Contra:")." \n"; + $email_message .= $email_points_contra; + $email_message .= " "._("Total Points (from the Re point of view):")." $Tpoint\n\n"; + $email_message .= _("Score Table:")."\n"; + $email_message .= $email_score_table; + $email_message .= "\n"._("Use these links to have a look at game")." ".DB_format_gameid($gameid).": \n"; + $email_message .= $email_user_links; + $email_message .= "\n\n "._("(use in-game comments to reach all players)")."\n\n"; + + /* send email */ + mymail($user,$gameid, GAME_OVER, $email_message); } - $email_message .= "\n\n "._("(use in-game comments to reach all players)")."\n\n"; - mymail($userids,$gameid, GAME_OVER, $email_message); + /* reset language */ set_language($myid,'uid'); } } @@ -1975,7 +1998,7 @@ switch($mystatus) ' LEFT JOIN Play ON Trick.id=Play.trick_id'. ' LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id'. ' LEFT JOIN Card ON Card.id=Hand_Card.card_id'. - " WHERE Hand.game_id='$gameid'". + " WHERE Hand.game_id=".DB_quote_smart($gameid). ' GROUP BY User.fullname' ); while( $r = DB_fetch_array($result)) echo '
    \n". @@ -1989,27 +2012,29 @@ switch($mystatus) ' LEFT JOIN Play ON Trick.id=Play.trick_id'. ' LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id'. ' LEFT JOIN Card ON Card.id=Hand_Card.card_id'. - " WHERE Hand.game_id='$gameid'". + " WHERE Hand.game_id=".DB_quote_smart($gameid). ' GROUP BY Hand.party' ); - echo "
    \n Totals:
    \n"; + echo "
    \n "._("Totals:")."
    \n"; while( $r = DB_fetch_array($result)) echo ' '.$r[0].' '.$r[1]."
    \n"; $queryresult = DB_query('SELECT timediff(mod_date,create_date) '. - " FROM Game WHERE id='$gameid'"); + " FROM Game WHERE id=".DB_quote_smart($gameid)); $r = DB_fetch_array($queryresult); - echo '

    This game took '.$r[0]." hours.

    \n"; + echo '

    '; + printf(_('This game took %d hours.'), $r[0]); + echo "

    \n"; - echo "
    \n Points Re:
    \n"; + echo "
    \n "._("Points Re:")."
    \n"; $queryresult = DB_query('SELECT score FROM Score '. - " WHERE game_id=$gameid AND party='re'"); + " WHERE game_id=".DB_quote_smart($gameid)." AND party='re'"); while($r = DB_fetch_array($queryresult) ) echo ' '.$r[0]."
    \n"; echo "
    \n"; - echo "
    \n Points Contra:
    \n"; + echo "
    \n "._("Points Contra:")."
    \n"; $queryresult = DB_query('SELECT score FROM Score '. - " WHERE game_id=$gameid AND party='contra'"); + " WHERE game_id=".DB_quote_smart($gameid)." AND party='contra'"); while($r = DB_fetch_array($queryresult) ) echo ' '.$r[0]."
    \n"; echo "
    \n"; @@ -2149,10 +2174,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? */ @@ -2222,7 +2248,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); @@ -2243,7 +2270,7 @@ switch ($card_status) { $name = DB_get_name('userid',$user); $oldcards = DB_get_all_hand($userhash); $oldcards = mysort($oldcards,$gametype); - echo sprintf(_("%s's cards were:"),$name); + printf(_("%s's cards were:"),$name); echo "
    \n"; foreach($oldcards as $card) display_card($card,$PREF['cardset']); @@ -2293,7 +2320,7 @@ if($commentCall != '') 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 */ @@ -2320,7 +2347,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);