projects / e-DoKo.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LAYOUT: wrap some text for status of sickness better
[e-DoKo.git] / include / game.php
diff --git a/include/game.php b/include/game.php
index e471d5d47fef8eb5339ccaad02102f0cbd9ce73f..3c1b68e6bf758f061023c8c8bc9da1bfedce31eb 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -126,8 +126,41 @@ if(myisset('call')  && $_REQUEST['call']  == '0' && can_call(0,$me))
 if($session)
   {
     echo "<div class=\"session\">\n";
-    echo "  <div class=\"sessionrules\">Rules (+icons for rules) \n";
-    echo "    <div>\n";
+    echo "  <div class=\"sessionrules\">Rules: ";
+    switch($RULES['dullen'])
+      {
+      case 'none':
+       echo "<img class=\"rulesicon\" alt=\"not ten of hearts\" src=\"pics/button/no-ten-of-hearts.png\"/>\n"; break;
+      case 'firstwins':
+       echo "<img class=\"rulesicon\" alt=\"ten of hearts\" src=\"pics/button/ten-of-hearts.png\"/>\n"; break;
+      case 'secondwins':
+       echo "<img class=\"rulesicon\" alt=\"second ten of hearts\" src=\"pics/button/second-ten-of-hearts.png\"/>\n"; break;
+      }
+    switch($RULES['schweinchen'])
+      {
+      case 'none':
+       echo "<img class=\"rulesicon\" alt=\"no schweinchen\" ".
+         "src=\"pics/button/no-schweinchen.png\"/>\n"; break;
+      case 'both':
+       echo "<img class=\"rulesicon\" alt=\"two schweinchen \" ".
+         "src=\"pics/button/two-schweinchen.png\"/>\n"; break;
+      case 'second':
+       echo "<img class=\"rulesicon\" alt=\"second schweinchen\" ".
+         "src=\"pics/button/second-schweinchen.png\"/>\n"; break;
+      case 'secondaftercall':
+       echo "<img class=\"rulesicon\" alt=\"second schweinchen after call\" ".
+         "src=\"pics/button/second-schweinchen-after-call.png\"/>\n"; break;
+      }
+    switch($RULES['call'])
+      {
+      case '1st-own-card':
+       echo "<img class=\"rulesicon\" alt=\"1st-own-card\" src=\"pics/button/1st-own-card.png\"/>\n"; break;
+      case '5th-card':
+       echo "<img class=\"rulesicon\" alt=\"5th-card\" src=\"pics/button/5th-card.png\"/>\n"; break;
+      case '9-cards':
+       echo "<img class=\"rulesicon\" alt=\"9-cards\" src=\"pics/button/9-cards.png\"/>\n"; break;
+      }
+    echo " <div>\n";
     echo "       10ofhearts : {$RULES['dullen']}      <br />\n";
     echo "       schweinchen: {$RULES['schweinchen']} <br />\n";
     echo "       call:        {$RULES['call']}        <br />\n";
@@ -264,7 +297,7 @@ switch($mystatus)
            $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
 
            if($userstatus=='start' || $userstatus=='init')
-             echo " <div class=\"vorbehalt".($pos-1)."\"> still needs to decide </div>\n"; /* show this to everyone */
+             echo " <div class=\"vorbehalt".($pos-1)."\"> still needs <br/ > to decide </div>\n"; /* show this to everyone */
            else
              if($usersick!=NULL && $pos<=$mypos ) /* only show this for people sitting before the player */
                echo " <div class=\"vorbehalt".($pos-1)."\"> sick </div>\n";
@@ -381,7 +414,7 @@ switch($mystatus)
        $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid);
 
        if($userstatus=='start' || $userstatus=='init')
-         echo " <div class=\"vorbehalt".($pos-1)."\"> still needs to decide </div>\n"; /* show this to everyone */
+         echo " <div class=\"vorbehalt".($pos-1)."\"> still needs <br />to decide </div>\n"; /* show this to everyone */
        else
          if($usersick!=NULL) /* in the init-phase we only showed players with $pos<$mypos, now we can show all */
            echo " <div class=\"vorbehalt".($pos-1)."\"> sick </div>\n";
