X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=f612b202870aec926035dedd1a9cfc4fe3319e77;hp=25e2b2ff8166d24097d722dd81273d49b5063d38;hb=c757506a0a598593115c377a6e4acf399f4d2b83;hpb=cd4cbd4a1cce2c35a6a78b1b957c17389001b4b1
diff --git a/include/game.php b/include/game.php
index 25e2b2f..f612b20 100644
--- a/include/game.php
+++ b/include/game.php
@@ -6,12 +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";
return;
}
-$me = $_REQUEST["me"];
+$me = $_REQUEST['me'];
/* Ok, got a hash, but is it valid? */
$myid = DB_get_userid('hash',$me);
@@ -25,7 +25,8 @@ if(!$myid)
global $GAME,$RULES,$CARDS;
/* the user has done something, update the timestamp */
-DB_update_user_timestamp($myid);
+if(isset($_SESSION['id']))
+ DB_update_user_timestamp($_SESSION['id']);
/* get some information from the DB */
$gameid = DB_get_gameid_by_hash($me);
@@ -33,10 +34,11 @@ $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);
@@ -45,10 +47,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?
@@ -65,7 +67,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( $gametype == 'normal' || $gametype == 'silent' || $gametype=='trump' || $gametype=='wedding')
if( in_array($RULES['schweinchen'],array('both','second','secondaftercall')) )
$ok=1;
}
@@ -82,7 +84,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 */
@@ -101,42 +103,147 @@ echo "