X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=output.php;h=d20d725af1fe1873da2bf9353868133ec0c8fbf9;hp=21ce2fc14e03145139681cba6edfcd2e658c5d0f;hb=0dd96314cb0fc3d40502d87f354c6fd61f35a3cd;hpb=68e916d4e488f110dcdab69d7827e8b2f4129cd4

diff --git a/output.php b/output.php
index 21ce2fc..d20d725 100644
--- a/output.php
+++ b/output.php
@@ -16,9 +16,9 @@ function display_news()
   global $wiki;
   echo "<div class=\"bug\">\n".
     "  Please hit <strong>shift+reload</strong>.<br /><hr />\n".
-    "  the table and the names are now always shown. <br /><hr />".
-    "  If you find more bugs, please list them in the <a href=\"".$wiki.
-    "\">wiki</a>.\n</div>\n";
+    "  The server now keeps score... (only from now on) <br /><hr />".
+    "  If you find more bugs, please list them in the <a href=\"".
+    $wiki."\">wiki</a>.\n</div>\n";
   return;
 }
 
@@ -39,7 +39,7 @@ function output_register()
 {
   echo "IMPORTANT: passwords are going over the net as clear text, so pick an easy password. No need to pick anything complicated here ;)<br /><br />";
   echo "TODO: convert timezone into a menu<br />\n";
-  echo "TODO: figure out a way to handle passwrods <br />\n";
+  echo "TODO: figure out a way to handle passwords <br />\n";
   ?>
         <form action="index.php" method="post">
           <fieldset>
@@ -70,12 +70,16 @@ function output_register()
 
 function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
 {
+  global $RULES;
+
   echo "Do you want to continue playing?(This will start a new game, with the next person as dealer.)\n";
   echo "<form action=\"index.php\" method=\"post\">\n";
   echo "  <input type=\"hidden\" name=\"PlayerA\" value=\"$playerA\" />\n";
   echo "  <input type=\"hidden\" name=\"PlayerB\" value=\"$playerB\" />\n";
   echo "  <input type=\"hidden\" name=\"PlayerC\" value=\"$playerC\" />\n";
   echo "  <input type=\"hidden\" name=\"PlayerD\" value=\"$playerD\" />\n";
+  echo "  <input type=\"hidden\" name=\"dullen\"  value=\"".$RULES["dullen"]."\" />\n";
+  echo "  <input type=\"hidden\" name=\"schweinchen\" value=\"".$RULES["schweinchen"]."\" />\n";
   echo "  <input type=\"hidden\" name=\"followup\" value=\"$oldgameid\" />\n";
   echo "  <input type=\"submit\" value=\"keep playing\" />\n";
   echo "</form>\n";
@@ -83,16 +87,56 @@ function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
   return;
 }
 
-function output_form_for_new_game()
+function output_form_for_new_game($names)
 {
 ?>
-    <p>Please add 4 names, please make sure that the names are correct! </p>
+    <h2> Players </h2>
+    <p>Please select four players (or use the randomly pre-selected names)</p>
        <form action="index.php" method="post">
-   Name:  <input name="PlayerA" type="text" size="10" maxlength="20" /> 
-   Name:  <input name="PlayerB" type="text" size="10" maxlength="20" /> 
-   Name:  <input name="PlayerC" type="text" size="10" maxlength="20" /> 
-   Name:  <input name="PlayerD" type="text" size="10" maxlength="20" /> 
-
+<?php
+    /* ask for player names */
+  foreach( array("PlayerA","PlayerB","PlayerC","PlayerD") as $player)
+  {
+    srand((float) microtime() * 10000000);
+    $randkey = array_rand($names);
+    $rand = $names[$randkey];
+    echo "    Name:  <select name=\"$player\" size=\"1\" />  \n";
+    foreach($names as $name)
+    {
+      if($name==$rand)
+	{
+	  echo "     <option selected=\"selected\">$name</option>\n";
+	}
+      else
+	echo "     <option>$name</option>\n";
+    }
+    echo "  </select>\n";
+    unset($names[$randkey]);
+   }
+?>   
+   <h2> Rules </h2> 
+      
+      <p> ten of hearts: 
+         <ul>
+         <li> <input type="radio" name="dullen" value="none" /> just normal non-trump  </li>
+         <li> <input type="radio" name="dullen" value="firstwins" /> first ten of hearts wins the trick </li>
+         <li> <input type="radio" name="dullen" value="secondwins" checked="checked" /> second ten of hearts wins the trick </li>
+         </ul>
+      </p>
+      <p> schweinchen (both foxes): 
+        <ul>
+        <li> <input type="radio" name="schweinchen" value="none" /> none </li>
+        <li> <input type="radio" name="schweinchen" value="both" /> 
+              both become highest trump (automatic call at beginning of the game)
+              (does not work yet) </li>
+        <li> <input type="radio" name="schweinchen" value="second" checked="checked" /> 
+              first one normal, second one becomes highest (call during the game) (does not work yet) </li>
+        <li> <input type="radio" name="schweinchen" value="secondaftercall"  /> 
+             second one become highest only in case re/contra was announced 
+            (does not work yet)</li>
+      </ul>
+      </p>
+   
    <input type="submit" value="start game" />
  </form>
 <?php
@@ -191,10 +235,12 @@ function check_want_to_play($me)
    yes<input type="radio" name="in" value="yes" />
    no<input type="radio" name="in" value="no" /> <br />
 
+<?php   
+/*
    Do you want to get an email for every card played or only if it your move?
    every card<input type="radio" name="update" value="card" />
    only on my turn<input type="radio" name="update" value="turn" /> <br />
-<?php   
+*/
   echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
   echo "\n";
   echo "<input type=\"submit\" value=\"count me in\" />\n";
@@ -230,6 +276,7 @@ function output_home_page()
 
 function output_header()
 {
+   global $REV;
 ?>
 <!DOCTYPE html PUBLIC
     "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN"
@@ -267,6 +314,7 @@ function output_header()
 <body onload="high_last();">
 <div class="header">
 <h1> Welcome to E-Doko </h1>
+<p> Revision: <?php echo "$REV"; ?></p>
 </div>
 
 <?php