summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorArun Persaud <arun@nubati.net>2008-06-08 10:29:20 -0700
committerArun Persaud <arun@nubati.net>2008-06-08 10:29:20 -0700
commit36b10f3b006cfc919fdb657e1f06f41969082f0e (patch)
treef1a91f45332c6ca19eb5605778485b2cd4d4661b /include
parent02b7328ec7f2c4d9eb7862553da000f386830017 (diff)
downloade-DoKo-36b10f3b006cfc919fdb657e1f06f41969082f0e.tar.gz
e-DoKo-36b10f3b006cfc919fdb657e1f06f41969082f0e.tar.bz2
e-DoKo-36b10f3b006cfc919fdb657e1f06f41969082f0e.zip
BUGIFX: notes are now available during every phase of the game
you can now take notes also during the pre-game phase. Signed-off-by: Arun Persaud <arun@nubati.net>
Diffstat (limited to 'include')
-rw-r--r--include/game.php29
-rw-r--r--include/output.php14
2 files changed, 24 insertions, 19 deletions
diff --git a/include/game.php b/include/game.php
index 3a01566..8d59103 100644
--- a/include/game.php
+++ b/include/game.php
@@ -107,7 +107,16 @@ set_gametype('normal');
/* put everyting in a form */
echo "<form action=\"index.php?action=game&amp;me=$me\" method=\"post\">\n";
-/* output game */
+/* handle user notes (only possible while game is running)*/
+if( $mystatus!='gameover' )
+ if(myisset("note"))
+{
+ $note = $_REQUEST['note'];
+
+ if($note != "")
+ DB_insert_note($note,$gameid,$myid);
+};
+output_user_notes($myid,$gameid,$mystatus);
/* output extra division in case this game is part of a session */
if($session)
@@ -1027,16 +1036,6 @@ switch($mystatus)
DB_insert_comment($comment,$playid,$myid);
};
- /* handle notes in case player didn't play a card, allow notes only during a game */
- if( (!myisset("card") && $mystatus=='play') )
- if(myisset("note"))
- {
- $note = $_REQUEST["note"];
-
- if($note != "")
- DB_insert_note($note,$gameid,$myid);
- };
-
/* get everything relevant to display the tricks */
$result = DB_query("SELECT Hand_Card.card_id as card,".
" Hand.position as position,".
@@ -1726,13 +1725,6 @@ switch($mystatus)
echo " <li onclick=\"hl_next();\" class=\"old\"><a href=\"#\">next</a></li>\n";
echo "</ul>\n"; /* end ul tricks*/
- echo "<div class=\"notes\"> Personal notes: <br />\n";
- $notes = DB_get_notes_by_userid_and_gameid($myid,$gameid);
- foreach($notes as $note)
- echo "$note <hr />\n";
- echo "<input name=\"note\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
- echo "</div> \n";
-
$mycards = DB_get_hand($me);
$mycards = mysort($mycards,$gametype);
echo "<div class=\"mycards\">\n";
@@ -1903,7 +1895,6 @@ switch($mystatus)
}
}
-
output_footer();
DB_close();
exit();
diff --git a/include/output.php b/include/output.php
index e57ed04..2f846be 100644
--- a/include/output.php
+++ b/include/output.php
@@ -428,4 +428,18 @@ function output_password_recovery($email,$password)
<?php
}
+
+function output_user_notes($userid,$gameid,$userstatus)
+{
+ echo "<div class=\"notes\"> Personal notes: <br />\n";
+ $notes = DB_get_notes_by_userid_and_gameid($userid,$gameid);
+ foreach($notes as $note)
+ echo "$note <hr />\n";
+ if($userstatus!='gameover')
+ echo "<input name=\"note\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
+ echo "</div> \n";
+
+ return;
+}
+
?> \ No newline at end of file