X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=0a40bab00032266c0782db4f63c09923367cadaf;hp=55ce7a6149680150c1307ef601f0ffbb7185afe6;hb=3851854ad07430dc62337d482e811bf9363480a5;hpb=cff9193689fb8396795004606c0e05d81a4467c8
diff --git a/include/game.php b/include/game.php
index 55ce7a6..0a40bab 100644
--- a/include/game.php
+++ b/include/game.php
@@ -6,14 +6,12 @@ if(!isset($HOST))
exit;
/* calling game.php only makes sense when we give it a hash for a game */
-if(!myisset("me"))
+if(!myisset('me'))
{
echo "Hmm, you really shouldn't mess with the urls.
\n";
- output_footer();
- DB_close();
- exit();
+ return;
}
-$me = $_REQUEST["me"];
+$me = $_REQUEST['me'];
/* Ok, got a hash, but is it valid? */
$myid = DB_get_userid('hash',$me);
@@ -21,30 +19,22 @@ 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.";
- output_footer();
- DB_close();
- exit();
+ return;
}
global $GAME,$RULES,$CARDS;
-/* user might get here by clicking on the link in an email, so session might not be set */
-if(isset($_SESSION["name"]))
- output_status($_SESSION["name"]);
-
-/* the user has done something, update the timestamp */
-DB_update_user_timestamp($myid);
-
/* get some information from the DB */
$gameid = DB_get_gameid_by_hash($me);
$myname = DB_get_name('hash',$me);
$mystatus = DB_get_status_by_hash($me);
$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);
/* get prefs and save them in a variable*/
-$PREF = DB_get_PREF($myid);
+$PREF = DB_get_PREF(isset($_SESSION['id'])?$_SESSION['id']:$myid);
/* get rule set for this game */
$RULES = DB_get_RULES($gameid);
@@ -53,10 +43,10 @@ $RULES = DB_get_RULES($gameid);
$gametype = DB_get_gametype_by_gameid($gameid);
$gamestatus = DB_get_game_status_by_gameid($gameid);
$GT = $gametype;
-if($gametype=="solo")
+if($gametype=='solo')
{
$gametype = DB_get_solo_by_gameid($gameid);
- $GT = $gametype." ".$GT;
+ $GT = $gametype.' '.$GT;
}
/* do we need to worry about Schweinchen?
@@ -73,7 +63,7 @@ if( $gamestatus == 'pre' )
else
{
/* in a game Schweinchen is not valid in all types of games */
- if( $gametype == 'normal' || $gametype == 'silent' || $gametype=='trump' )
+ if( in_array($gametype,array('normal','wedding','trump','silent') ))
if( in_array($RULES['schweinchen'],array('both','second','secondaftercall')) )
$ok=1;
}
@@ -90,7 +80,7 @@ if($ok)
{
$hash = DB_get_hash_from_game_and_pos($gameid,$i);
$cards = DB_get_all_hand($hash);
- if( in_array("19",$cards) && in_array("20",$cards) )
+ if( in_array('19',$cards) && in_array('20',$cards) )
$GAME['schweinchen-who']=$hash;
};
$GAME['schweinchen-first'] = 0; /* to keep track if they have been played already */
@@ -105,26 +95,181 @@ if($ok)
set_gametype('normal');
/* put everyting in a form */
-echo "