X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=index.php;h=bae38d4c778adcc6bc72563167053b79cb9a5042;hp=2c0045dc3480ea316a8762de432924c44ff14427;hb=1332ef44c9587295fe054c73415d405247fb297d;hpb=300806c8ee000d70fcedf21abd643d6be1c33f55
diff --git a/index.php b/index.php
index 2c0045d..bae38d4 100644
--- a/index.php
+++ b/index.php
@@ -289,9 +289,9 @@ else if(myisset("me"))
echo " Gametype: $GT \n";
echo "Rules: \n";
- echo "10ofhearts : ".$r[2]." \n";
- echo "schweinchen: ".$r[3]." \n";
- echo "call: ".$r[4]." \n";
+ echo "10ofhearts : ".$RULES["dullen"] ." \n";
+ echo "schweinchen: ".$RULES["schweinchen"] ." \n";
+ echo "call: ".$RULES["call"] ." \n";
echo "\n";
/* output extra division in case this game is part of a session */
@@ -339,24 +339,30 @@ else if(myisset("me"))
switch($mystatus)
{
case 'start':
- check_want_to_play($me);
- /* move on to the next stage*/
- DB_set_hand_status_by_hash($me,'init');
- break;
+ if( !myisset("in") )
+ {
+ output_check_want_to_play($me);
+ break;
+ }
+ else
+ {
+ /* move on to the next stage*/
+ DB_set_hand_status_by_hash($me,'init');
+ }
case 'init':
/* first check if everything went ok in the last step
* if not, send user back, if yes, check what he did
*/
if( !myisset("in") )
{
- echo "
";
DB_set_hand_status_by_hash($me,'start');
}
else
{
if($_REQUEST["in"] == "no")
{
- /* cancle the game */
+ /* cancel the game */
$message = "Hello, \n\n".
"the game has been canceled due to the request of one of the players.\n";
@@ -372,7 +378,7 @@ else if(myisset("me"))
}
else
{
- echo "thanks for joining the game...";
+ echo "Thanks for joining the game...";
$mycards = DB_get_hand($me);
sort($mycards);
@@ -393,17 +399,20 @@ else if(myisset("me"))
/* ok, user is in the game, saw his cards and selected his vorbehalt
* so first we check what he selected
*/
- echo "Processing what you selected in the last step... ";
-
if(!myisset("solo","wedding","poverty","nines") )
{
/* all these variables have a pre-selected default,
* so we should never get here,
- * unless a user tries to cheat ;) */
- echo "something went wrong during the setup...please contact the $ADMIN_NAME at $ADMIN_EMAIL.";
+ * unless a user tries to cheat ;)
+ * can also happen if user reloads the page!
+ */
+ echo "
";
+ DB_set_hand_status_by_hash($me,'init');
}
else
{
+ echo "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);
@@ -493,7 +502,7 @@ else if(myisset("me"))
* set that one in the Game table
* tell people about it.
*/
- echo " Checking if someone else selected solo, nines or wedding or poverty. ";
+ echo " Checking if someone else selected solo, nines, wedding or poverty. ";
/* check if everyone has reached this stage */
$userids = DB_get_all_userid_by_gameid($gameid);
@@ -635,7 +644,7 @@ else if(myisset("me"))
foreach($userids as $user)
{
/* userids are sorted by position...
- * so output whatever the firstone has, then whatever the next one has
+ * so output whatever the first one has, then whatever the next one has
* stop when the sickness is the same as the gametype
*/
@@ -1167,12 +1176,28 @@ else if(myisset("me"))
}
echo "\n";
+ /* get time from the last action of the game */
+ $result = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " );
+ $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)) )
+ 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 = mysql_query("SELECT Hand_Card.card_id as card,".
" Hand.position as position,".
" Play.sequence as sequence, ".
" Trick.id, ".
- " Comment.comment, ".
+ " GROUP_CONCAT(CONCAT('',User.fullname,': ',Comment.comment,'') SEPARATOR '\n' ), ".
" Play.create_date, ".
" Hand.user_id ".
"FROM Trick ".
@@ -1180,8 +1205,10 @@ else if(myisset("me"))
"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."' ".
- "ORDER BY Trick.id,sequence ASC");
+ "GROUP BY Trick.id, sequence ".
+ "ORDER BY Trick.id, sequence ASC");
$trickNR = 1;
$lasttrick = DB_get_max_trickid($gameid);
@@ -1278,7 +1305,7 @@ else if(myisset("me"))
$myturn = 1;
else
$myturn = 0;
-
+
/* do we want to play a card? */
if(myisset("card") && $myturn)
{
@@ -1294,8 +1321,6 @@ else if(myisset("me"))
if($handcardid) /* everything ok, play card */
{
- $comment = "";
-
/* update Game timestamp */
DB_update_game_timestamp($gameid);
@@ -1315,26 +1340,26 @@ else if(myisset("me"))
mysql_query("UPDATE Hand_Card SET played='true' WHERE hand_id='$handid' AND card_id=".
DB_quote_smart($card));
+ /* get trick id or start new trick */
+ $a = DB_get_current_trickid($gameid);
+ $trickid = $a[0];
+ $sequence = $a[1];
+ $tricknr = $a[2];
+
+ $playid = DB_play_card($trickid,$handcardid,$sequence);
+
/* check for schweinchen */
- //echo "schweinchen = ".$GAME["schweinchen"]." --$card- ";
if($card == 19 || $card == 20 )
{
$GAME["schweinchen"]++;
if($GAME["schweinchen"]==3 && $RULES["schweinchen"]=="second" )
- $comment="Schweinchen! ";
+ DB_insert_comment("Schweinchen! ",$playid,$myid);
if($RULES["schweinchen"]=="both" )
- $comment="Schweinchen! ";
- if ($debug) echo "schweinchen = ".$GAME["schweinchen"]." --- ";
+ DB_insert_comment("Schweinchen! ",$playid,$myid);
+ if ($debug)
+ echo "schweinchen = ".$GAME["schweinchen"]." --- ";
}
- /* get trick id or start new trick */
- $a = DB_get_current_trickid($gameid);
- $trickid = $a[0];
- $sequence = $a[1];
- $tricknr = $a[2];
-
- $playid = DB_play_card($trickid,$handcardid,$sequence);
-
/* if sequence == 4 check who one in case of wedding */
if($sequence == 4 && $GT == "wedding")
{
@@ -1394,19 +1419,21 @@ else if(myisset("me"))
}
if($next==5) $next=1;
-
/* check for coment */
if(myisset("comment"))
{
- $comment.=$_REQUEST["comment"];
+ $comment = $_REQUEST["comment"];
+ if($comment != "")
+ DB_insert_comment($comment,$playid,$myid);
};
- if($comment != "")
- DB_insert_comment($comment,$playid,$myid);
-
+
/* display played card */
echo "
";
echo " you played ";
+ /* display comments */
display_card($card,$PREF["cardset"]);
+ if($comment!="")
+ echo " Your comment: ".$comment."\n";
echo "
\n";
/*check if we still have cards left, else set status to gameover */
@@ -1466,7 +1493,7 @@ else if(myisset("me"))
" 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'".
- " GROUP BY User.fullname" );
+ " GROUP BY Hand.party" );
$message .= "\nTotals:\n";
while( $r = mysql_fetch_array($result,MYSQL_NUM))
$message .= " ".$r[0]." ".$r[1]."\n";
@@ -1505,7 +1532,7 @@ else if(myisset("me"))
$mycards = mysort($mycards,$gametype);
echo "
\n";
- if($myturn && !myisset("card"))
+ if($myturn && !myisset("card") && $mystatus=='play' )
{
echo "Hello ".$myname.", it's your turn! \n";
echo "Your cards are: \n";
@@ -1542,19 +1569,40 @@ else if(myisset("me"))
" no call:".
" ";
- echo " \nA short comments:\n";
+ echo " \nA short comment:\n";
echo "\n";
- echo "\n";
+ echo "\n";
echo "\n";
}
- else if($mystatus=='play')
- {
+ else if($mystatus=='play' )
+ {
echo "Your cards are: \n";
foreach($mycards as $card)
display_card($card,$PREF["cardset"]);
+
+ echo "\n";
+
}
else if($mystatus=='gameover')
{
+ /* get time from the last action of the game */
+ $result = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " );
+ $r = mysql_fetch_array($result,MYSQL_NUM);
+ $gameend = time() - strtotime($r[0]);
+
+ if( $gameend < 60*60*24*7 )
+ {
+ echo "\n";
+ }
+
$oldcards = DB_get_all_hand($me);
$oldcards = mysort($oldcards,$gametype);
echo "Your cards were: \n";
@@ -1577,13 +1625,14 @@ else if(myisset("me"))
foreach($oldcards as $card)
display_card($card,$PREF["cardset"]);
}
- }
+ };
}
echo "
\n";
/* if the game is over do some extra stuff, therefore exit the swtich statement if we are still playing*/
if($mystatus=='play')
break;
+
/* the following happens only when the gamestatus is 'gameover' */
/* check if game is over, display results */
if(DB_get_game_status_by_gameid($gameid)=='play')
@@ -1787,11 +1836,11 @@ else if(myisset("me"))
}
else /* output default user page */
{
- $time = DB_get_user_timestamp($uid);
- $unixtime =strtotime($time);
+ $time = DB_get_user_timestamp($uid);
+ $unixtime = strtotime($time);
- $offset = DB_get_user_timezone($uid);
- $zone = return_timezone($offset);
+ $offset = DB_get_user_timezone($uid);
+ $zone = return_timezone($offset);
date_default_timezone_set($zone);
/* display links to settings */
@@ -1867,7 +1916,7 @@ else if(myisset("me"))
}
else
{
- echo "Sorry email and password don't match ";
+ echo "Sorry email and password don't match. Please try again. ";
}
};
output_footer();
@@ -1903,7 +1952,7 @@ else if(myisset("me"))
if($r)
echo " added you to the database";
else
- echo " something went wrong";
+ echo " something went wrong, couldn't add you to the database, please contact $ADMIN_NAME at $ADMIN_EMAIL.";
}
}
/* default login page */