BUGFIX: fixed selection of spade and heart solo

[e-DoKo.git] / include / output.php

diff --git a/include/output.php b/include/output.php
index d38c899c2b96d7b4b2920a6e8dc46610489d6e9f..6a61b085aecfae99b5c1f4c1fecccb80eb070f47 100644 (file)
--- a/include/output.php
+++ b/include/output.php
@@ -268,14 +268,14 @@ function output_check_for_sickness($me,$mycards)
   echo '';
   echo '    '._('Do you want to play solo?').'';
   echo '    <select name="solo" size="1">';
-  echo '      <option value="No" selected="selected">'.'No'.'</option>';
+  echo '      <option value="No" selected="selected">'._('No').'</option>';
   echo '      <option value="trumpless">'._('trumpless').'</option>';
   echo '      <option value="trump">'._('trump').'</option>';
   echo '      <option value="queen">'._('queen').'</option>';
   echo '      <option value="jack">'._('jack').'</option>';
   echo '      <option value="club">'._('club').'</option>';
-  echo '      <option valvue="spade">'._('spade').'</option>';
-  echo '      <option value="hear">'._('heart').'</option>';
+  echo '      <option value="spade">'._('spade').'</option>';
+  echo '      <option value="heart">'._('heart').'</option>';
   echo '    </select>';
   echo '    <br />';
 
@@ -423,7 +423,7 @@ function output_header()
      <title>e-Doko</title>
      <meta charset="utf-8" />
      <meta name="viewport" content="width=device-width; initial-scale=1.0;" />
-     <link rel="shortcut icon" href="pics/edoko-favicon.png" />
+     <link id="favicon" rel="shortcut icon" href="pics/edoko-favicon.png" />
      <link rel="stylesheet" media="all" href="<?php echo autoversion("css/bootstrap.css"); ?>" />
      <link rel="stylesheet" href="<?php echo autoversion("css/standard.css"); ?>" />
      <link rel="stylesheet" href="<?php echo autoversion("css/dateinput.css"); ?>"/>
@@ -446,15 +446,12 @@ function output_footer()
 
   echo "</div>\n\n";
   echo "<footer>\n";
+  echo "  <p class=\"left\"> copyright 2006-2013 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <br />\n";
   echo "  <p class=\"right\"> See the latest changes <a href=\"http://nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=summary\">\n".
     "  via git </a> <br />or download the source via <br />\n'git clone http://nubati.net/git/e-DoKo.git' <br />\n".
-    "  <a href=\"http://www.dreamhost.com/green.cgi\"><p>\n".
-    "  <img class=\"right\" alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
-    " src=\"pics/green1.gif\" height=\"32\" width=\"100\" /></a>\n";
-  echo "  <p class=\"left\"> copyright 2006-2012 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <br />\n".
-    "  Verwendung der [deutschen] Kartenbilder mit Genehmigung <br />der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger <br />\n".
-    "  - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH <br />\n".
-    "  a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com</p>\n";
+    "  <a href=\"http://www.dreamhost.com/green.cgi\">\n".
+    "  <img alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
+    " src=\"pics/green1.gif\" height=\"32\" width=\"100\" /></a><p>\n";
   echo "</footer>\n\n";
 
   echo '<script src="'.autoversion('js/jquery.min.js').             '"></script>';
@@ -643,7 +640,7 @@ function output_robotproof($i)
     }
 }
 
-function output_exchanged_cards()
+function output_exchanged_cards($gametype)
 {
   /* in a poverty game this function will output the exchanged cards
    * players in the team will see the cards, the other team will see
@@ -651,7 +648,7 @@ function output_exchanged_cards()
    */
 
   /* need some information about the game */
-  global $gameid,$mygametype, $PREF,$me,$mystatus, $RULES;
+  global $gameid,$PREF,$me,$mystatus, $RULES;
 
   /* some variables to track where the people with poverty are sitting */
   $partnerpos1 = 0;
@@ -662,7 +659,7 @@ function output_exchanged_cards()
   /* only need to do it in a poverty game, this might not be needed, but
    * just to make sure everything is ok
    */
-  if($mygametype == 'poverty' || $mygametype=='dpoverty')
+  if($gametype == 'poverty' || $gametype=='dpoverty')
     {
       /* find out who has poverty */
       for($mypos=1;$mypos<5;$mypos++)
@@ -798,7 +795,7 @@ function output_exchanged_cards()
            }
          echo  "      </div>\n";
        }
-      if($mygametype == $usersick)
+      if($gametype == $usersick)
        $show = 0;
     }
 }