@@ -832,7 +865,7 @@ switch($mystatus)
                DB_set_hand_status_by_hash($userhash,'poverty');
 
                $message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:".
-                 " ".$HOST.$INDEX."?action=game&amp;me=".$userhash."\n\n" ;
+                 " ".$HOST.$INDEX."?action=game&me=".$userhash."\n\n" ;
                mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message);
              }
          }
@@ -1557,7 +1590,7 @@ switch($mystatus)
                          {
                            if($call_contra==NULL)
                              $call_contra = $call;
-                           else if( $call < $call_re)
+                           else if( $call < $call_contra)
                              $call_contra = $call;
                          }
                      }
@@ -1775,6 +1808,42 @@ switch($mystatus)
            "        <div class=\"score\">".$r[2]."<br /> ".$r[1]."</div>\n".
            "      </div>\n";
 
+       /* display totals */
+       $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".
+                          " LEFT JOIN User ON User.id=Hand.user_id".
+                          " 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'".
+                          " GROUP BY Hand.party" );
+       echo "<div class=\"total\">\n  Totals:<br />\n";
+       while( $r = DB_fetch_array($result))
+         echo "  ".$r[0]." ".$r[1]."<br />\n";
+
+       $queryresult = DB_query("SELECT timediff(mod_date,create_date) ".
+                               " FROM Game WHERE id='$gameid'");
+       $r = DB_fetch_array($queryresult);
+       echo "  <p>This game took ".$r[0]." hours.</p>\n";
+
+       echo "  <div class=\"re\">\n   Points Re: <br />\n";
+       $queryresult = DB_query("SELECT score FROM Score ".
+                               "  WHERE game_id=$gameid AND party='re'".
+                               " ");
+       while($r = DB_fetch_array($queryresult) )
+         echo "   ".$r[0]."<br />\n";
+       echo "  </div>\n";
+
+       echo "  <div class=\"contra\">\n   Points Contra: <br />\n";
+       $queryresult = DB_query("SELECT score FROM Score ".
+                               "  WHERE game_id=$gameid AND party='contra'".
+                               " ");
+       while($r = DB_fetch_array($queryresult) )
+         echo "   ".$r[0]."<br />\n";
+       echo "  </div>\n";
+
+       echo "</div>\n";
+
        echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
       }
 
@@ -1850,45 +1919,6 @@ switch($mystatus)
     if(DB_get_game_status_by_gameid($gameid)=='play')
       {
        echo "The game is over for you.. other people still need to play though";
-      }
-    else
-      {
-       $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".
-                          " LEFT JOIN User ON User.id=Hand.user_id".
-                          " 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'".
-                          " GROUP BY Hand.party" );
-       echo "<div class=\"total\"> Totals:<br />\n";
-       while( $r = DB_fetch_array($result))
-         echo "  ".$r[0]." ".$r[1]."<br />\n";
-
-       $queryresult = DB_query("SELECT timediff(mod_date,create_date) ".
-                               " FROM Game WHERE id='$gameid'");
-       $r = DB_fetch_array($queryresult);
-       echo "<p>This game took ".$r[0]." hours.</p>";
-
-       echo "<div class=\"re\">\n Points Re: <br />\n";
-       $queryresult = DB_query("SELECT score FROM Score ".
-                               "  WHERE game_id=$gameid AND party='re'".
-                               " ");
-       while($r = DB_fetch_array($queryresult) )
-         echo "   ".$r[0]."<br />\n";
-       echo "</div>\n";
-
-       echo "<div class=\"contra\">\n Points Contra: <br />\n";
-       $queryresult = DB_query("SELECT score FROM Score ".
-                               "  WHERE game_id=$gameid AND party='contra'".
-                               " ");
-       while($r = DB_fetch_array($queryresult) )
-         echo "   ".$r[0]."<br />\n";
-       echo "</div>\n";
-
-       echo "</div>\n";
-
-
       }
     break;
   default:
Email/Web based Dopppelkopf server